env: Finish migration of common ENV options

[oweals/u-boot.git] / include / configs / sifive-fu540.h

diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
index 7007b5f6af56ee11473fecd19453f4fd31ff75bb..2756ed5a77f3bdaf170e464756d5ca50e9d5e2d9 100644 (file)
--- a/include/configs/sifive-fu540.h
+++ b/include/configs/sifive-fu540.h
@@ -18,14 +18,14 @@
 
 #define CONFIG_SYS_MALLOC_LEN          SZ_8M
 
-#define CONFIG_SYS_BOOTM_LEN           SZ_16M
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
 /* Environment options */
-#define CONFIG_ENV_SIZE                        SZ_4K
 
 #define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
        func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
@@ -33,11 +33,15 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffffffffffff\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "kernel_addr_r=0x80600000\0" \
-       "fdt_addr_r=0x82200000\0" \
-       "scriptaddr=0x82300000\0" \
-       "pxefile_addr_r=0x82400000\0" \
-       "ramdisk_addr_r=0x82500000\0" \
+       "kernel_addr_r=0x84000000\0" \
+       "fdt_addr_r=0x88000000\0" \
+       "scriptaddr=0x88100000\0" \
+       "pxefile_addr_r=0x88200000\0" \
+       "ramdisk_addr_r=0x88300000\0" \
        BOOTENV
 
+#define CONFIG_PREBOOT \
+       "setenv fdt_addr ${fdtcontroladdr};" \
+       "fdt addr ${fdtcontroladdr};"
+
 #endif /* __CONFIG_H */