Convert CONFIG_SYS_SPL_MALLOC_SIZE et al to Kconfig

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

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 7552610..c2563b1 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -30,11 +30,6 @@
 #include <asm/arch/stream_id_lsch2.h>
 
 /* Link Definitions */
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
-#else
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
-#endif
 
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
@@ -44,9 +39,6 @@
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY              25000000        /* 25MHz */
-
 /* Serial Port */
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
@@ -54,15 +46,6 @@
 
 /* SD boot SPL */
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SPL_MAX_SIZE            0x1f000         /* 124 KiB */
-#define CONFIG_SPL_STACK               0x10020000
-#define CONFIG_SPL_PAD_TO              0x21000         /* 132 KiB */
-#define CONFIG_SPL_BSS_START_ADDR      0x8f000000
-#define CONFIG_SPL_BSS_MAX_SIZE                0x80000
-#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SPL_BSS_START_ADDR + \
-                                       CONFIG_SPL_BSS_MAX_SIZE)
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
-
 #ifdef CONFIG_NXP_ESBC
 #define CONFIG_U_BOOT_HDR_SIZE                         (16 << 10)
 /*
@@ -79,31 +62,14 @@
 
 #if defined(CONFIG_QSPI_BOOT) && defined(CONFIG_SPL)
 #define CONFIG_SPL_TARGET              "spl/u-boot-spl.pbl"
-#define CONFIG_SPL_MAX_SIZE            0x1f000
-#define CONFIG_SPL_STACK               0x10020000
-#define CONFIG_SPL_PAD_TO              0x20000
-#define CONFIG_SPL_BSS_START_ADDR      0x8f000000
-#define CONFIG_SPL_BSS_MAX_SIZE                0x80000
-#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SPL_BSS_START_ADDR + \
-                                       CONFIG_SPL_BSS_MAX_SIZE)
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
 #define CONFIG_SYS_MONITOR_LEN         0x100000
 #endif
 
 /* NAND SPL */
 #ifdef CONFIG_NAND_BOOT
-#define CONFIG_SPL_PBL_PAD
-
-#define CONFIG_SPL_MAX_SIZE            0x17000         /* 90 KiB */
-#define CONFIG_SPL_STACK               0x1001f000
 #define CONFIG_SYS_NAND_U_BOOT_DST     CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
 
-#define CONFIG_SPL_BSS_START_ADDR      0x8f000000
-#define CONFIG_SPL_BSS_MAX_SIZE                0x80000
-#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SPL_BSS_START_ADDR + \
-                                       CONFIG_SPL_BSS_MAX_SIZE)
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
 #define CONFIG_SYS_MONITOR_LEN         0xa0000
 #endif
 
@@ -168,7 +134,6 @@
        "ramdisk_addr=0x800000\0"               \
        "ramdisk_size=0x2000000\0"              \
        "bootm_size=0x10000000\0"               \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x61000000\0"              \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \
@@ -238,11 +203,6 @@
 
 #endif
 
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-
-#define CONFIG_SYS_MAXARGS             64      /* max command args */
-
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 #include <asm/arch/soc.h>