Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 37116ed50d94ba67dd6de32b3f852d57846bc7b4

Authored by zhang sanshan
Committed by Chen Guoyin
1 parent 259db9dccf
Exists in smarc-n7.1.2_2.0.0-ga and in 2 other branches smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga

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>

Showing 12 changed files with 17 additions and 17 deletions Side-by-side Diff

include/configs/mx6qarm2_android.h
Diff comments   View file @ 37116ed
... ... @@ -29,7 +29,7 @@
29 29 #define CONFIG_FASTBOOT_FLASH
30 30  
31 31 /* For NAND we don't support lock/unlock */
32   -#ifndef CONFIG_SYS_BOOT_NAND
  32 +#ifndef CONFIG_NAND_BOOT
33 33 #define CONFIG_FASTBOOT_LOCK
34 34 #endif
35 35  
... ... @@ -46,7 +46,7 @@
46 46 #define CONFIG_FSL_FASTBOOT
47 47 #define CONFIG_ANDROID_RECOVERY
48 48  
49   -#if defined CONFIG_SYS_BOOT_NAND
  49 +#if defined CONFIG_NAND_BOOT
50 50 #define CONFIG_FASTBOOT_STORAGE_NAND
51 51 #elif defined CONFIG_SYS_BOOT_SATA
52 52 #define CONFIG_FASTBOOT_STORAGE_SATA
include/configs/mx6ul_14x14_evkandroidthings.h
Diff comments   View file @ 37116ed
... ... @@ -9,7 +9,7 @@
9 9 #define __MX6UL_14x14_EVKANDROIDTHINGS_H
10 10 #include "mx_android_common.h"
11 11 /* For NAND we don't support lock/unlock */
12   -#ifndef CONFIG_SYS_BOOT_NAND
  12 +#ifndef CONFIG_NAND_BOOT
13 13 #define CONFIG_FASTBOOT_LOCK
14 14 #define FSL_FASTBOOT_FB_DEV "mmc"
15 15 #endif
include/configs/mx6ul_aquila.h
Diff comments   View file @ 37116ed
... ... @@ -139,7 +139,7 @@
139 139 "initrd_high=0xffffffff\0" \
140 140 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
141 141  
142   -#if defined(CONFIG_SYS_BOOT_NAND)
  142 +#if defined(CONFIG_NAND_BOOT)
143 143 #define CONFIG_EXTRA_ENV_SETTINGS \
144 144 CONFIG_MFG_ENV_SETTINGS \
145 145 "panel=TFT43AB\0" \
... ... @@ -262,7 +262,7 @@
262 262 #ifdef CONFIG_SYS_BOOT_QSPI
263 263 #define CONFIG_FSL_QSPI
264 264 #define CONFIG_ENV_IS_IN_SPI_FLASH
265   -#elif defined CONFIG_SYS_BOOT_NAND
  265 +#elif defined CONFIG_NAND_BOOT
266 266 #define CONFIG_SYS_USE_NAND
267 267 #define CONFIG_ENV_IS_IN_NAND
268 268 #else
include/configs/mx6ul_aquila_android_things.h
Diff comments   View file @ 37116ed
... ... @@ -9,7 +9,7 @@
9 9 #define __PICOSOM_IMX6UL_ANDROID_THINGS_H
10 10 #include "mx_android_common.h"
11 11 /* For NAND we don't support lock/unlock */
12   -#ifndef CONFIG_SYS_BOOT_NAND
  12 +#ifndef CONFIG_NAND_BOOT
13 13 #define CONFIG_FASTBOOT_LOCK
14 14 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
15 15 #define FSL_FASTBOOT_FB_DEV "mmc"
include/configs/mx6ul_nxpu_iopb.h
Diff comments   View file @ 37116ed
... ... @@ -132,7 +132,7 @@
132 132 "initrd_high=0xffffffff\0" \
133 133 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
134 134  
135   -#if defined(CONFIG_SYS_BOOT_NAND)
  135 +#if defined(CONFIG_NAND_BOOT)
136 136 #define CONFIG_EXTRA_ENV_SETTINGS \
137 137 CONFIG_MFG_ENV_SETTINGS \
138 138 "panel=TFT43AB\0" \
... ... @@ -263,7 +263,7 @@
263 263 #ifdef CONFIG_SYS_BOOT_QSPI
264 264 #define CONFIG_FSL_QSPI
265 265 #define CONFIG_ENV_IS_IN_SPI_FLASH
266   -#elif defined CONFIG_SYS_BOOT_NAND
  266 +#elif defined CONFIG_NAND_BOOT
267 267 #define CONFIG_SYS_USE_NAND
268 268 #define CONFIG_ENV_IS_IN_NAND
269 269 #else
include/configs/mx6ul_nxpu_iopb_android_things.h
Diff comments   View file @ 37116ed
... ... @@ -9,7 +9,7 @@
9 9 #define __MX6UL_NXPU_IOPB_ANDROID_THINGS_H
10 10 #include "mx_android_common.h"
11 11 /* For NAND we don't support lock/unlock */
12   -#ifndef CONFIG_SYS_BOOT_NAND
  12 +#ifndef CONFIG_NAND_BOOT
13 13 #define CONFIG_FASTBOOT_LOCK
14 14 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
15 15 #define FSL_FASTBOOT_FB_DEV "mmc"
include/configs/mx7dsabresd_androidthings.h
Diff comments   View file @ 37116ed
... ... @@ -11,7 +11,7 @@
11 11 #define CONFIG_CMD_FAT
12 12  
13 13 /* For NAND we don't support lock/unlock */
14   -#ifndef CONFIG_SYS_BOOT_NAND
  14 +#ifndef CONFIG_NAND_BOOT
15 15 #define CONFIG_FASTBOOT_LOCK
16 16 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
17 17 #define FSL_FASTBOOT_FB_DEV "mmc"
include/configs/mx_android_common.h
Diff comments   View file @ 37116ed
... ... @@ -30,7 +30,7 @@
30 30 #define CONFIG_FSL_FASTBOOT
31 31 #define CONFIG_ANDROID_RECOVERY
32 32  
33   -#if defined CONFIG__NAND_BOOT
  33 +#if defined CONFIG_NAND_BOOT
34 34 #define CONFIG_FASTBOOT_STORAGE_NAND
35 35 #elif defined CONFIG_SYS_BOOT_SATA
36 36 #define CONFIG_FASTBOOT_STORAGE_SATA
include/configs/pico-imx7d.h
Diff comments   View file @ 37116ed
... ... @@ -140,7 +140,7 @@
140 140 "initrd_high=0xffffffff\0" \
141 141 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
142 142  
143   -#if defined(CONFIG_SYS_BOOT_NAND)
  143 +#if defined(CONFIG_NAND_BOOT)
144 144 #define CONFIG_EXTRA_ENV_SETTINGS \
145 145 CONFIG_MFG_ENV_SETTINGS \
146 146 "panel=EJ050NA\0" \
... ... @@ -272,7 +272,7 @@
272 272 #ifdef CONFIG_SYS_BOOT_QSPI
273 273 #define CONFIG_SYS_USE_QSPI
274 274 #define CONFIG_ENV_IS_IN_SPI_FLASH
275   -#elif defined CONFIG_SYS_BOOT_NAND
  275 +#elif defined CONFIG_NAND_BOOT
276 276 #define CONFIG_SYS_USE_NAND
277 277 #define CONFIG_ENV_IS_IN_NAND
278 278 #else
include/configs/pico-imx7dandroidthings.h
Diff comments   View file @ 37116ed
... ... @@ -10,7 +10,7 @@
10 10  
11 11  
12 12 /* For NAND we don't support lock/unlock */
13   -#ifndef CONFIG_SYS_BOOT_NAND
  13 +#ifndef CONFIG_NAND_BOOT
14 14 #define CONFIG_FASTBOOT_LOCK
15 15 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
16 16 #define FSL_FASTBOOT_FB_DEV "mmc"
include/configs/picosom-imx6ul.h
Diff comments   View file @ 37116ed
... ... @@ -92,7 +92,7 @@
92 92 "initrd_high=0xffffffff\0" \
93 93 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
94 94  
95   -#if defined(CONFIG_SYS_BOOT_NAND)
  95 +#if defined(CONFIG_NAND_BOOT)
96 96 #define CONFIG_EXTRA_ENV_SETTINGS \
97 97 CONFIG_MFG_ENV_SETTINGS \
98 98 "panel=TFT43AB\0" \
... ... @@ -186,7 +186,7 @@
186 186 #ifdef CONFIG_QSPI_BOOT
187 187 #define CONFIG_FSL_QSPI
188 188 #define CONFIG_ENV_IS_IN_SPI_FLASH
189   -#elif defined CONFIG_SYS_BOOT_NAND
  189 +#elif defined CONFIG_NAND_BOOT
190 190 #define CONFIG_SYS_USE_NAND
191 191 #define CONFIG_ENV_IS_IN_NAND
192 192 #else
include/configs/picosom-imx6ul_android_things.h
Diff comments   View file @ 37116ed
... ... @@ -9,7 +9,7 @@
9 9 #define __PICOSOM_IMX6UL_ANDROID_THINGS_H
10 10 #include "mx_android_common.h"
11 11 /* For NAND we don't support lock/unlock */
12   -#ifndef CONFIG_SYS_BOOT_NAND
  12 +#ifndef CONFIG_NAND_BOOT
13 13 #define CONFIG_FASTBOOT_LOCK
14 14 #define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
15 15 #define FSL_FASTBOOT_FB_DEV "mmc"