From f45d8242b0a716496af22c580d637241af3b9d52 Mon Sep 17 00:00:00 2001 From: Luo Ji Date: Fri, 9 Mar 2018 12:49:47 +0800 Subject: [PATCH] MA-11446 [Android Auto] Init config files for Android Auto Create Android Auto config files for imx8qxp/imx8qm, init version is copied from normal Android configs for imx8qxp/imx8qm. Change-Id: Id187efad711a133e6de3c7bcda8d2bdb9e6a97a6 Signed-off-by: Luo Ji --- configs/mx8qm_mek_androidauto_defconfig | 72 +++++++++++++++++++++ configs/mx8qxp_mek_androidauto_defconfig | 73 ++++++++++++++++++++++ include/configs/imx8qm_mek.h | 11 ++-- include/configs/imx8qm_mek_android_auto.h | 69 ++++++++++++++++++++ include/configs/imx8qxp_mek.h | 10 +-- include/configs/imx8qxp_mek_android_auto.h | 65 +++++++++++++++++++ scripts/config_whitelist.txt | 1 + 7 files changed, 293 insertions(+), 8 deletions(-) create mode 100644 configs/mx8qm_mek_androidauto_defconfig create mode 100644 configs/mx8qxp_mek_androidauto_defconfig create mode 100644 include/configs/imx8qm_mek_android_auto.h create mode 100644 include/configs/imx8qxp_mek_android_auto.h diff --git a/configs/mx8qm_mek_androidauto_defconfig b/configs/mx8qm_mek_androidauto_defconfig new file mode 100644 index 0000000000..ba6afee225 --- /dev/null +++ b/configs/mx8qm_mek_androidauto_defconfig @@ -0,0 +1,72 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek" +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" +CONFIG_TARGET_IMX8QM_MEK=y +CONFIG_EFI_PARTITION=y +CONFIG_CMD_IMPORTENV=n +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DM=y +CONFIG_CMD_CACHE=y + +CONFIG_VIDEO_IMX_HDP_LOAD=y +CONFIG_DM_SERIAL=y +CONFIG_FSL_LPUART=y +CONFIG_OF_CONTROL=y +CONFIG_DM_I2C=y +# CONFIG_DM_I2C_COMPAT is not set +CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_CMD_I2C=y + +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y + +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 + +CONFIG_CMD_GPIO=y +CONFIG_DM_GPIO=y +CONFIG_DM_PCA953X=y +CONFIG_BOOTDELAY=1 +CONFIG_IMX_BOOTAUX=y +CONFIG_CMD_FAT=y +CONFIG_CMD_MMC=y +CONFIG_DM_MMC=y +# CONFIG_BLK is not set +# CONFIG_DM_MMC_OPS is not set +CONFIG_FSL_FSPI=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_4BYTES_ADDR=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CMD_SF=y + +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_DM_ETH=y +# CONFIG_EFI_LOADER is not set + +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y + +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX8=y + +CONFIG_POWER_DOMAIN=y +CONFIG_IMX8_POWER_DOMAIN=y + +CONFIG_DM_THERMAL=y +CONFIG_IMX_SC_THERMAL=y + +CONFIG_LZ4=y diff --git a/configs/mx8qxp_mek_androidauto_defconfig b/configs/mx8qxp_mek_androidauto_defconfig new file mode 100644 index 0000000000..2a88561779 --- /dev/null +++ b/configs/mx8qxp_mek_androidauto_defconfig @@ -0,0 +1,73 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek" +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" +CONFIG_TARGET_IMX8QXP_MEK=y +CONFIG_EFI_PARTITION=y +CONFIG_CMD_IMPORTENV=n +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DM=y +CONFIG_CMD_CACHE=y + +CONFIG_DM_SERIAL=y +CONFIG_FSL_LPUART=y +CONFIG_OF_CONTROL=y +CONFIG_DM_I2C=y +# CONFIG_DM_I2C_COMPAT is not set +CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_CMD_I2C=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y + +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y + +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 + +CONFIG_CMD_GPIO=y +CONFIG_DM_GPIO=y +CONFIG_DM_PCA953X=y +CONFIG_BOOTDELAY=1 +CONFIG_IMX_BOOTAUX=y +CONFIG_CMD_FAT=y +CONFIG_CMD_MMC=y +CONFIG_DM_MMC=y +# CONFIG_BLK is not set +# CONFIG_DM_MMC_OPS is not set +CONFIG_FSL_FSPI=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_4BYTES_ADDR=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CMD_SF=y + +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_DM_ETH=y +# CONFIG_EFI_LOADER is not set + +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y + +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX8=y + +CONFIG_POWER_DOMAIN=y +CONFIG_IMX8_POWER_DOMAIN=y + +CONFIG_DM_THERMAL=y +CONFIG_IMX_SC_THERMAL=y + +CONFIG_LZ4=y diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index f44611a04f..0971d475d9 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -299,10 +299,6 @@ #define CONFIG_SYS_FSL_FSPI_AHB #endif -#if defined(CONFIG_ANDROID_SUPPORT) -#include "imx8qm_mek_android.h" -#endif - /* USB Config */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 @@ -340,4 +336,11 @@ #define CONFIG_OF_SYSTEM_SETUP #define BOOTAUX_RESERVED_MEM_BASE 0x88000000 #define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ + +#if defined(CONFIG_ANDROID_SUPPORT) +#include "imx8qm_mek_android.h" +#elif defined (CONFIG_ANDROID_AUTO_SUPPORT) +#include "imx8qm_mek_android_auto.h" +#endif + #endif /* __IMX8QM_MEK_H */ diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h new file mode 100644 index 0000000000..3b5ef5631b --- /dev/null +++ b/include/configs/imx8qm_mek_android_auto.h @@ -0,0 +1,69 @@ +/* + * Copyright 2017 NXP + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef IMX8QM_MEK_ANDROID_AUTO_H +#define IMX8QM_MEK_ANDROID_AUTO_H + +#define CONFIG_USBD_HS +#define CONFIG_BOOTLOADER_OFFSET_33K + +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_VBUS_DRAW 2 + +#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT +#define CONFIG_ANDROID_AB_SUPPORT +#define CONFIG_AVB_SUPPORT +#define CONFIG_SUPPORT_EMMC_RPMB +#define CONFIG_SYSTEM_RAMDISK_SUPPORT +#define CONFIG_AVB_FUSE_BANK_SIZEW 0 +#define CONFIG_AVB_FUSE_BANK_START 0 +#define CONFIG_AVB_FUSE_BANK_END 0 +#define CONFIG_FASTBOOT_LOCK +#define FSL_FASTBOOT_FB_DEV "mmc" + +#define IMX_LOAD_HDMI_FIMRWARE +#define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_256M) +#define IMX_HDMI_FIRMWARE_SIZE 0x20000 + +#ifdef CONFIG_SYS_MALLOC_LEN +#undef CONFIG_SYS_MALLOC_LEN +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M) +#endif + +#define CONFIG_USB_FUNCTION_FASTBOOT +#define CONFIG_CMD_FASTBOOT + +#define CONFIG_ANDROID_BOOT_IMAGE +#define CONFIG_FASTBOOT_FLASH + +#define CONFIG_FSL_FASTBOOT +#define CONFIG_ANDROID_RECOVERY + +#if defined CONFIG_SYS_BOOT_SATA +#define CONFIG_FASTBOOT_STORAGE_SATA +#define CONFIG_FASTBOOT_SATA_NO 0 +#else +#define CONFIG_FASTBOOT_STORAGE_MMC +#endif + +#define CONFIG_CMD_BOOTA +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_SERIAL_TAG + +#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CONFIG_BOOTCOMMAND + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "splashpos=m,m\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR +#define CONFIG_FASTBOOT_BUF_SIZE 0x19000000 + +#endif /* IMX8QM_MEK_ANDROID_AUTO_H */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 9aa981af55..a916562c4b 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -274,10 +274,6 @@ #define CONFIG_SYS_FSL_FSPI_AHB #endif -#if defined(CONFIG_ANDROID_SUPPORT) -#include "imx8qxp_mek_android.h" -#endif - /* USB Config */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 @@ -316,4 +312,10 @@ #define BOOTAUX_RESERVED_MEM_BASE 0x88000000 #define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ +#if defined(CONFIG_ANDROID_SUPPORT) +#include "imx8qxp_mek_android.h" +#elif defined (CONFIG_ANDROID_AUTO_SUPPORT) +#include "imx8qxp_mek_android_auto.h" +#endif + #endif /* __IMX8QXP_MEK_H */ diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h new file mode 100644 index 0000000000..fb01405c10 --- /dev/null +++ b/include/configs/imx8qxp_mek_android_auto.h @@ -0,0 +1,65 @@ +/* + * Copyright 2017 NXP + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef IMX8QXP_MEK_ANDROID_AUTO_H +#define IMX8QXP_MEK_ANDROID_AUTO_H + +#define CONFIG_USBD_HS +#define CONFIG_BOOTLOADER_OFFSET_33K + +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_VBUS_DRAW 2 + +#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT +#define CONFIG_ANDROID_AB_SUPPORT +#define CONFIG_AVB_SUPPORT +#define CONFIG_SUPPORT_EMMC_RPMB +#define CONFIG_SYSTEM_RAMDISK_SUPPORT +#define CONFIG_AVB_FUSE_BANK_SIZEW 0 +#define CONFIG_AVB_FUSE_BANK_START 0 +#define CONFIG_AVB_FUSE_BANK_END 0 +#define CONFIG_FASTBOOT_LOCK +#define FSL_FASTBOOT_FB_DEV "mmc" + +#ifdef CONFIG_SYS_MALLOC_LEN +#undef CONFIG_SYS_MALLOC_LEN +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M) +#endif + +#define CONFIG_USB_FUNCTION_FASTBOOT +#define CONFIG_CMD_FASTBOOT + +#define CONFIG_ANDROID_BOOT_IMAGE +#define CONFIG_FASTBOOT_FLASH + +#define CONFIG_FSL_FASTBOOT +#define CONFIG_ANDROID_RECOVERY + +#if defined CONFIG_SYS_BOOT_SATA +#define CONFIG_FASTBOOT_STORAGE_SATA +#define CONFIG_FASTBOOT_SATA_NO 0 +#else +#define CONFIG_FASTBOOT_STORAGE_MMC +#endif + +#define CONFIG_CMD_BOOTA +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_SERIAL_TAG + +#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CONFIG_BOOTCOMMAND + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "splashpos=m,m\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR +#define CONFIG_FASTBOOT_BUF_SIZE 0x19000000 + +#endif /* IMX8QXP_MEK_ANDROID_AUTO_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ab1df16a9d..20fe95d99c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -96,6 +96,7 @@ CONFIG_AMCORE CONFIG_ANDES_PCU CONFIG_ANDES_PCU_BASE CONFIG_ANDROID_AB_SUPPORT +CONFIG_ANDROID_AUTO_SUPPORT CONFIG_ANDROID_SUPPORT CONFIG_ANDROID_THINGS_SUPPORT CONFIG_AP325RXA -- 2.17.1