From cfab69ac07715ba4b62d2c35ba5da99ce21ff520 Mon Sep 17 00:00:00 2001 From: Haoran Wang Date: Wed, 11 Oct 2017 15:44:24 +0800 Subject: [PATCH] [iot] Refine Android related configs Refined Android related configs to avoid duplicated defined macros. Test: Passed build for all i.MX SoMs. Merged-In: I0e93bd8173e3a0b9b0601d359950233702729fb3 Change-Id: I0e93bd8173e3a0b9b0601d359950233702729fb3 Signed-off-by: Haoran Wang --- configs/multa-imx7d_defconfig | 3 +++ configs/mx6ul_nxpu_iopb_defconfig | 3 +++ configs/mx6ul_nxpu_iopb_trusty_defconfig | 3 +++ configs/mx6ul_spriot_defconfig | 3 +++ configs/pico-imx6dl_defconfig | 3 +++ configs/pico-imx7d-trusty_defconfig | 3 +++ configs/pico-imx7d_defconfig | 3 +++ configs/picosom-imx6ul-trusty_defconfig | 3 +++ configs/picosom-imx6ul_defconfig | 3 +++ include/configs/mx_android_common.h | 2 -- 10 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configs/multa-imx7d_defconfig b/configs/multa-imx7d_defconfig index 338feb411f..6b4324c292 100644 --- a/configs/multa-imx7d_defconfig +++ b/configs/multa-imx7d_defconfig @@ -31,3 +31,6 @@ CONFIG_DFU_MMC=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y +CONFIG_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_CMD_FASTBOOT=y diff --git a/configs/mx6ul_nxpu_iopb_defconfig b/configs/mx6ul_nxpu_iopb_defconfig index 70f36cac4c..a8d365c21b 100644 --- a/configs/mx6ul_nxpu_iopb_defconfig +++ b/configs/mx6ul_nxpu_iopb_defconfig @@ -2,6 +2,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_nxpu_iopb/imximage.cf CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6UL_NXPU_IOPB=y +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/mx6ul_nxpu_iopb_trusty_defconfig b/configs/mx6ul_nxpu_iopb_trusty_defconfig index a1cac16ef9..c8e99b439c 100644 --- a/configs/mx6ul_nxpu_iopb_trusty_defconfig +++ b/configs/mx6ul_nxpu_iopb_trusty_defconfig @@ -4,6 +4,9 @@ CONFIG_ARCH_MX6=y CONFIG_IMX_TRUSTY_OS=y CONFIG_AVB_ATX=y CONFIG_TARGET_MX6UL_NXPU_IOPB=y +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/mx6ul_spriot_defconfig b/configs/mx6ul_spriot_defconfig index f67fc0d078..030437cb66 100644 --- a/configs/mx6ul_spriot_defconfig +++ b/configs/mx6ul_spriot_defconfig @@ -3,6 +3,9 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_SPRIOT=y +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/pico-imx6dl_defconfig b/configs/pico-imx6dl_defconfig index 5ab49878ea..09a21233fb 100755 --- a/configs/pico-imx6dl_defconfig +++ b/configs/pico-imx6dl_defconfig @@ -4,6 +4,9 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_PICO_IMX6DL=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_VIDEO=y diff --git a/configs/pico-imx7d-trusty_defconfig b/configs/pico-imx7d-trusty_defconfig index 3f27a9ad58..69fcf7d1fa 100644 --- a/configs/pico-imx7d-trusty_defconfig +++ b/configs/pico-imx7d-trusty_defconfig @@ -7,6 +7,9 @@ CONFIG_TARGET_PICO_IMX7D=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_VIDEO=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 7e63fec9e0..1842ea9ae2 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -5,6 +5,9 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_TARGET_PICO_IMX7D=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_VIDEO=y diff --git a/configs/picosom-imx6ul-trusty_defconfig b/configs/picosom-imx6ul-trusty_defconfig index 95ed189d92..af99c09dd2 100644 --- a/configs/picosom-imx6ul-trusty_defconfig +++ b/configs/picosom-imx6ul-trusty_defconfig @@ -6,6 +6,9 @@ CONFIG_AVB_ATX=y CONFIG_TARGET_PICOSOM_IMX6UL=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/picosom-imx6ul_defconfig b/configs/picosom-imx6ul_defconfig index 0fce71d05c..c326ab6c09 100644 --- a/configs/picosom-imx6ul_defconfig +++ b/configs/picosom-imx6ul_defconfig @@ -4,6 +4,9 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_PICOSOM_IMX6UL=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=-2 CONFIG_EFI_PARTITION=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/include/configs/mx_android_common.h b/include/configs/mx_android_common.h index f58f21add4..6a00ef229e 100644 --- a/include/configs/mx_android_common.h +++ b/include/configs/mx_android_common.h @@ -23,8 +23,6 @@ #define CONFIG_G_DNL_MANUFACTURER "FSL" #define CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_CMD_FASTBOOT -#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_FASTBOOT_FLASH #define CONFIG_FSL_FASTBOOT -- 2.17.1