Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f45d8242b0a716496af22c580d637241af3b9d52

Authored by Luo Ji
1 parent ee909cf54f
Exists in smarc-imx_v2017.03_o8.1.0_1.3.0_8m and in 1 other branch smarc-imx_v2017.03_4.9.88_2.0.0_ga

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 <ji.luo@nxp.com>

Showing 7 changed files with 293 additions and 8 deletions Side-by-side Diff

configs/mx8qm_mek_androidauto_defconfig
Diff comments   View file @ f45d824
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_IMX8=y
  3 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek"
  4 +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
  5 +CONFIG_TARGET_IMX8QM_MEK=y
  6 +CONFIG_EFI_PARTITION=y
  7 +CONFIG_CMD_IMPORTENV=n
  8 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  9 +CONFIG_DM=y
  10 +CONFIG_CMD_CACHE=y
  11 +
  12 +CONFIG_VIDEO_IMX_HDP_LOAD=y
  13 +CONFIG_DM_SERIAL=y
  14 +CONFIG_FSL_LPUART=y
  15 +CONFIG_OF_CONTROL=y
  16 +CONFIG_DM_I2C=y
  17 +# CONFIG_DM_I2C_COMPAT is not set
  18 +CONFIG_SYS_I2C_IMX_LPI2C=y
  19 +CONFIG_CMD_I2C=y
  20 +
  21 +CONFIG_CMD_USB=y
  22 +CONFIG_USB=y
  23 +CONFIG_DM_USB=y
  24 +CONFIG_USB_EHCI_HCD=y
  25 +CONFIG_USB_STORAGE=y
  26 +
  27 +CONFIG_CMD_USB_MASS_STORAGE=y
  28 +CONFIG_USB_GADGET=y
  29 +CONFIG_CI_UDC=y
  30 +CONFIG_USB_GADGET_DOWNLOAD=y
  31 +CONFIG_G_DNL_MANUFACTURER="FSL"
  32 +CONFIG_G_DNL_VENDOR_NUM=0x0525
  33 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  34 +
  35 +CONFIG_CMD_GPIO=y
  36 +CONFIG_DM_GPIO=y
  37 +CONFIG_DM_PCA953X=y
  38 +CONFIG_BOOTDELAY=1
  39 +CONFIG_IMX_BOOTAUX=y
  40 +CONFIG_CMD_FAT=y
  41 +CONFIG_CMD_MMC=y
  42 +CONFIG_DM_MMC=y
  43 +# CONFIG_BLK is not set
  44 +# CONFIG_DM_MMC_OPS is not set
  45 +CONFIG_FSL_FSPI=y
  46 +CONFIG_DM_SPI=y
  47 +CONFIG_DM_SPI_FLASH=y
  48 +CONFIG_SPI_FLASH=y
  49 +CONFIG_SPI_FLASH_4BYTES_ADDR=y
  50 +CONFIG_SPI_FLASH_STMICRO=y
  51 +CONFIG_CMD_SF=y
  52 +
  53 +CONFIG_CMD_PING=y
  54 +CONFIG_CMD_DHCP=y
  55 +CONFIG_CMD_MII=y
  56 +CONFIG_DM_ETH=y
  57 +# CONFIG_EFI_LOADER is not set
  58 +
  59 +CONFIG_DM_REGULATOR=y
  60 +CONFIG_DM_REGULATOR_FIXED=y
  61 +CONFIG_DM_REGULATOR_GPIO=y
  62 +
  63 +CONFIG_PINCTRL=y
  64 +CONFIG_PINCTRL_IMX8=y
  65 +
  66 +CONFIG_POWER_DOMAIN=y
  67 +CONFIG_IMX8_POWER_DOMAIN=y
  68 +
  69 +CONFIG_DM_THERMAL=y
  70 +CONFIG_IMX_SC_THERMAL=y
  71 +
  72 +CONFIG_LZ4=y
