Merge branch '2020-05-07-more-kconfig-migrations'

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

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index ad45b106b05a448f4a62b6c0ad890f5c12693149..63662dd18d400d9633c452bbd8341c63b5ca3a12 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -46,11 +46,11 @@
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate}" \
-       " root=PARTUUID=${uuid} rootwait rw\0 ${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 ...;" \
@@ -116,10 +116,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,9 +128,6 @@
        (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
@@ -144,7 +137,6 @@
 #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 */