Commit 53fd12cfe17d0b6df2cd924fe943cc8f8bee03b9
Committed by
Joe Hershberger
1 parent
eff0e0c76f
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
riscv: sifive: fu540: Sync-up config header with RISC-V QEMU support
We typically use same set of distro images (yocto, debian, fedora, etc.) on both QEMU RISC-V virt machine and SiFive Unleashed board. With growing kernel and ramdisk images, we need to re-adjust default U-Boot environment variables. The config header for QEMU RISC-V virt machine has been already updated to handle bigger kernel and ramdisk images hence this patch updates SiFive FU540 config header accordingly. Signed-off-by: Anup Patel <anup.patel@wdc.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: David Abdurachmanov <david.abdurachmanov@sifive.com> Tested-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Showing 1 changed file with 11 additions and 7 deletions Side-by-side Diff
include/configs/sifive-fu540.h
... | ... | @@ -18,12 +18,12 @@ |
18 | 18 | |
19 | 19 | #define CONFIG_SYS_MALLOC_LEN SZ_8M |
20 | 20 | |
21 | -#define CONFIG_SYS_BOOTM_LEN SZ_16M | |
21 | +#define CONFIG_SYS_BOOTM_LEN SZ_64M | |
22 | 22 | |
23 | 23 | #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 |
24 | 24 | |
25 | 25 | /* Environment options */ |
26 | -#define CONFIG_ENV_SIZE SZ_4K | |
26 | +#define CONFIG_ENV_SIZE SZ_128K | |
27 | 27 | |
28 | 28 | #define BOOT_TARGET_DEVICES(func) \ |
29 | 29 | func(DHCP, dhcp, na) |
30 | 30 | |
... | ... | @@ -33,12 +33,16 @@ |
33 | 33 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
34 | 34 | "fdt_high=0xffffffffffffffff\0" \ |
35 | 35 | "initrd_high=0xffffffffffffffff\0" \ |
36 | - "kernel_addr_r=0x80600000\0" \ | |
37 | - "fdt_addr_r=0x82200000\0" \ | |
38 | - "scriptaddr=0x82300000\0" \ | |
39 | - "pxefile_addr_r=0x82400000\0" \ | |
40 | - "ramdisk_addr_r=0x82500000\0" \ | |
36 | + "kernel_addr_r=0x84000000\0" \ | |
37 | + "fdt_addr_r=0x88000000\0" \ | |
38 | + "scriptaddr=0x88100000\0" \ | |
39 | + "pxefile_addr_r=0x88200000\0" \ | |
40 | + "ramdisk_addr_r=0x88300000\0" \ | |
41 | 41 | BOOTENV |
42 | + | |
43 | +#define CONFIG_PREBOOT \ | |
44 | + "setenv fdt_addr ${fdtcontroladdr};" \ | |
45 | + "fdt addr ${fdtcontroladdr};" | |
42 | 46 | |
43 | 47 | #endif /* __CONFIG_H */ |