MA-9857 [Android] uboot change CONFIG_NAND_BOOT

NAND macro has been changed to CONFIG_NAND_BOOT in uboot2017.

Conflicts:
	include/configs/pico-imx6dl.h
	include/configs/pico-imx6dl_android_things.h

Change-Id: I61dd03c0eed8a65100212607447a41bde431cc04
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>

12 files changed, 17 insertions, 17 deletions

diff --git a/include/configs/mx6qarm2_android.h b/include/configs/mx6qarm2_android.h
index 3dc13bf..62e49b9 100644
--- a/include/configs/mx6qarm2_android.h
+++ b/include/configs/mx6qarm2_android.h
@@ -29,7 +29,7 @@
 #define CONFIG_FASTBOOT_FLASH
 
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #endif
 
@@ -46,7 +46,7 @@
 #define CONFIG_FSL_FASTBOOT
 #define CONFIG_ANDROID_RECOVERY
 
-#if defined CONFIG_SYS_BOOT_NAND
+#if defined CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_STORAGE_NAND
 #elif defined CONFIG_SYS_BOOT_SATA
 #define CONFIG_FASTBOOT_STORAGE_SATA
diff --git a/include/configs/mx6ul_14x14_evkandroidthings.h b/include/configs/mx6ul_14x14_evkandroidthings.h
index 469c634..e4cd20e 100644
--- a/include/configs/mx6ul_14x14_evkandroidthings.h
+++ b/include/configs/mx6ul_14x14_evkandroidthings.h
@@ -9,7 +9,7 @@
 #define __MX6UL_14x14_EVKANDROIDTHINGS_H
 #include "mx_android_common.h"
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #define FSL_FASTBOOT_FB_DEV "mmc"
 #endif
diff --git a/include/configs/mx6ul_aquila.h b/include/configs/mx6ul_aquila.h
index 21888ca..1a8b617 100644
--- a/include/configs/mx6ul_aquila.h
+++ b/include/configs/mx6ul_aquila.h
@@ -139,7 +139,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#if defined(CONFIG_SYS_BOOT_NAND)
+#if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	"panel=TFT43AB\0" \
@@ -262,7 +262,7 @@
 #ifdef CONFIG_SYS_BOOT_QSPI
 #define CONFIG_FSL_QSPI
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#elif defined CONFIG_SYS_BOOT_NAND
+#elif defined CONFIG_NAND_BOOT
 #define CONFIG_SYS_USE_NAND
 #define CONFIG_ENV_IS_IN_NAND
 #else
diff --git a/include/configs/mx6ul_aquila_android_things.h b/include/configs/mx6ul_aquila_android_things.h
index c6ce5fc..9c1ef45 100644
--- a/include/configs/mx6ul_aquila_android_things.h
+++ b/include/configs/mx6ul_aquila_android_things.h
@@ -9,7 +9,7 @@
 #define __PICOSOM_IMX6UL_ANDROID_THINGS_H
 #include "mx_android_common.h"
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define FSL_FASTBOOT_FB_DEV "mmc"
diff --git a/include/configs/mx6ul_nxpu_iopb.h b/include/configs/mx6ul_nxpu_iopb.h
index 46725ab..daaf899 100644
--- a/include/configs/mx6ul_nxpu_iopb.h
+++ b/include/configs/mx6ul_nxpu_iopb.h
@@ -132,7 +132,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#if defined(CONFIG_SYS_BOOT_NAND)
+#if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	"panel=TFT43AB\0" \
@@ -263,7 +263,7 @@
 #ifdef CONFIG_SYS_BOOT_QSPI
 #define CONFIG_FSL_QSPI
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#elif defined CONFIG_SYS_BOOT_NAND
+#elif defined CONFIG_NAND_BOOT
 #define CONFIG_SYS_USE_NAND
 #define CONFIG_ENV_IS_IN_NAND
 #else
