Commit 37116ed5 by zhang sanshan Committed by Chen Guoyin

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: 's avatarzhang sanshan <sanshan.zhang@nxp.com>
parent 259db9dc
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment