diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1a8f7fa01f..f6d05c1e12 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -43,6 +43,20 @@ config IMX_BOOTAUX help bootaux [addr] to boot auxiliary core. +config BOOTAUX_RESERVED_MEM_BASE + hex "Define the reserved memory base address" + default 0x00 + depends on ARCH_IMX8 + help + reserve DDR memory for bootaux + +config BOOTAUX_RESERVED_MEM_SIZE + hex "Define the reserved memory size" + default 0x00 + depends on ARCH_IMX8 + help + This memory will be reserved by system and linux cannot access. + config IMX_VSERVICE_SHARED_BUFFER hex "Define the buffer address used for virtual service" depends on IMX_VSERVICE diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index fb39749006..5e970cb108 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1425,10 +1425,10 @@ static int ft_add_optee_node(void *fdt, bd_t *bd) int ft_system_setup(void *blob, bd_t *bd) { -#ifdef BOOTAUX_RESERVED_MEM_BASE +#if (CONFIG_BOOTAUX_RESERVED_MEM_SIZE != 0x00) int off; - off = fdt_add_mem_rsv(blob, BOOTAUX_RESERVED_MEM_BASE, - BOOTAUX_RESERVED_MEM_SIZE); + off = fdt_add_mem_rsv(blob, CONFIG_BOOTAUX_RESERVED_MEM_BASE, + CONFIG_BOOTAUX_RESERVED_MEM_SIZE); if (off < 0) printf("Failed to reserve memory for bootaux: %s\n", fdt_strerror(off)); diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index 729468b63f..602603587c 100644 --- a/configs/imx8qm_ddr4_arm2_defconfig +++ b/configs/imx8qm_ddr4_arm2_defconfig @@ -84,3 +84,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_ddr4_arm2_spl_defconfig b/configs/imx8qm_ddr4_arm2_spl_defconfig index d08c375755..c0a4f5dbd8 100644 --- a/configs/imx8qm_ddr4_arm2_spl_defconfig +++ b/configs/imx8qm_ddr4_arm2_spl_defconfig @@ -92,3 +92,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_lpddr4_arm2_android_defconfig b/configs/imx8qm_lpddr4_arm2_android_defconfig index c351d038eb..760f299929 100644 --- a/configs/imx8qm_lpddr4_arm2_android_defconfig +++ b/configs/imx8qm_lpddr4_arm2_android_defconfig @@ -86,3 +86,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig index f690be596f..20c3ca2f71 100644 --- a/configs/imx8qm_lpddr4_arm2_defconfig +++ b/configs/imx8qm_lpddr4_arm2_defconfig @@ -84,3 +84,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig index c30ba29ef5..418255e935 100644 --- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig @@ -85,3 +85,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_lpddr4_arm2_spl_defconfig b/configs/imx8qm_lpddr4_arm2_spl_defconfig index 57aa28dc38..b83f868429 100644 --- a/configs/imx8qm_lpddr4_arm2_spl_defconfig +++ b/configs/imx8qm_lpddr4_arm2_spl_defconfig @@ -92,3 +92,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig index 97896f6b60..a5816488b0 100644 --- a/configs/imx8qm_mek_android_defconfig +++ b/configs/imx8qm_mek_android_defconfig @@ -91,3 +91,6 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_NOT_UUU_BUILD=y CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x01000000 diff --git a/configs/imx8qm_mek_android_uuu_defconfig b/configs/imx8qm_mek_android_uuu_defconfig index ac7b1a687d..75a0d1fbd2 100644 --- a/configs/imx8qm_mek_android_uuu_defconfig +++ b/configs/imx8qm_mek_android_uuu_defconfig @@ -84,3 +84,6 @@ CONFIG_LZ4=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_androidauto2_trusty_defconfig b/configs/imx8qm_mek_androidauto2_trusty_defconfig new file mode 100644 index 0000000000..5e611156ad --- /dev/null +++ b/configs/imx8qm_mek_androidauto2_trusty_defconfig @@ -0,0 +1,126 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto" +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" +CONFIG_TARGET_IMX8QM_MEK=y +CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_EFI_PARTITION=y +CONFIG_CMD_IMPORTENV=n +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DM=y +CONFIG_DM_WARN=n +CONFIG_DM_DEVICE_REMOVE=n +CONFIG_IMX_TRUSTY_OS=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=n + +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_IMX8=y + +CONFIG_DM_USB=y + +CONFIG_USB=y + +CONFIG_USB_GADGET=y +#CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1 +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02 + +CONFIG_USB_CDNS3=y +CONFIG_USB_CDNS3_GADGET=y +CONFIG_USB_GADGET_DUALSPEED=y + +CONFIG_DM_GPIO=y +CONFIG_DM_PCA953X=y +CONFIG_BOOTDELAY=1 +CONFIG_CMD_MMC=y +CONFIG_DM_MMC=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +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_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y + +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX8=y + +CONFIG_CMD_NET=n +CONFIG_CMD_NFS=n +CONFIG_CMD_BDI=n +CONFIG_CMD_CONSOLE=n +CONFIG_CMD_BOOTD=n +CONFIG_CMD_BOOTEFI=n +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n +CONFIG_CMD_ELF=n +CONFIG_CMD_GO=n +CONFIG_CMD_RUN=n +CONFIG_CMD_IMI=n +CONFIG_CMD_IMLS=n +CONFIG_CMD_XIMG=n +CONFIG_CMD_EXPORTENV=n +CONFIG_CMD_IMPORTENV=n +CONFIG_CMD_EDITENV=n +CONFIG_CMD_ENV_EXISTS=n +CONFIG_CMD_CRC32=n +CONFIG_CMD_DM=n +CONFIG_CMD_LOADB=n +CONFIG_CMD_LOADS=n +CONFIG_CMD_FLASH=n +CONFIG_CMD_GPT=n +CONFIG_CMD_FPGA=n +CONFIG_CMD_ECHO=n +CONFIG_CMD_ITEST=n +CONFIG_CMD_SOURCE=n +CONFIG_CMD_SETEXPR=n +CONFIG_CMD_MISC=n +CONFIG_CMD_UNZIP=n +CONFIG_CMD_LZMADEC=n +CONFIG_CMD_SAVEENV=n + +CONFIG_DISPLAY_CPUINFO=n +CONFIG_DISPLAY_BOARDINFO=n +CONFIG_EFI_LOADER=n + +CONFIG_POWER_DOMAIN=y +CONFIG_IMX8_POWER_DOMAIN=y + +CONFIG_DM_THERMAL=y +CONFIG_IMX_SC_THERMAL=y + +CONFIG_ENV_IS_IN_MMC=y +CONFIG_LZ4=y + +CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y + +CONFIG_SPL=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_GPIO_SUPPORT=y + +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_LIBDISK_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y +CONFIG_SHA256=y +CONFIG_SPL_MMC_WRITE=y +CONFIG_DUAL_BOOTLOADER=y +CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x01000000 diff --git a/configs/imx8qm_mek_androidauto_defconfig b/configs/imx8qm_mek_androidauto_defconfig index 879f92419d..2065e1988c 100644 --- a/configs/imx8qm_mek_androidauto_defconfig +++ b/configs/imx8qm_mek_androidauto_defconfig @@ -111,3 +111,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SPL=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index 0a8c3cb7e0..1f7e10d4d8 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -121,3 +121,6 @@ CONFIG_SHA256=y CONFIG_SPL_MMC_WRITE=y CONFIG_DUAL_BOOTLOADER=y CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88800000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x02000000 diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig index 2c539e79fa..572592a328 100644 --- a/configs/imx8qm_mek_androidauto_xen_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_defconfig @@ -123,3 +123,6 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_androidauto_xen_dual_defconfig b/configs/imx8qm_mek_androidauto_xen_dual_defconfig index 9961428171..8051bbfef2 100644 --- a/configs/imx8qm_mek_androidauto_xen_dual_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_dual_defconfig @@ -125,3 +125,6 @@ CONFIG_SHA256=y CONFIG_SPL_MMC_WRITE=y CONFIG_DUAL_BOOTLOADER=y CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88800000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x02000000 diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 46ece67755..27803eee36 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -93,3 +93,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig index f5ceb6933b..5d0ea83b06 100644 --- a/configs/imx8qm_mek_fspi_defconfig +++ b/configs/imx8qm_mek_fspi_defconfig @@ -94,3 +94,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_spl_defconfig b/configs/imx8qm_mek_spl_defconfig index e56856a7bc..5fd773098e 100644 --- a/configs/imx8qm_mek_spl_defconfig +++ b/configs/imx8qm_mek_spl_defconfig @@ -108,3 +108,6 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_SDP_USB_DEV=1 CONFIG_SDP_LOADADDR=0x80400000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_spl_fspi_defconfig b/configs/imx8qm_mek_spl_fspi_defconfig index 9c0770b610..c0735a81d0 100644 --- a/configs/imx8qm_mek_spl_fspi_defconfig +++ b/configs/imx8qm_mek_spl_fspi_defconfig @@ -112,3 +112,6 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_SDP_USB_DEV=1 CONFIG_SDP_LOADADDR=0x80400000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qm_mek_spl_trusty_defconfig b/configs/imx8qm_mek_spl_trusty_defconfig index 0345a9b99d..6da27b8343 100644 --- a/configs/imx8qm_mek_spl_trusty_defconfig +++ b/configs/imx8qm_mek_spl_trusty_defconfig @@ -95,3 +95,6 @@ CONFIG_IMX8_TRUSTY_XEN=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_17x17_val_defconfig b/configs/imx8qxp_17x17_val_defconfig index da0bde2b4b..46a91a8694 100644 --- a/configs/imx8qxp_17x17_val_defconfig +++ b/configs/imx8qxp_17x17_val_defconfig @@ -97,3 +97,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig index bf91c578c8..80db94abf7 100644 --- a/configs/imx8qxp_ddr3_arm2_defconfig +++ b/configs/imx8qxp_ddr3_arm2_defconfig @@ -85,3 +85,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_lpddr4_arm2_android_defconfig b/configs/imx8qxp_lpddr4_arm2_android_defconfig index 1fc80caa60..25037c2554 100644 --- a/configs/imx8qxp_lpddr4_arm2_android_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_android_defconfig @@ -87,3 +87,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig index 706d6ce988..1550860a5e 100644 --- a/configs/imx8qxp_lpddr4_arm2_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_defconfig @@ -97,3 +97,6 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_USB_DEV=1 CONFIG_EFI_PARTITION=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig index 1e325c338e..35b7969f5b 100644 --- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig @@ -85,3 +85,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig index 0f1a4ff805..ab9e1cfaec 100644 --- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig @@ -94,3 +94,6 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_USB_DEV=1 CONFIG_EFI_PARTITION=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_lpddr4_arm2_spl_defconfig b/configs/imx8qxp_lpddr4_arm2_spl_defconfig index ab79784164..473110005f 100644 --- a/configs/imx8qxp_lpddr4_arm2_spl_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_spl_defconfig @@ -106,3 +106,6 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_USB_DEV=1 CONFIG_EFI_PARTITION=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig index b060e039ca..fdcf2f9898 100644 --- a/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig @@ -101,3 +101,6 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_USB_DEV=1 CONFIG_EFI_PARTITION=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig index b6467b32e4..1915b5de18 100644 --- a/configs/imx8qxp_mek_android_defconfig +++ b/configs/imx8qxp_mek_android_defconfig @@ -95,3 +95,6 @@ CONFIG_APPEND_BOOTARGS=y CONFIG_SYS_I2C_IMX_VIRT_I2C=y CONFIG_I2C_MUX_IMX_VIRT=y CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x00800000 diff --git a/configs/imx8qxp_mek_android_uuu_defconfig b/configs/imx8qxp_mek_android_uuu_defconfig index 311bc3d18e..df2e61f962 100644 --- a/configs/imx8qxp_mek_android_uuu_defconfig +++ b/configs/imx8qxp_mek_android_uuu_defconfig @@ -84,3 +84,6 @@ CONFIG_LZ4=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_mek_androidauto2_trusty_defconfig b/configs/imx8qxp_mek_androidauto2_trusty_defconfig new file mode 100644 index 0000000000..4215fe1065 --- /dev/null +++ b/configs/imx8qxp_mek_androidauto2_trusty_defconfig @@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek-auto" +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" +CONFIG_TARGET_IMX8QXP_MEK=y +CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_EFI_PARTITION=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DM=y +CONFIG_DM_WARN=n +CONFIG_DM_DEVICE_REMOVE=n +CONFIG_IMX_TRUSTY_OS=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=n +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y + +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_IMX8=y + +CONFIG_DM_USB=y + +CONFIG_USB=y + +CONFIG_USB_GADGET=y +#CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1 +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02 + +CONFIG_USB_CDNS3=y +CONFIG_USB_CDNS3_GADGET=y +CONFIG_USB_GADGET_DUALSPEED=y + +CONFIG_DM_GPIO=y +CONFIG_DM_PCA953X=y +CONFIG_BOOTDELAY=1 +CONFIG_CMD_MMC=y +CONFIG_DM_MMC=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +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_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y + +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX8=y + +CONFIG_CMD_NET=n +CONFIG_CMD_NFS=n +CONFIG_CMD_BDI=n +CONFIG_CMD_CONSOLE=n +CONFIG_CMD_BOOTD=n +CONFIG_CMD_BOOTEFI=n +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n +CONFIG_CMD_ELF=n +CONFIG_CMD_GO=n +CONFIG_CMD_RUN=n +CONFIG_CMD_IMI=n +CONFIG_CMD_IMLS=n +CONFIG_CMD_XIMG=n +CONFIG_CMD_EXPORTENV=n +CONFIG_CMD_IMPORTENV=n +CONFIG_CMD_EDITENV=n +CONFIG_CMD_ENV_EXISTS=n +CONFIG_CMD_CRC32=n +CONFIG_CMD_DM=n +CONFIG_CMD_LOADB=n +CONFIG_CMD_LOADS=n +CONFIG_CMD_FLASH=n +CONFIG_CMD_GPT=n +CONFIG_CMD_FPGA=n +CONFIG_CMD_ECHO=n +CONFIG_CMD_ITEST=n +CONFIG_CMD_SOURCE=n +CONFIG_CMD_SETEXPR=n +CONFIG_CMD_MISC=n +CONFIG_CMD_UNZIP=n +CONFIG_CMD_LZMADEC=n +CONFIG_CMD_SAVEENV=n + +CONFIG_DISPLAY_CPUINFO=n +CONFIG_DISPLAY_BOARDINFO=n +CONFIG_EFI_LOADER=n + +CONFIG_POWER_DOMAIN=y +CONFIG_IMX8_POWER_DOMAIN=y + +CONFIG_DM_THERMAL=y +CONFIG_IMX_SC_THERMAL=y + +CONFIG_ENV_IS_IN_MMC=y +CONFIG_LZ4=y + +CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y + +CONFIG_SPL=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_GPIO_SUPPORT=y + +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_LIBDISK_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y +CONFIG_SHA256=y +CONFIG_SPL_MMC_WRITE=y +CONFIG_DUAL_BOOTLOADER=y +CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x00800000 diff --git a/configs/imx8qxp_mek_androidauto_defconfig b/configs/imx8qxp_mek_androidauto_defconfig index 08e4bd355f..4b4fdb231e 100644 --- a/configs/imx8qxp_mek_androidauto_defconfig +++ b/configs/imx8qxp_mek_androidauto_defconfig @@ -112,3 +112,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SPL=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index 0611773513..6720adde8e 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -122,3 +122,6 @@ CONFIG_SHA256=y CONFIG_SPL_MMC_WRITE=y CONFIG_DUAL_BOOTLOADER=y CONFIG_APPEND_BOOTARGS=y + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x02000000 diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index f0ccb95fcc..b9cec95b99 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -98,3 +98,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_I2C_IMX_VIRT_I2C=y CONFIG_I2C_MUX_IMX_VIRT=y CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig index e701798a3c..0bc248794c 100644 --- a/configs/imx8qxp_mek_fspi_defconfig +++ b/configs/imx8qxp_mek_fspi_defconfig @@ -99,3 +99,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_I2C_IMX_VIRT_I2C=y CONFIG_I2C_MUX_IMX_VIRT=y CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_mek_spl_defconfig b/configs/imx8qxp_mek_spl_defconfig index 77fcc4ac56..b578288cd1 100644 --- a/configs/imx8qxp_mek_spl_defconfig +++ b/configs/imx8qxp_mek_spl_defconfig @@ -113,3 +113,6 @@ CONFIG_SDP_LOADADDR=0x80400000 CONFIG_SYS_I2C_IMX_VIRT_I2C=y CONFIG_I2C_MUX_IMX_VIRT=y CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/configs/imx8qxp_mek_spl_fspi_defconfig b/configs/imx8qxp_mek_spl_fspi_defconfig index fc53b28903..53c8c9441b 100644 --- a/configs/imx8qxp_mek_spl_fspi_defconfig +++ b/configs/imx8qxp_mek_spl_fspi_defconfig @@ -117,3 +117,6 @@ CONFIG_SDP_LOADADDR=0x80400000 CONFIG_SYS_I2C_IMX_VIRT_I2C=y CONFIG_I2C_MUX_IMX_VIRT=y CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000 + +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index 1dc8d0d856..bf87664e37 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -437,7 +437,5 @@ #endif #define CONFIG_OF_SYSTEM_SETUP -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 -#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ #endif /* __IMX8QM_ARM2_H */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 53b035e323..ce12bd6f4c 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -441,8 +441,6 @@ #endif #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" diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index 1c90019167..a2e9494496 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -436,8 +436,6 @@ #endif #define CONFIG_OF_SYSTEM_SETUP -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 -#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ #define CONFIG_CMD_READ #define CONFIG_SERIAL_TAG diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 56a0471dd8..298f80eec1 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -420,8 +420,6 @@ #endif #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 "imx8qxp_mek_android.h"