configs/mx8qxp_mek_androidauto_defconfig
Diff comments   View file @ f45d824
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_IMX8=y
  3 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek"
  4 +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
  5 +CONFIG_TARGET_IMX8QXP_MEK=y
  6 +CONFIG_EFI_PARTITION=y
  7 +CONFIG_CMD_IMPORTENV=n
  8 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  9 +CONFIG_DM=y
  10 +CONFIG_CMD_CACHE=y
  11 +
  12 +CONFIG_DM_SERIAL=y
  13 +CONFIG_FSL_LPUART=y
  14 +CONFIG_OF_CONTROL=y
  15 +CONFIG_DM_I2C=y
  16 +# CONFIG_DM_I2C_COMPAT is not set
  17 +CONFIG_SYS_I2C_IMX_LPI2C=y
  18 +CONFIG_CMD_I2C=y
  19 +CONFIG_I2C_MUX=y
  20 +CONFIG_I2C_MUX_PCA954x=y
  21 +
  22 +CONFIG_CMD_USB=y
  23 +CONFIG_USB=y
  24 +CONFIG_DM_USB=y
  25 +CONFIG_USB_EHCI_HCD=y
  26 +CONFIG_USB_STORAGE=y
  27 +
  28 +CONFIG_CMD_USB_MASS_STORAGE=y
  29 +CONFIG_USB_GADGET=y
  30 +CONFIG_CI_UDC=y
  31 +CONFIG_USB_GADGET_DOWNLOAD=y
  32 +CONFIG_G_DNL_MANUFACTURER="FSL"
  33 +CONFIG_G_DNL_VENDOR_NUM=0x0525
  34 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_CMD_GPIO=y
  37 +CONFIG_DM_GPIO=y
  38 +CONFIG_DM_PCA953X=y
  39 +CONFIG_BOOTDELAY=1
  40 +CONFIG_IMX_BOOTAUX=y
  41 +CONFIG_CMD_FAT=y
  42 +CONFIG_CMD_MMC=y
  43 +CONFIG_DM_MMC=y
  44 +# CONFIG_BLK is not set
  45 +# CONFIG_DM_MMC_OPS is not set
  46 +CONFIG_FSL_FSPI=y
  47 +CONFIG_DM_SPI=y
  48 +CONFIG_DM_SPI_FLASH=y
  49 +CONFIG_SPI_FLASH=y
  50 +CONFIG_SPI_FLASH_4BYTES_ADDR=y
  51 +CONFIG_SPI_FLASH_STMICRO=y
  52 +CONFIG_CMD_SF=y
  53 +
  54 +CONFIG_CMD_PING=y
  55 +CONFIG_CMD_DHCP=y
  56 +CONFIG_CMD_MII=y
  57 +CONFIG_DM_ETH=y
  58 +# CONFIG_EFI_LOADER is not set
  59 +
  60 +CONFIG_DM_REGULATOR=y
  61 +CONFIG_DM_REGULATOR_FIXED=y
  62 +CONFIG_DM_REGULATOR_GPIO=y
  63 +
  64 +CONFIG_PINCTRL=y
  65 +CONFIG_PINCTRL_IMX8=y
  66 +
  67 +CONFIG_POWER_DOMAIN=y
  68 +CONFIG_IMX8_POWER_DOMAIN=y
  69 +
  70 +CONFIG_DM_THERMAL=y
  71 +CONFIG_IMX_SC_THERMAL=y
  72 +
  73 +CONFIG_LZ4=y
include/configs/imx8qm_mek.h
Diff comments   View file @ f45d824
... ... @@ -299,10 +299,6 @@
299 299 #define CONFIG_SYS_FSL_FSPI_AHB
300 300 #endif
301 301  
302   -#if defined(CONFIG_ANDROID_SUPPORT)
303   -#include "imx8qm_mek_android.h"
304   -#endif
305   -
306 302 /* USB Config */
307 303 #ifdef CONFIG_CMD_USB
308 304 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
... ... @@ -340,5 +336,12 @@
340 336 #define CONFIG_OF_SYSTEM_SETUP
341 337 #define BOOTAUX_RESERVED_MEM_BASE 0x88000000
342 338 #define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */
  339 +
  340 +#if defined(CONFIG_ANDROID_SUPPORT)
  341 +#include "imx8qm_mek_android.h"
  342 +#elif defined (CONFIG_ANDROID_AUTO_SUPPORT)
  343 +#include "imx8qm_mek_android_auto.h"
  344 +#endif
  345 +
