Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 900441243620b01ee0009c6cb7cac35f0871cf25

Authored by Ji Luo
1 parent 03f8d39821
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

MA-15601-1 Duplicate config to enable secure unlock for imx8q 

Duplicate config based on trusty enabled config file to enable
secure unlock for imx8q standard Android.

Test: boot.

Change-Id: Ib47dc2ecc2d5be69ed840236b6532559eca577f7
Signed-off-by: Ji Luo <ji.luo@nxp.com>

Showing 2 changed files with 302 additions and 0 deletions Side-by-side Diff

configs/imx8qm_mek_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 9004412
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_IMX8=y
  3 +CONFIG_SYS_TEXT_BASE=0x80020000
  4 +CONFIG_SPL_GPIO_SUPPORT=y
  5 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  6 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  7 +CONFIG_SYS_MALLOC_F_LEN=0x8000
  8 +CONFIG_TARGET_IMX8QM_MEK=y
  9 +CONFIG_SPL_MMC_SUPPORT=y
  10 +CONFIG_SPL_EFI_PARTITION=n
  11 +CONFIG_SPL_DOS_PARTITION=n
  12 +CONFIG_SPL_DM_SEQ_ALIAS=y
  13 +CONFIG_SPL_SERIAL_SUPPORT=y
  14 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  15 +CONFIG_USE_TINY_PRINTF=y
  16 +CONFIG_SPL=y
  17 +CONFIG_PANIC_HANG=y
  18 +CONFIG_NR_DRAM_BANKS=4
  19 +CONFIG_FIT=y
  20 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_SUPPORT"
  21 +CONFIG_BOOTDELAY=1
  22 +CONFIG_LOG=y
  23 +CONFIG_SPL_BOARD_INIT=y
  24 +# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
  25 +CONFIG_SPL_SEPARATE_BSS=y
  26 +CONFIG_SPL_POWER_SUPPORT=y
  27 +CONFIG_SPL_POWER_DOMAIN=y
  28 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  29 +CONFIG_HUSH_PARSER=y
  30 +CONFIG_CMD_CPU=y
  31 +# CONFIG_CMD_IMPORTENV is not set
  32 +CONFIG_CMD_CLK=y
  33 +CONFIG_CMD_DM=y
  34 +CONFIG_CMD_GPIO=y
  35 +CONFIG_CMD_I2C=y
  36 +CONFIG_CMD_MMC=y
  37 +CONFIG_CMD_DHCP=y
  38 +CONFIG_CMD_MII=y
  39 +CONFIG_CMD_PING=y
  40 +CONFIG_CMD_CACHE=y
  41 +CONFIG_CMD_FAT=y
  42 +CONFIG_SPL_OF_CONTROL=y
  43 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek"
  44 +CONFIG_ENV_IS_IN_MMC=y
  45 +CONFIG_SPL_DM=y
  46 +CONFIG_SPL_CLK=y
  47 +CONFIG_CLK_IMX8=y
  48 +CONFIG_CPU=y
  49 +CONFIG_DM_GPIO=y
  50 +CONFIG_MXC_GPIO=y
  51 +CONFIG_DM_PCA953X=y
  52 +CONFIG_DM_I2C=y
  53 +CONFIG_SYS_I2C_IMX_LPI2C=y
  54 +CONFIG_I2C_MUX=y
  55 +CONFIG_I2C_MUX_PCA954x=y
  56 +CONFIG_MISC=y
  57 +CONFIG_DM_MMC=y
  58 +CONFIG_MMC_IO_VOLTAGE=y
  59 +CONFIG_MMC_UHS_SUPPORT=y
  60 +CONFIG_MMC_HS400_SUPPORT=y
  61 +CONFIG_EFI_PARTITION=y
  62 +CONFIG_PHYLIB=y
  63 +CONFIG_PHY_ADDR_ENABLE=y
  64 +CONFIG_PHY_ATHEROS=y
  65 +CONFIG_DM_ETH=y
  66 +CONFIG_PHY_GIGE=y
  67 +CONFIG_FEC_MXC_SHARE_MDIO=y
  68 +CONFIG_FEC_MXC_MDIO_BASE=0x5B040000
  69 +CONFIG_FEC_MXC=y
  70 +CONFIG_MII=y
  71 +CONFIG_PINCTRL=y
  72 +CONFIG_SPL_PINCTRL=y
  73 +CONFIG_PINCTRL_IMX8=y
  74 +CONFIG_POWER_DOMAIN=y
  75 +CONFIG_IMX8_POWER_DOMAIN=y
  76 +CONFIG_DM_REGULATOR=y
  77 +CONFIG_SPL_DM_REGULATOR=y
  78 +CONFIG_DM_REGULATOR_FIXED=y
  79 +CONFIG_DM_REGULATOR_GPIO=y
  80 +CONFIG_SPL_DM_REGULATOR_FIXED=y
  81 +CONFIG_DM_SERIAL=y
  82 +CONFIG_FSL_LPUART=y
  83 +CONFIG_SPL_TINY_MEMSET=y
  84 +# CONFIG_EFI_LOADER is not set
  85 +
  86 +CONFIG_CMD_FUSE=y
  87 +CONFIG_SMC_FUSE=y
  88 +CONFIG_CMD_MEMTEST=y
  89 +
  90 +CONFIG_IMX_BOOTAUX=y
  91 +
  92 +CONFIG_DM_THERMAL=y
  93 +CONFIG_IMX_SC_THERMAL=y
  94 +
  95 +CONFIG_VIDEO=y
  96 +CONFIG_VIDEO_IMX_HDP_LOAD=y
  97 +
  98 +CONFIG_SPI=y
  99 +CONFIG_FSL_FSPI=y
  100 +CONFIG_DM_SPI=y
  101 +CONFIG_DM_SPI_FLASH=y
  102 +CONFIG_SPI_FLASH=y
  103 +CONFIG_SPI_FLASH_STMICRO=y
  104 +CONFIG_CMD_SF=y
  105 +CONFIG_SF_DEFAULT_BUS=0
  106 +CONFIG_SF_DEFAULT_CS=0
  107 +CONFIG_SF_DEFAULT_SPEED=40000000
  108 +CONFIG_SF_DEFAULT_MODE=0
  109 +
  110 +CONFIG_USB_XHCI_HCD=y
  111 +CONFIG_USB_XHCI_IMX8=y
  112 +CONFIG_DM_USB=y
  113 +CONFIG_DM_USB_GADGET=y
  114 +CONFIG_SPL_DM_USB_GADGET=y
  115 +CONFIG_USB=y
  116 +CONFIG_USB_TCPC=y
  117 +CONFIG_USB_GADGET=y
  118 +# CONFIG_CI_UDC=y
  119 +CONFIG_USB_GADGET_DOWNLOAD=y
  120 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  121 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  122 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  123 +CONFIG_USB_CDNS3=y
  124 +CONFIG_USB_CDNS3_GADGET=y
  125 +CONFIG_USB_GADGET_DUALSPEED=y
  126 +
  127 +CONFIG_SPL_USB_GADGET=y
  128 +CONFIG_SPL_USB_SDP_SUPPORT=y
  129 +CONFIG_SPL_SDP_USB_DEV=1
  130 +CONFIG_SDP_LOADADDR=0x80400000
  131 +
  132 +CONFIG_FASTBOOT=y
  133 +CONFIG_USB_FUNCTION_FASTBOOT=y
  134 +CONFIG_CMD_FASTBOOT=y
  135 +CONFIG_ANDROID_BOOT_IMAGE=y
  136 +CONFIG_FASTBOOT_UUU_SUPPORT=n
  137 +CONFIG_FSL_FASTBOOT=y
  138 +CONFIG_FASTBOOT_BUF_ADDR=0x98000000
  139 +CONFIG_FASTBOOT_BUF_SIZE=0x19000000
  140 +CONFIG_FASTBOOT_FLASH=y
  141 +CONFIG_FASTBOOT_USB_DEV=1
  142 +
  143 +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
  144 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x01000000
  145 +
  146 +CONFIG_LZ4=y
  147 +CONFIG_APPEND_BOOTARGS=y
  148 +CONFIG_LIBAVB=y
  149 +CONFIG_IMX_TRUSTY_OS=y
configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 9004412
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_IMX8=y
  3 +CONFIG_SYS_TEXT_BASE=0x80020000
  4 +CONFIG_SPL_GPIO_SUPPORT=y
  5 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  6 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  7 +CONFIG_SYS_MALLOC_F_LEN=0x8000
  8 +CONFIG_TARGET_IMX8QXP_MEK=y
  9 +CONFIG_SPL_MMC_SUPPORT=y
  10 +CONFIG_SPL_EFI_PARTITION=n
  11 +CONFIG_SPL_DOS_PARTITION=n
  12 +CONFIG_SPL_DM_SEQ_ALIAS=y
  13 +CONFIG_SPL_SERIAL_SUPPORT=y
  14 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  15 +CONFIG_USE_TINY_PRINTF=y
  16 +CONFIG_SPL=y
  17 +CONFIG_PANIC_HANG=y
  18 +CONFIG_NR_DRAM_BANKS=4
  19 +CONFIG_FIT=y
  20 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg,ANDROID_SUPPORT"
  21 +CONFIG_BOOTDELAY=1
  22 +CONFIG_LOG=y
  23 +CONFIG_SPL_BOARD_INIT=y
  24 +# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
  25 +CONFIG_SPL_SEPARATE_BSS=y
  26 +CONFIG_SPL_POWER_SUPPORT=y
  27 +CONFIG_SPL_POWER_DOMAIN=y
  28 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  29 +CONFIG_HUSH_PARSER=y
  30 +CONFIG_CMD_CPU=y
  31 +# CONFIG_CMD_IMPORTENV is not set
  32 +CONFIG_CMD_CLK=y
  33 +CONFIG_CMD_DM=y
  34 +CONFIG_CMD_GPIO=y
  35 +CONFIG_CMD_I2C=y
  36 +CONFIG_CMD_MMC=y
  37 +CONFIG_CMD_DHCP=y
  38 +CONFIG_CMD_MII=y
  39 +CONFIG_CMD_PING=y
  40 +CONFIG_CMD_CACHE=y
  41 +CONFIG_CMD_FAT=y
  42 +CONFIG_SPL_OF_CONTROL=y
  43 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek"
  44 +CONFIG_ENV_IS_IN_MMC=y
  45 +CONFIG_SPL_DM=y
  46 +CONFIG_SPL_CLK=y
  47 +CONFIG_CLK_IMX8=y
  48 +CONFIG_CPU=y
  49 +CONFIG_DM_GPIO=y
  50 +CONFIG_MXC_GPIO=y
  51 +CONFIG_DM_PCA953X=y
  52 +
  53 +CONFIG_DM_I2C=y
  54 +CONFIG_SYS_I2C_IMX_LPI2C=y
  55 +CONFIG_I2C_MUX=y
  56 +CONFIG_I2C_MUX_PCA954x=y
  57 +CONFIG_MISC=y
  58 +CONFIG_DM_MMC=y
  59 +CONFIG_MMC_IO_VOLTAGE=y
  60 +CONFIG_MMC_UHS_SUPPORT=y
  61 +CONFIG_MMC_HS400_SUPPORT=y
  62 +CONFIG_EFI_PARTITION=y
  63 +CONFIG_PHYLIB=y
  64 +CONFIG_PHY_ADDR_ENABLE=y
  65 +CONFIG_PHY_ATHEROS=y
  66 +CONFIG_DM_ETH=y
  67 +CONFIG_PHY_GIGE=y
  68 +CONFIG_FEC_MXC_SHARE_MDIO=y
  69 +CONFIG_FEC_MXC_MDIO_BASE=0x5B040000
  70 +CONFIG_FEC_MXC=y
  71 +CONFIG_MII=y
  72 +CONFIG_PINCTRL=y
  73 +CONFIG_SPL_PINCTRL=y
  74 +CONFIG_PINCTRL_IMX8=y
  75 +CONFIG_POWER_DOMAIN=y
  76 +CONFIG_IMX8_POWER_DOMAIN=y
  77 +CONFIG_DM_REGULATOR=y
  78 +CONFIG_SPL_DM_REGULATOR=y
  79 +CONFIG_DM_REGULATOR_FIXED=y
  80 +CONFIG_DM_REGULATOR_GPIO=y
  81 +CONFIG_SPL_DM_REGULATOR_FIXED=y
  82 +CONFIG_DM_SERIAL=y
  83 +CONFIG_FSL_LPUART=y
  84 +CONFIG_SPL_TINY_MEMSET=y
  85 +# CONFIG_EFI_LOADER is not set
  86 +
  87 +CONFIG_CMD_FUSE=y
  88 +CONFIG_SMC_FUSE=y
  89 +CONFIG_CMD_MEMTEST=y
  90 +
  91 +CONFIG_IMX_BOOTAUX=y
  92 +
  93 +CONFIG_DM_THERMAL=y
  94 +CONFIG_IMX_SC_THERMAL=y
  95 +
  96 +CONFIG_VIDEO=y
  97 +
  98 +CONFIG_SPI=y
  99 +CONFIG_FSL_FSPI=y
  100 +CONFIG_DM_SPI=y
  101 +CONFIG_DM_SPI_FLASH=y
  102 +CONFIG_SPI_FLASH=y
  103 +CONFIG_SPI_FLASH_STMICRO=y
  104 +CONFIG_CMD_SF=y
  105 +CONFIG_SF_DEFAULT_BUS=0
  106 +CONFIG_SF_DEFAULT_CS=0
  107 +CONFIG_SF_DEFAULT_SPEED=40000000
  108 +CONFIG_SF_DEFAULT_MODE=0
  109 +
  110 +CONFIG_USB_XHCI_HCD=y
  111 +CONFIG_USB_XHCI_IMX8=y
  112 +CONFIG_DM_USB=y
  113 +CONFIG_DM_USB_GADGET=y
  114 +CONFIG_SPL_DM_USB_GADGET=y
  115 +CONFIG_USB=y
  116 +CONFIG_USB_TCPC=y
  117 +CONFIG_USB_GADGET=y
  118 +# CONFIG_CI_UDC=y
  119 +CONFIG_USB_GADGET_DOWNLOAD=y
  120 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  121 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  122 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  123 +CONFIG_USB_CDNS3=y
  124 +CONFIG_USB_CDNS3_GADGET=y
  125 +CONFIG_USB_GADGET_DUALSPEED=y
  126 +
  127 +CONFIG_SPL_USB_GADGET=y
  128 +CONFIG_SPL_USB_SDP_SUPPORT=y
  129 +CONFIG_SPL_SDP_USB_DEV=1
  130 +CONFIG_SDP_LOADADDR=0x80400000
  131 +
  132 +CONFIG_FASTBOOT=y
  133 +CONFIG_USB_FUNCTION_FASTBOOT=y
  134 +CONFIG_CMD_FASTBOOT=y
  135 +CONFIG_ANDROID_BOOT_IMAGE=y
  136 +CONFIG_FASTBOOT_UUU_SUPPORT=n
  137 +CONFIG_FSL_FASTBOOT=y
  138 +CONFIG_FASTBOOT_BUF_ADDR=0x98000000
  139 +CONFIG_FASTBOOT_BUF_SIZE=0x19000000
  140 +CONFIG_FASTBOOT_FLASH=y
  141 +CONFIG_FASTBOOT_USB_DEV=1
  142 +
  143 +CONFIG_SYS_I2C_IMX_VIRT_I2C=y
  144 +CONFIG_I2C_MUX_IMX_VIRT=y
  145 +CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000
  146 +
  147 +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
  148 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x00800000
  149 +
  150 +CONFIG_LZ4=y
  151 +CONFIG_APPEND_BOOTARGS=y
  152 +CONFIG_LIBAVB=y
  153 +CONFIG_IMX_TRUSTY_OS=y