Merge branch '2021-08-31-kconfig-migrations-part2' into next

[platform/kernel/u-boot.git] / include / configs / sifive-unmatched.h

diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index 4fad69b..538cce4 100644 (file)
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -28,18 +28,12 @@
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + SZ_2M)
 
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + SZ_2M)
-
-#define CONFIG_SYS_MALLOC_LEN          SZ_8M
-
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
 #define CONFIG_SYS_PCI_64BIT           1       /* enable 64-bit resources */
 
-#define CONFIG_SYS_CACHELINE_SIZE      64
-
 /* Environment options */
 
 #ifndef CONFIG_SPL_BUILD
@@ -73,6 +67,7 @@
        "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
        "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
        "partitions=" PARTS_DEFAULT "\0" \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        BOOTENV
 
 #define CONFIG_PREBOOT \
@@ -80,4 +75,6 @@
        "fdt addr ${fdtcontroladdr};"
 #endif /* CONFIG_SPL_BUILD */
 
+#define CONFIG_SYS_EEPROM_BUS_NUM              0
+
 #endif /* __SIFIVE_UNMATCHED_H */