Merge branch '2021-12-01-Kconfig-migrations' into next

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

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 76add4e..4ef3a46 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -12,13 +12,7 @@
 #define CONFIG_SYS_TIMER_COUNTER       (0xFFF34000 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN          (512 * 1024)
-
 #define CONFIG_PL011_CLOCK             150000000
-#define CONFIG_PL01x_PORTS             { (void *)(0xFFF36000) }
 
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
 
@@ -28,12 +22,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                        CONFIG_SYS_SCSI_MAX_LUN)
 
-#define CONFIG_CALXEDA_XGMAC
-
-/*
- * Command line configuration.
- */
-
 #define CONFIG_BOOT_RETRY_TIME         -1
 #define CONFIG_RESET_TO_RETRY
 
@@ -43,15 +31,8 @@
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           0x800000
 #define CONFIG_SYS_64BIT_LBA
 
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- * The DRAM is already setup, so do not touch the DT node later.
- */
-#define PHYS_SDRAM_1_SIZE              (4089 << 20)
-
 /* Environment data setup
 */
 #define CONFIG_SYS_NVRAM_BASE_ADDR     0xfff88000      /* NVRAM base address */
@@ -59,6 +40,9 @@
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_INIT_SP_ADDR                0x01000000
-#define CONFIG_SKIP_LOWLEVEL_INIT
+
+#define CONFIG_EXTRA_ENV_SETTINGS                              \
+       "fdt_high=0x20000000\0"                                 \
+       "initrd_high=0x20000000\0"
 
 #endif