Convert CONFIG_SYS_NAND_U_BOOT_LOCATIONS et al to Kconfig

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

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 2274db0..f1b78c6 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -17,9 +17,6 @@
 
 #include "mx6_common.h"
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
@@ -34,9 +31,9 @@
        "script=boot.scr\0" \
        "image=zImage\0" \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x13000000\0" \
-       "ramdisk_addr_r=0x14000000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdt_addr_r=0x14000000\0" \
+       "ramdisk_addr_r=0x14080000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_file=rootfs.cpio.uboot\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
@@ -116,10 +113,6 @@
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
-#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
@@ -136,10 +129,7 @@
 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x200000
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000
 
 /* MTD device */