343 346 #endif /* __IMX8QM_MEK_H */
include/configs/imx8qm_mek_android_auto.h
Diff comments   View file @ f45d824
  1 +/*
  2 + * Copyright 2017 NXP
  3 + *
  4 + * SPDX-License-Identifier: GPL-2.0+
  5 + */
  6 +
  7 +#ifndef IMX8QM_MEK_ANDROID_AUTO_H
  8 +#define IMX8QM_MEK_ANDROID_AUTO_H
  9 +
  10 +#define CONFIG_USBD_HS
  11 +#define CONFIG_BOOTLOADER_OFFSET_33K
  12 +
  13 +#define CONFIG_BCB_SUPPORT
  14 +#define CONFIG_CMD_READ
  15 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  16 +#define CONFIG_USB_GADGET_VBUS_DRAW 2
  17 +
  18 +#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
  19 +#define CONFIG_ANDROID_AB_SUPPORT
  20 +#define CONFIG_AVB_SUPPORT
  21 +#define CONFIG_SUPPORT_EMMC_RPMB
  22 +#define CONFIG_SYSTEM_RAMDISK_SUPPORT
  23 +#define CONFIG_AVB_FUSE_BANK_SIZEW 0
  24 +#define CONFIG_AVB_FUSE_BANK_START 0
  25 +#define CONFIG_AVB_FUSE_BANK_END 0
  26 +#define CONFIG_FASTBOOT_LOCK
  27 +#define FSL_FASTBOOT_FB_DEV "mmc"
  28 +
  29 +#define IMX_LOAD_HDMI_FIMRWARE
  30 +#define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_256M)
  31 +#define IMX_HDMI_FIRMWARE_SIZE 0x20000
  32 +
  33 +#ifdef CONFIG_SYS_MALLOC_LEN
  34 +#undef CONFIG_SYS_MALLOC_LEN
  35 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  36 +#endif
  37 +
  38 +#define CONFIG_USB_FUNCTION_FASTBOOT
  39 +#define CONFIG_CMD_FASTBOOT
  40 +
  41 +#define CONFIG_ANDROID_BOOT_IMAGE
  42 +#define CONFIG_FASTBOOT_FLASH
  43 +
  44 +#define CONFIG_FSL_FASTBOOT
  45 +#define CONFIG_ANDROID_RECOVERY
  46 +
  47 +#if defined CONFIG_SYS_BOOT_SATA
  48 +#define CONFIG_FASTBOOT_STORAGE_SATA
  49 +#define CONFIG_FASTBOOT_SATA_NO 0
  50 +#else
  51 +#define CONFIG_FASTBOOT_STORAGE_MMC
  52 +#endif
  53 +
  54 +#define CONFIG_CMD_BOOTA
  55 +#define CONFIG_SUPPORT_RAW_INITRD
  56 +#define CONFIG_SERIAL_TAG
  57 +
  58 +#undef CONFIG_EXTRA_ENV_SETTINGS
  59 +#undef CONFIG_BOOTCOMMAND
  60 +
  61 +#define CONFIG_EXTRA_ENV_SETTINGS \
  62 + "splashpos=m,m\0" \
  63 + "fdt_high=0xffffffffffffffff\0" \
  64 + "initrd_high=0xffffffffffffffff\0" \
  65 +
  66 +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
  67 +#define CONFIG_FASTBOOT_BUF_SIZE 0x19000000
  68 +
  69 +#endif /* IMX8QM_MEK_ANDROID_AUTO_H */
include/configs/imx8qxp_mek.h
Diff comments   View file @ f45d824
... ... @@ -274,10 +274,6 @@
274 274 #define CONFIG_SYS_FSL_FSPI_AHB
275 275 #endif
276 276  
277   -#if defined(CONFIG_ANDROID_SUPPORT)
278   -#include "imx8qxp_mek_android.h"
279   -#endif
280   -
281 277 /* USB Config */
282 278 #ifdef CONFIG_CMD_USB
283 279 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
... ... @@ -315,6 +311,12 @@
315 311 #define CONFIG_OF_SYSTEM_SETUP
316 312 #define BOOTAUX_RESERVED_MEM_BASE 0x88000000
317 313 #define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */
  314 +
  315 +#if defined(CONFIG_ANDROID_SUPPORT)
  316 +#include "imx8qxp_mek_android.h"
  317 +#elif defined (CONFIG_ANDROID_AUTO_SUPPORT)
  318 +#include "imx8qxp_mek_android_auto.h"
  319 +#endif
