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 70cc63f..f1b78c6 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -17,13 +17,10 @@
 
 #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
-#define CONFIG_MMCROOT         "/dev/mmcblk1p2" /* Dev kit SD card */
+
 
 /* Ethernet Configs */
 #define CONFIG_FEC_XCV_TYPE            RMII
@@ -34,23 +31,23 @@
        "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" \
        "console=" CONSOLE_DEV "\0" \
        "mmcdev=1\0" \
        "mmcpart=1\0" \
-       "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+       "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate}" \
-       " root=${mmcroot} ${mtdparts}\0" \
+       " root=PARTUUID=${uuid} rootwait rw ${mtdparts} ${optargs}\0" \
        "nandargs=setenv bootargs console=${console},${baudrate}" \
-       " ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \
+       " ubi.mtd=fs root=${nandroot} ${mtdparts} ${optargs}\0" \
        "ramargs=setenv bootargs console=${console},${baudrate}" \
-       " root=/dev/ram rw ${mtdparts}\0"                    \
+       " root=/dev/ram rw ${mtdparts} ${optargs}\0"                    \
        "loadbootscript=" \
        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...;" \
@@ -60,16 +57,16 @@
        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \
        "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \
        " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
-       "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
-       " run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
+       "mmcboot=echo Booting from mmc...; run finduuid; run mmcargs;" \
+       "run loadimage; run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
        "mmcramboot=run ramargs; run loadimage;" \
        " run loadfdt; run loadramdisk;" \
        " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
        "nandboot=echo Booting from nand ...; " \
        " run nandargs;" \
        " nand read ${loadaddr} kernel ${kernelsize};" \
-       " nand read ${fdt_addr} dtb;" \
-       " bootz ${loadaddr} - ${fdt_addr}\0" \
+       " nand read ${fdt_addr_r} dtb;" \
+       " bootz ${loadaddr} - ${fdt_addr_r}\0" \
        "nandramboot=echo Booting RAMdisk from nand ...; " \
        " nand read ${ramdisk_addr_r} fs ${ramdisksize};" \
        " nand read ${loadaddr} kernel ${kernelsize};" \
@@ -88,8 +85,8 @@
        "fi; " \
        "${get_cmd} ${image}; " \
        "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-               "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-                       "bootz ${loadaddr} - ${fdt_addr}; " \
+               "if ${get_cmd} ${fdt_addr_r} ${fdt_file}; then " \
+                       "bootz ${loadaddr} - ${fdt_addr_r}; " \
                "else " \
                        "if test ${boot_fdt} = try; then " \
                                "bootz; " \
@@ -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
@@ -132,19 +125,12 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE               (1024 * 1024)
-#define CONFIG_ENV_OFFSET             0x400000
-#define CONFIG_ENV_SECT_SIZE          CONFIG_ENV_SIZE
 
 /* 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
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
 
 /* MTD device */