diff options
author | Ji Luo <ji.luo@nxp.com> | 2020-08-27 14:07:12 +0800 |
---|---|---|
committer | Ji Luo <ji.luo@nxp.com> | 2020-08-31 18:16:24 +0800 |
commit | d25c0c7b9de22abd6c326975199c86c943e742cf (patch) | |
tree | e15a0089c17e5169bf2c42a6e2779cafb4304473 | |
parent | 65571cbbea2d59694e6bc45480fc52cae02790e9 (diff) |
MA-17788 Boot time refine for automotive
Disable unused dts and configs for imx8q to reduce the boot time.
The 'part_get_info_by_name' can be very time consuming as it will
loop through all the GPT entries to find the matched partition,
specify the number of 'misc' partition and use 'part_get_info' to
load the partition info directly will save much time.
With this patch, about 300ms can be save for imx8qm, about 350ms
can be saved for imx8qxp.
Test: boot tests.
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: I66bc7e002caea62754b670d0a30860a23a17ff61
19 files changed, 375 insertions, 366 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 81ac2569c69..18933fe610c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -764,7 +764,6 @@ dtb-$(CONFIG_ARCH_IMX8) += \ fsl-imx8qm-lpddr4-val.dtb \ fsl-imx8qm-mek-xen.dtb \ fsl-imx8qm-mek-auto.dtb \ - fsl-imx8qm-mek-auto2.dtb \ imx8qm-rom7720-a1.dtb \ fsl-imx8qxp-ai_ml.dtb \ fsl-imx8qxp-colibri.dtb \ diff --git a/arch/arm/dts/fsl-imx8qm-mek-auto.dts b/arch/arm/dts/fsl-imx8qm-mek-auto.dts index 7a155c3a813..461ee46fa89 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-auto.dts +++ b/arch/arm/dts/fsl-imx8qm-mek-auto.dts @@ -26,40 +26,108 @@ config { load-environment = <0>; }; -}; - -&gpio2 { - status = "disabled"; -}; - -&gpio5 { - status = "disabled"; -}; - -&usdhc2 { - status = "disabled"; -}; - -&fec1 { - status = "disabled"; -}; -&fec2 { - status = "disabled"; -}; - -&flexspi0 { - status = "disabled"; -}; - -&i2c1_lvds0 { - status = "disabled"; -}; - -&i2c1_lvds1 { - status = "disabled"; + aliases { + /delete-property/ dsiphy0; + /delete-property/ dsiphy1; + /delete-property/ mipidsi0; + /delete-property/ mipidsi1; + /delete-property/ serial1; + /delete-property/ serial2; + /delete-property/ serial3; + /delete-property/ serial4; + /delete-property/ i2c6; + /delete-property/ i2c8; + /delete-property/ display0; + /delete-property/ display1; + /delete-property/ video0; + /delete-property/ video1; + /delete-property/ ethernet0; + /delete-property/ ethernet1; + /delete-property/ gpio2; + /delete-property/ gpio5; + /delete-property/ mmc1; + /delete-property/ mmc2; + /delete-property/ spi0; + /delete-property/ pci0; + /delete-property/ pci1; + }; }; -&lpspi0 { - status = "disabled"; -}; +/delete-node/ &pd_dc0; +/delete-node/ &pd_dc1; +/delete-node/ &pd_isi_ch0; +/delete-node/ &pd_caam; +/delete-node/ &tsens; +/delete-node/ &thermal_zones; +/delete-node/ &rtc; +/delete-node/ &dpu1_intsteer; +/delete-node/ &dpu1; +/delete-node/ &hdmi; +/delete-node/ &irqsteer_dsi0; +/delete-node/ &i2c0_mipi_dsi0; +/delete-node/ &mipi_dsi_csr1; +/delete-node/ &mipi_dsi_phy1; +/delete-node/ &mipi_dsi1; +/delete-node/ &mipi_dsi_bridge1; +/delete-node/ &lvds_region1; +/delete-node/ &ldb1_phy; +/delete-node/ &ldb1; +/delete-node/ &lvds0_pwm; +/delete-node/ &dpu2_intsteer; +/delete-node/ &dpu2; +/delete-node/ &irqsteer_dsi1; +/delete-node/ &i2c0_mipi_dsi1; +/delete-node/ &mipi_dsi_csr2; +/delete-node/ &mipi_dsi_phy2; +/delete-node/ &mipi_dsi2; +/delete-node/ &mipi_dsi_bridge2; +/delete-node/ &lvds_region2; +/delete-node/ &ldb2_phy; +/delete-node/ &ldb2; +/delete-node/ &lvds1_pwm; +/delete-node/ &camera; +/delete-node/ &irqsteer_hdmi; +/delete-node/ &irqsteer_hdmi_rx; +/delete-node/ &i2c0_hdmi; +/delete-node/ &irqsteer_lvds0; +/delete-node/ &i2c1_lvds0; +/delete-node/ &irqsteer_lvds1; +/delete-node/ &i2c1_lvds1; +/delete-node/ &lpspi0; +/delete-node/ &lpspi3; +/delete-node/ &lpuart1; +/delete-node/ &lpuart2; +/delete-node/ &lpuart3; +/delete-node/ &lpuart4; +/delete-node/ &edma0; +/delete-node/ &edma2; +/delete-node/ &edma3; +/delete-node/ &mlb; +/delete-node/ &ddr_pmu0; +/delete-node/ &ddr_pmu1; +/delete-node/ &display; +/delete-node/ &dma_cap; +/delete-node/ &imx_rpmsg; +/delete-node/ &crypto; +/delete-node/ &caam_sm; +/delete-node/ &i2c_rpbus_0; +/delete-node/ &i2c_rpbus_1; +/delete-node/ &sc_pwrkey; +/delete-node/ &mu13; +/delete-node/ &mu_m0; +/delete-node/ &mu1_m0; +/delete-node/ &mu2_m0; +/delete-node/ &usdhc2; +/delete-node/ &usdhc3; +/delete-node/ &fec1; +/delete-node/ &fec2; +/delete-node/ &flexspi0; +/delete-node/ &gpio2; +/delete-node/ &gpio5; +/delete-node/ &pciea; +/delete-node/ &pcieb; +/delete-node/ &sata; +/delete-node/ &mu8; +/delete-node/ &mu9; +/delete-node/ &cci; diff --git a/arch/arm/dts/fsl-imx8qm-mek-auto2.dts b/arch/arm/dts/fsl-imx8qm-mek-auto2.dts deleted file mode 100644 index 7a155c3a813..00000000000 --- a/arch/arm/dts/fsl-imx8qm-mek-auto2.dts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2017 NXP - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; - -#include "fsl-imx8qm-mek.dts" -#include "fsl-imx8qm-mek-u-boot.dtsi" - -/ { - chosen { - bootargs = "console=ttyLP0,115200 earlycon androidboot.console=ttyLP0 androidboot.xen_boot=default"; - stdout-path = &lpuart0; - }; - - config { - load-environment = <0>; - }; -}; - -&gpio2 { - status = "disabled"; -}; - -&gpio5 { - status = "disabled"; -}; - -&usdhc2 { - status = "disabled"; -}; - -&fec1 { - status = "disabled"; -}; - -&fec2 { - status = "disabled"; -}; - -&flexspi0 { - status = "disabled"; -}; - -&i2c1_lvds0 { - status = "disabled"; -}; - -&i2c1_lvds1 { - status = "disabled"; -}; - -&lpspi0 { - status = "disabled"; -}; diff --git a/arch/arm/dts/fsl-imx8qxp-mek-auto.dts b/arch/arm/dts/fsl-imx8qxp-mek-auto.dts index e54aba25af7..d70403ffbc1 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek-auto.dts +++ b/arch/arm/dts/fsl-imx8qxp-mek-auto.dts @@ -26,45 +26,156 @@ config { load-environment = <0>; }; -}; - -&gpio0 { - status = "disabled"; -}; - -&gpio1 { - status = "disabled"; -}; -&gpio3 { - status = "disabled"; + aliases { + /delete-property/ gpio0; + /delete-property/ gpio1; + /delete-property/ gpio3; + /delete-property/ gpio4; + /delete-property/ ethernet0; + /delete-property/ ethernet1; + /delete-property/ mmc1; + /delete-property/ mmc2; + /delete-property/ spi0; + /delete-property/ pci0; + /delete-property/ csi0; + /delete-property/ video0; + /delete-property/ dsiphy0; + /delete-property/ dsiphy1; + /delete-property/ mipidsi0; + /delete-property/ mipidsi1; + /delete-property/ display0; + /delete-property/ display1; + /delete-property/ isi0; + /delete-property/ isi1; + /delete-property/ isi2; + /delete-property/ isi3; + /delete-property/ isi4; + /delete-property/ isi5; + /delete-property/ isi6; + /delete-property/ isi7; + /delete-property/ serial1; + /delete-property/ serial2; + /delete-property/ serial3; + /delete-property/ i2c13; + /delete-property/ i2c15; + /delete-property/ can0; + /delete-property/ can1; + /delete-property/ can2; + }; }; &gpio4 { status = "disabled"; }; -&fec1 { - status = "disabled"; -}; - -&fec2 { - status = "disabled"; -}; - -&flexspi0 { - status = "disabled"; -}; - -&i2c0_mipi_lvds0 { - status = "disabled"; -}; - -&i2c0_mipi_lvds1 { - status = "disabled"; -}; - -&usdhc2 { - status = "disabled"; -}; - +/delete-node/ &pd_dc0; +/delete-node/ &pd_isi_ch0; +/delete-node/ &pd_caam; +/delete-node/ &gpio0; +/delete-node/ &gpio1; +/delete-node/ &gpio3; +/delete-node/ &fec1; +/delete-node/ &fec2; +/delete-node/ &flexspi0; +/delete-node/ &usdhc2; +/delete-node/ &usdhc3; +/delete-node/ &pcieb; +/delete-node/ &mu8; +/delete-node/ &mu13; +/delete-node/ &mu_m0; +/delete-node/ &mu1_m0; +/delete-node/ &mu_m4; +/delete-node/ &rtc; +/delete-node/ &thermal_zones; +/delete-node/ &tsens; +/delete-node/ &irqsteer_csi; +/delete-node/ &dpu1; +/delete-node/ &mipi_dsi_csr1; +/delete-node/ &mipi_dsi_phy1; +/delete-node/ &mipi_dsi1; +/delete-node/ &mipi_dsi_bridge1; +/delete-node/ &lvds_region1; +/delete-node/ &ldb1_phy; +/delete-node/ &ldb1; +/delete-node/ &mipi_dsi_csr2; +/delete-node/ &mipi_dsi_phy2; +/delete-node/ &mipi_dsi2; +/delete-node/ &mipi_dsi_bridge2; +/delete-node/ &lvds_region2; +/delete-node/ &ldb2_phy; +/delete-node/ &ldb2; +/delete-node/ &lpspi0; +/delete-node/ &lpuart1; +/delete-node/ &lpuart2; +/delete-node/ &lpuart3; +/delete-node/ &edma0; +/delete-node/ &edma2; +/delete-node/ &mlb; +/delete-node/ &ddr_pmu0; +/delete-node/ &dma_cap; +/delete-node/ &imx_rpmsg; +/delete-node/ &crypto; +/delete-node/ &caam_sm; +/delete-node/ &i2c_rpbus_1; +/delete-node/ &sc_pwrkey; +/delete-node/ &i2c0_csi0; +/delete-node/ &pixel_combiner; +/delete-node/ &prg1; +/delete-node/ &prg2; +/delete-node/ &prg3; +/delete-node/ &prg4; +/delete-node/ &prg5; +/delete-node/ &prg6; +/delete-node/ &prg7; +/delete-node/ &prg8; +/delete-node/ &prg9; +/delete-node/ &dpr1_channel1; +/delete-node/ &dpr1_channel2; +/delete-node/ &dpr1_channel3; +/delete-node/ &dpr2_channel1; +/delete-node/ &dpr2_channel2; +/delete-node/ &dpr2_channel3; +/delete-node/ &irqsteer_mipi_lvds0; +/delete-node/ &pwm_mipi_lvds0; +/delete-node/ &i2c0_mipi_lvds0; +/delete-node/ &irqsteer_mipi_lvds1; +/delete-node/ &cameradev; +/delete-node/ &pwm_mipi_lvds1; +/delete-node/ &i2c0_mipi_lvds1; +/delete-node/ &gpio0_mipi_csi0; +/delete-node/ &sai0; +/delete-node/ &sai1; +/delete-node/ &sai2; +/delete-node/ &sai3; +/delete-node/ &asrc0; +/delete-node/ &asrc1; +/delete-node/ &esai0; +/delete-node/ &spdif0; +/delete-node/ &{/display-subsystem}; +/delete-node/ &intmux_cm40; +/delete-node/ &i2c0_cm40; +/delete-node/ &dpu_intsteer; +/delete-node/ &adma_lcdif; +/delete-node/ &pwm_adma_lcdif; +/delete-node/ &i2c_rpbus_5; +/delete-node/ &i2c_rpbus_12; +/delete-node/ &i2c_rpbus_13; +/delete-node/ &i2c_rpbus_14; +/delete-node/ &i2c_rpbus_15; +/delete-node/ &flexcan1; +/delete-node/ &flexcan2; +/delete-node/ &flexcan3; +/delete-node/ &gpmi; +/delete-node/ &gpu_3d0; +/delete-node/ &imx8_gpu_ss; +/delete-node/ &lpspi2; +/delete-node/ &acm; +/delete-node/ &amix; +/delete-node/ &mqs; +/delete-node/ &gpt0; +/delete-node/ &dsp; +/delete-node/ &{/imx_ion}; +/delete-node/ &vpu; +/delete-node/ &vpu_decoder; +/delete-node/ &vpu_encoder; diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index 38bf9fc1ce2..2a7729cdab6 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -443,7 +443,9 @@ int board_late_init(void) char *fdt_file; bool m4_boot; +#ifndef CONFIG_ANDROID_AUTO_SUPPORT build_info(); +#endif #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG env_set("board_name", "MEK"); diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index 268fb44702e..d9c0359731c 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -386,7 +386,9 @@ int board_late_init(void) char *fdt_file; bool m4_boot; +#ifndef CONFIG_ANDROID_AUTO_SUPPORT build_info(); +#endif #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG env_set("board_name", "MEK"); diff --git a/common/image-android.c b/common/image-android.c index 3160c9f794f..632074ddff5 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -211,7 +211,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, if (strlen(andr_tmp_str)) printf("Android's image name: %s\n", andr_tmp_str); - printf("Kernel load addr 0x%08x size %u KiB\n", + debug("Kernel load addr 0x%08x size %u KiB\n", kernel_addr, DIV_ROUND_UP(hdr->kernel_size, 1024)); char commandline[COMMANDLINE_LENGTH] = {0}; diff --git a/configs/imx8qm_mek_androidauto2_trusty_defconfig b/configs/imx8qm_mek_androidauto2_trusty_defconfig index 9d515d3c46b..a2af03de7ac 100644 --- a/configs/imx8qm_mek_androidauto2_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto2_trusty_defconfig @@ -34,25 +34,26 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_DHCP=n +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto2" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto" +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -83,27 +84,15 @@ CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set CONFIG_CMD_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 +CONFIG_DM_THERMAL=n +CONFIG_IMX_SCU_THERMAL=n CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -117,12 +106,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -172,6 +155,7 @@ CONFIG_CMD_SAVEENV=n CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig index 66e5e959f58..b601dba9d58 100644 --- a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig +++ b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig @@ -34,25 +34,26 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_DHCP=n +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto2" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto" +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -83,27 +84,15 @@ CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set CONFIG_CMD_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n CONFIG_DM_THERMAL=y CONFIG_IMX_SCU_THERMAL=y -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -117,12 +106,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -174,6 +157,7 @@ CONFIG_CMD_SAVEENV=n CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index 1b945d0f1be..7440b0d17e8 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -34,25 +34,26 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_DHCP=n +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -83,27 +84,15 @@ CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set CONFIG_CMD_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 +CONFIG_DM_THERMAL=n +CONFIG_IMX_SCU_THERMAL=n CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -117,12 +106,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -172,6 +155,7 @@ CONFIG_CMD_SAVEENV=n CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig index 2b4d5044906..d674ace513a 100644 --- a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig @@ -34,25 +34,26 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_DHCP=n +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -83,27 +84,15 @@ CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set CONFIG_CMD_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 +CONFIG_DM_THERMAL=n +CONFIG_IMX_SCU_THERMAL=n CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -117,12 +106,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -172,6 +155,7 @@ CONFIG_CMD_SAVEENV=n CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig index 57172f09a2e..9f23c7cb091 100644 --- a/configs/imx8qm_mek_androidauto_xen_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_defconfig @@ -38,26 +38,27 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_DHCP=n +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_MU_BASE_SPL=0x5d1d0000 CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -88,7 +89,7 @@ CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set CONFIG_CMD_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n CONFIG_DM_THERMAL=n CONFIG_IMX_SC_THERMAL=n @@ -176,6 +177,7 @@ CONFIG_CMD_SAVEENV=n CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qxp_mek_androidauto2_trusty_defconfig b/configs/imx8qxp_mek_androidauto2_trusty_defconfig index 0dec40ca3e4..522c0f9c7bc 100644 --- a/configs/imx8qxp_mek_androidauto2_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto2_trusty_defconfig @@ -34,26 +34,26 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y +CONFIG_CMD_DHCP=n CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek-auto" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_MMC=n CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -85,28 +85,15 @@ CONFIG_SPL_TINY_MEMSET=y CONFIG_CMD_FUSE=y CONFIG_SMC_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y - -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 +CONFIG_DM_THERMAL=n +CONFIG_IMX_SCU_THERMAL=n CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -119,12 +106,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -184,6 +165,7 @@ CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n CONFIG_NET=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index 78c71431517..13e2bf37220 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -34,26 +34,27 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y +CONFIG_CMD_DHCP=n CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek-auto" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -85,28 +86,15 @@ CONFIG_SPL_TINY_MEMSET=y CONFIG_CMD_FUSE=y CONFIG_SMC_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y - -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 +CONFIG_DM_THERMAL=n +CONFIG_IMX_SCU_THERMAL=n CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -119,12 +107,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -184,6 +166,7 @@ CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n CONFIG_NET=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig index 13b0fdec1f4..7c110c4b6db 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig @@ -34,26 +34,27 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_CPU=y +CONFIG_HUSH_PARSER=n +CONFIG_CMD_CPU=n # CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_CLK=y +CONFIG_CMD_CLK=n CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=n CONFIG_CMD_MMC=y -CONFIG_CMD_DHCP=y +CONFIG_CMD_DHCP=n CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_FAT=y +CONFIG_CMD_PING=n +CONFIG_CMD_CACHE=n +CONFIG_CMD_FAT=n CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek-auto" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_MMC=n +CONFIG_ENV_IS_NOWHERE=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y -CONFIG_CPU=y +CONFIG_CPU=n CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -85,28 +86,15 @@ CONFIG_SPL_TINY_MEMSET=y CONFIG_CMD_FUSE=y CONFIG_SMC_FUSE=y -CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMTEST=n -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y - -CONFIG_SPI=y -CONFIG_FSL_FSPI=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_CMD_SF=y -CONFIG_SF_DEFAULT_BUS=0 -CONFIG_SF_DEFAULT_CS=0 -CONFIG_SF_DEFAULT_SPEED=40000000 -CONFIG_SF_DEFAULT_MODE=0 +CONFIG_DM_THERMAL=n +CONFIG_IMX_SCU_THERMAL=n CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8=y CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y -CONFIG_SPL_DM_USB_GADGET=y CONFIG_USB=y CONFIG_USB_GADGET=y @@ -119,12 +107,6 @@ CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_CDNS3_USB_PHY=y CONFIG_PHY=y -CONFIG_SPL_PHY=y - -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_SDP_USB_DEV=1 -CONFIG_SDP_LOADADDR=0x80400000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -184,6 +166,7 @@ CONFIG_DISPLAY_CPUINFO=n CONFIG_DISPLAY_BOARDINFO=n CONFIG_NET=n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_BLOCK_CACHE is not set CONFIG_LZ4=y CONFIG_BCB_SUPPORT=y diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h index 0258fb1c42b..54899665e2f 100644 --- a/include/configs/imx8qm_mek_android_auto.h +++ b/include/configs/imx8qm_mek_android_auto.h @@ -50,13 +50,13 @@ #undef CONFIG_CMD_PCI #undef CONFIG_PCI #undef CONFIG_SYS_LONGHELP -#undef CONFIG_HUSH_PARSER #undef CONFIG_AUTO_COMPLETE #undef CONFIG_MII #undef CONFIG_PHYLIB #undef CONFIG_PHY_ATHEROS #undef CONFIG_CMD_FUSE #undef CONFIG_USB_FUNCTION_MASS_STORAGE +#undef CONFIG_CMD_USB #undef CONFIG_CMD_USB_MASS_STORAGE #undef CONFIG_FAT_WRITE diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h index 8101094aea6..c1b59c878be 100644 --- a/include/configs/imx8qxp_mek_android_auto.h +++ b/include/configs/imx8qxp_mek_android_auto.h @@ -45,10 +45,10 @@ #undef CONFIG_PHYLIB #undef CONFIG_PHY_ATHEROS #undef CONFIG_SYS_LONGHELP -#undef CONFIG_HUSH_PARSER #undef CONFIG_AUTO_COMPLETE #undef CONFIG_USB_HOST_ETHER #undef CONFIG_USB_FUNCTION_MASS_STORAGE +#undef CONFIG_CMD_USB #undef CONFIG_CMD_USB_MASS_STORAGE #undef CONFIG_FAT_WRITE diff --git a/lib/avb/fsl/fsl_bootctrl.c b/lib/avb/fsl/fsl_bootctrl.c index 7f710ff40c2..e07de32e9fc 100755 --- a/lib/avb/fsl/fsl_bootctrl.c +++ b/lib/avb/fsl/fsl_bootctrl.c @@ -448,6 +448,9 @@ out: #define PARTITION_NAME_LEN 13 #define PARTITION_BOOTLOADER "bootloader" +#ifdef CONFIG_ANDROID_AUTO_SUPPORT +#define PARTITION_MISC_ID 11 +#endif extern int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value); @@ -469,7 +472,11 @@ int fsl_save_metadata_if_changed_dual_uboot(struct blk_desc *dev_desc, /* Save metadata if changed. */ if (memcmp(ab_data, ab_data_orig, sizeof(struct bootloader_control)) != 0) { /* Get misc partition info */ +#ifdef CONFIG_ANDROID_AUTO_SUPPORT + if (part_get_info(dev_desc, PARTITION_MISC_ID, &info) == -1) { +#else if (part_get_info_by_name(dev_desc, FASTBOOT_PARTITION_MISC, &info) == -1) { +#endif printf("Can't get partition info of partition: misc\n"); return -1; } @@ -497,7 +504,11 @@ int fsl_load_metadata_dual_uboot(struct blk_desc *dev_desc, struct bootloader_control serialized; size_t num_bytes; +#ifdef CONFIG_ANDROID_AUTO_SUPPORT + if (part_get_info(dev_desc, PARTITION_MISC_ID, &info) == -1) { +#else if (part_get_info_by_name(dev_desc, FASTBOOT_PARTITION_MISC, &info) == -1) { +#endif printf("Can't get partition info of partition: misc\n"); return -1; } else { diff --git a/lib/trusty/ql-tipc/libtipc.c b/lib/trusty/ql-tipc/libtipc.c index db001a8d31b..7414634bd41 100644 --- a/lib/trusty/ql-tipc/libtipc.c +++ b/lib/trusty/ql-tipc/libtipc.c @@ -76,7 +76,6 @@ int trusty_ipc_init(void) } /* create Trusty IPC device */ - trusty_info("Initializing Trusty IPC device\n"); rc = trusty_ipc_dev_create(&_ipc_dev, &_tdev, PAGE_SIZE); if (rc != 0) { trusty_error("Initializing Trusty IPC device failed (%d)\n", rc); @@ -87,7 +86,6 @@ int trusty_ipc_init(void) rpmb_ctx = rpmb_storage_get_ctx(); /* start secure storage proxy service */ - trusty_info("Initializing RPMB storage proxy service\n"); rc = rpmb_storage_proxy_init(_ipc_dev, rpmb_ctx); if (rc != 0) { trusty_error("Initlializing RPMB storage proxy service failed (%d)\n", @@ -106,14 +104,12 @@ int trusty_ipc_init(void) /* secure storage service init ok, use trusty backed keystore */ env_set("keystore", "trusty"); - trusty_info("Initializing Trusty AVB client\n"); rc = avb_tipc_init(_ipc_dev); if (rc != 0) { trusty_error("Initlializing Trusty AVB client failed (%d)\n", rc); return rc; } - trusty_info("Initializing Trusty Keymaster client\n"); rc = km_tipc_init(_ipc_dev); if (rc != 0) { trusty_error("Initlializing Trusty Keymaster client failed (%d)\n", rc); @@ -122,7 +118,6 @@ int trusty_ipc_init(void) } #ifndef CONFIG_AVB_ATX - trusty_info("Initializing Trusty Hardware Crypto client\n"); rc = hwcrypto_tipc_init(_ipc_dev); if (rc != 0) { trusty_error("Initlializing Trusty Keymaster client failed (%d)\n", rc); |