diff --git a/include/configs/mx6ul_nxpu_iopb_android_things.h b/include/configs/mx6ul_nxpu_iopb_android_things.h
index 95e56d9..59f407d 100644
--- a/include/configs/mx6ul_nxpu_iopb_android_things.h
+++ b/include/configs/mx6ul_nxpu_iopb_android_things.h
@@ -9,7 +9,7 @@
 #define __MX6UL_NXPU_IOPB_ANDROID_THINGS_H
 #include "mx_android_common.h"
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define FSL_FASTBOOT_FB_DEV "mmc"
diff --git a/include/configs/mx7dsabresd_androidthings.h b/include/configs/mx7dsabresd_androidthings.h
index 503d80e..dd6a8dc 100644
--- a/include/configs/mx7dsabresd_androidthings.h
+++ b/include/configs/mx7dsabresd_androidthings.h
@@ -11,7 +11,7 @@
 #define CONFIG_CMD_FAT
 
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define FSL_FASTBOOT_FB_DEV "mmc"
diff --git a/include/configs/mx_android_common.h b/include/configs/mx_android_common.h
index 808ac0d..f58f21a 100644
--- a/include/configs/mx_android_common.h
+++ b/include/configs/mx_android_common.h
@@ -30,7 +30,7 @@
 #define CONFIG_FSL_FASTBOOT
 #define CONFIG_ANDROID_RECOVERY
 
-#if defined CONFIG__NAND_BOOT
+#if defined CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_STORAGE_NAND
 #elif defined CONFIG_SYS_BOOT_SATA
 #define CONFIG_FASTBOOT_STORAGE_SATA
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 83384d2..dda8b5f 100755
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -140,7 +140,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#if defined(CONFIG_SYS_BOOT_NAND)
+#if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	"panel=EJ050NA\0" \
@@ -272,7 +272,7 @@
 #ifdef CONFIG_SYS_BOOT_QSPI
 #define CONFIG_SYS_USE_QSPI
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#elif defined CONFIG_SYS_BOOT_NAND
+#elif defined CONFIG_NAND_BOOT
 #define CONFIG_SYS_USE_NAND
 #define CONFIG_ENV_IS_IN_NAND
 #else
diff --git a/include/configs/pico-imx7dandroidthings.h b/include/configs/pico-imx7dandroidthings.h
index 334affa..b9e18cd 100644
--- a/include/configs/pico-imx7dandroidthings.h
+++ b/include/configs/pico-imx7dandroidthings.h
@@ -10,7 +10,7 @@
 
 
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define FSL_FASTBOOT_FB_DEV "mmc"
diff --git a/include/configs/picosom-imx6ul.h b/include/configs/picosom-imx6ul.h
index 91c5684..6840617 100644
--- a/include/configs/picosom-imx6ul.h
+++ b/include/configs/picosom-imx6ul.h
@@ -92,7 +92,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#if defined(CONFIG_SYS_BOOT_NAND)
+#if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	"panel=TFT43AB\0" \
@@ -186,7 +186,7 @@
 #ifdef CONFIG_QSPI_BOOT
 #define CONFIG_FSL_QSPI
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#elif defined CONFIG_SYS_BOOT_NAND
+#elif defined CONFIG_NAND_BOOT
 #define CONFIG_SYS_USE_NAND
 #define CONFIG_ENV_IS_IN_NAND
 #else
diff --git a/include/configs/picosom-imx6ul_android_things.h b/include/configs/picosom-imx6ul_android_things.h
index b081d7c..d4f2af4 100644
--- a/include/configs/picosom-imx6ul_android_things.h
+++ b/include/configs/picosom-imx6ul_android_things.h
@@ -9,7 +9,7 @@
 #define __PICOSOM_IMX6UL_ANDROID_THINGS_H
 #include "mx_android_common.h"
 /* For NAND we don't support lock/unlock */
-#ifndef CONFIG_SYS_BOOT_NAND
+#ifndef CONFIG_NAND_BOOT
 #define CONFIG_FASTBOOT_LOCK
 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define FSL_FASTBOOT_FB_DEV "mmc"