Merge branch '2021-12-27-CONFIG-migrations' into next

[platform/kernel/u-boot.git] / include / configs / stih410-b2260.h

diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index f35d26a..2fe0900 100644 (file)
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -13,7 +13,6 @@
 #define PHYS_SDRAM_1                   0x40000000
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define PHYS_SDRAM_1_SIZE              0x3E000000
-#define CONFIG_SYS_LOAD_ADDR           PHYS_SDRAM_1    /* default load addr */
 
 #define CONFIG_SYS_HZ_CLOCK            1000000000      /* 1 GHz */
 
@@ -25,7 +24,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           SZ_256M
 
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 #define CONFIG_SYS_BOOTM_LEN           SZ_16M
 
 #define BOOT_TARGET_DEVICES(func) \
@@ -45,10 +43,6 @@
 
 /* Extra Commands */
 
-#define CONFIG_SETUP_MEMORY_TAGS
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          0x1800000
 #define CONFIG_SYS_GBL_DATA_SIZE       1024    /* Global data structures */
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE - \
                                         CONFIG_SYS_MALLOC_LEN - \
@@ -59,8 +53,6 @@
 
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
 /* USB Configs */
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2