318 320  
319 321 #endif /* __IMX8QXP_MEK_H */
include/configs/imx8qxp_mek_android_auto.h
Diff comments   View file @ f45d824
  1 +/*
  2 + * Copyright 2017 NXP
  3 + *
  4 + * SPDX-License-Identifier: GPL-2.0+
  5 + */
  6 +
  7 +#ifndef IMX8QXP_MEK_ANDROID_AUTO_H
  8 +#define IMX8QXP_MEK_ANDROID_AUTO_H
  9 +
  10 +#define CONFIG_USBD_HS
  11 +#define CONFIG_BOOTLOADER_OFFSET_33K
  12 +
  13 +#define CONFIG_BCB_SUPPORT
  14 +#define CONFIG_CMD_READ
  15 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  16 +#define CONFIG_USB_GADGET_VBUS_DRAW 2
  17 +
  18 +#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
  19 +#define CONFIG_ANDROID_AB_SUPPORT
  20 +#define CONFIG_AVB_SUPPORT
  21 +#define CONFIG_SUPPORT_EMMC_RPMB
  22 +#define CONFIG_SYSTEM_RAMDISK_SUPPORT
  23 +#define CONFIG_AVB_FUSE_BANK_SIZEW 0
  24 +#define CONFIG_AVB_FUSE_BANK_START 0
  25 +#define CONFIG_AVB_FUSE_BANK_END 0
  26 +#define CONFIG_FASTBOOT_LOCK
  27 +#define FSL_FASTBOOT_FB_DEV "mmc"
  28 +
  29 +#ifdef CONFIG_SYS_MALLOC_LEN
  30 +#undef CONFIG_SYS_MALLOC_LEN
  31 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  32 +#endif
  33 +
  34 +#define CONFIG_USB_FUNCTION_FASTBOOT
  35 +#define CONFIG_CMD_FASTBOOT
  36 +
  37 +#define CONFIG_ANDROID_BOOT_IMAGE
  38 +#define CONFIG_FASTBOOT_FLASH
  39 +
  40 +#define CONFIG_FSL_FASTBOOT
  41 +#define CONFIG_ANDROID_RECOVERY
  42 +
  43 +#if defined CONFIG_SYS_BOOT_SATA
  44 +#define CONFIG_FASTBOOT_STORAGE_SATA
  45 +#define CONFIG_FASTBOOT_SATA_NO 0
  46 +#else
  47 +#define CONFIG_FASTBOOT_STORAGE_MMC
  48 +#endif
  49 +
  50 +#define CONFIG_CMD_BOOTA
  51 +#define CONFIG_SUPPORT_RAW_INITRD
  52 +#define CONFIG_SERIAL_TAG
  53 +
  54 +#undef CONFIG_EXTRA_ENV_SETTINGS
  55 +#undef CONFIG_BOOTCOMMAND
  56 +
  57 +#define CONFIG_EXTRA_ENV_SETTINGS \
  58 + "splashpos=m,m\0" \
  59 + "fdt_high=0xffffffffffffffff\0" \
  60 + "initrd_high=0xffffffffffffffff\0" \
  61 +
  62 +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
  63 +#define CONFIG_FASTBOOT_BUF_SIZE 0x19000000
  64 +
  65 +#endif /* IMX8QXP_MEK_ANDROID_AUTO_H */
scripts/config_whitelist.txt
Diff comments   View file @ f45d824
... ... @@ -96,6 +96,7 @@
96 96 CONFIG_ANDES_PCU
97 97 CONFIG_ANDES_PCU_BASE
98 98 CONFIG_ANDROID_AB_SUPPORT
  99 +CONFIG_ANDROID_AUTO_SUPPORT
99 100 CONFIG_ANDROID_SUPPORT
100 101 CONFIG_ANDROID_THINGS_SUPPORT
101 102 CONFIG_AP325RXA