Commit 57fa56f3ce6028b3b8cc75a905ba230dbee522dc
1 parent
f3e266d088
Exists in
smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga
and in
4 other branches
MA-14501[Android] change BOOTAUX_RESERVED_MEM macro to defconfig
As the M4 use different DDR memory size in normal android/car2 and car image, use different defconfig for car2 to decrease DDR memory reservation. So memory reserved for each M4 core is 8MB in car2 and normal android image. it's 32MB for car image. Change-Id: Idf608f539cd614a154c78e3a1af28eff1da5c1f2 Signed-off-by: Zhang Bo <bo.zhang@nxp.com>
Showing 41 changed files with 369 additions and 11 deletions Side-by-side Diff
- arch/arm/mach-imx/Kconfig
- arch/arm/mach-imx/imx8/cpu.c
- configs/imx8qm_ddr4_arm2_defconfig
- configs/imx8qm_ddr4_arm2_spl_defconfig
- configs/imx8qm_lpddr4_arm2_android_defconfig
- configs/imx8qm_lpddr4_arm2_defconfig
- configs/imx8qm_lpddr4_arm2_fspi_defconfig
- configs/imx8qm_lpddr4_arm2_spl_defconfig
- configs/imx8qm_mek_android_defconfig
- configs/imx8qm_mek_android_uuu_defconfig
- configs/imx8qm_mek_androidauto2_trusty_defconfig
- configs/imx8qm_mek_androidauto_defconfig
- configs/imx8qm_mek_androidauto_trusty_defconfig
- configs/imx8qm_mek_androidauto_xen_defconfig
- configs/imx8qm_mek_androidauto_xen_dual_defconfig
- configs/imx8qm_mek_defconfig
- configs/imx8qm_mek_fspi_defconfig
- configs/imx8qm_mek_spl_defconfig
- configs/imx8qm_mek_spl_fspi_defconfig
- configs/imx8qm_mek_spl_trusty_defconfig
- configs/imx8qxp_17x17_val_defconfig
- configs/imx8qxp_ddr3_arm2_defconfig
- configs/imx8qxp_lpddr4_arm2_android_defconfig
- configs/imx8qxp_lpddr4_arm2_defconfig
- configs/imx8qxp_lpddr4_arm2_fspi_defconfig
- configs/imx8qxp_lpddr4_arm2_nand_defconfig
- configs/imx8qxp_lpddr4_arm2_spl_defconfig
- configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig
- configs/imx8qxp_mek_android_defconfig
- configs/imx8qxp_mek_android_uuu_defconfig
- configs/imx8qxp_mek_androidauto2_trusty_defconfig
- configs/imx8qxp_mek_androidauto_defconfig
- configs/imx8qxp_mek_androidauto_trusty_defconfig
- configs/imx8qxp_mek_defconfig
- configs/imx8qxp_mek_fspi_defconfig
- configs/imx8qxp_mek_spl_defconfig
- configs/imx8qxp_mek_spl_fspi_defconfig
- include/configs/imx8qm_arm2.h
- include/configs/imx8qm_mek.h
- include/configs/imx8qxp_arm2.h
- include/configs/imx8qxp_mek.h
arch/arm/mach-imx/Kconfig
... | ... | @@ -43,6 +43,20 @@ |
43 | 43 | help |
44 | 44 | bootaux [addr] to boot auxiliary core. |
45 | 45 | |
46 | +config BOOTAUX_RESERVED_MEM_BASE | |
47 | + hex "Define the reserved memory base address" | |
48 | + default 0x00 | |
49 | + depends on ARCH_IMX8 | |
50 | + help | |
51 | + reserve DDR memory for bootaux | |
52 | + | |
53 | +config BOOTAUX_RESERVED_MEM_SIZE | |
54 | + hex "Define the reserved memory size" | |
55 | + default 0x00 | |
56 | + depends on ARCH_IMX8 | |
57 | + help | |
58 | + This memory will be reserved by system and linux cannot access. | |
59 | + | |
46 | 60 | config IMX_VSERVICE_SHARED_BUFFER |
47 | 61 | hex "Define the buffer address used for virtual service" |
48 | 62 | depends on IMX_VSERVICE |
arch/arm/mach-imx/imx8/cpu.c
... | ... | @@ -1425,10 +1425,10 @@ |
1425 | 1425 | |
1426 | 1426 | int ft_system_setup(void *blob, bd_t *bd) |
1427 | 1427 | { |
1428 | -#ifdef BOOTAUX_RESERVED_MEM_BASE | |
1428 | +#if (CONFIG_BOOTAUX_RESERVED_MEM_SIZE != 0x00) | |
1429 | 1429 | int off; |
1430 | - off = fdt_add_mem_rsv(blob, BOOTAUX_RESERVED_MEM_BASE, | |
1431 | - BOOTAUX_RESERVED_MEM_SIZE); | |
1430 | + off = fdt_add_mem_rsv(blob, CONFIG_BOOTAUX_RESERVED_MEM_BASE, | |
1431 | + CONFIG_BOOTAUX_RESERVED_MEM_SIZE); | |
1432 | 1432 | if (off < 0) |
1433 | 1433 | printf("Failed to reserve memory for bootaux: %s\n", |
1434 | 1434 | fdt_strerror(off)); |
configs/imx8qm_ddr4_arm2_defconfig
configs/imx8qm_ddr4_arm2_spl_defconfig
configs/imx8qm_lpddr4_arm2_android_defconfig
configs/imx8qm_lpddr4_arm2_defconfig
configs/imx8qm_lpddr4_arm2_fspi_defconfig
configs/imx8qm_lpddr4_arm2_spl_defconfig
configs/imx8qm_mek_android_defconfig
configs/imx8qm_mek_android_uuu_defconfig
configs/imx8qm_mek_androidauto2_trusty_defconfig
1 | +CONFIG_ARM=y | |
2 | +CONFIG_ARCH_IMX8=y | |
3 | +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto" | |
4 | +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" | |
5 | +CONFIG_TARGET_IMX8QM_MEK=y | |
6 | +CONFIG_SYS_TEXT_BASE=0x80020000 | |
7 | +CONFIG_EFI_PARTITION=y | |
8 | +CONFIG_CMD_IMPORTENV=n | |
9 | +CONFIG_SYS_MALLOC_F_LEN=0x2000 | |
10 | +CONFIG_DM=y | |
11 | +CONFIG_DM_WARN=n | |
12 | +CONFIG_DM_DEVICE_REMOVE=n | |
13 | +CONFIG_IMX_TRUSTY_OS=y | |
14 | + | |
15 | +CONFIG_DM_SERIAL=y | |
16 | +CONFIG_FSL_LPUART=y | |
17 | +CONFIG_OF_CONTROL=y | |
18 | +CONFIG_DM_I2C=y | |
19 | +# CONFIG_DM_I2C_COMPAT is not set | |
20 | +CONFIG_SYS_I2C_IMX_LPI2C=y | |
21 | +CONFIG_CMD_I2C=n | |
22 | + | |
23 | +CONFIG_USB_XHCI_HCD=y | |
24 | +CONFIG_USB_XHCI_IMX8=y | |
25 | + | |
26 | +CONFIG_DM_USB=y | |
27 | + | |
28 | +CONFIG_USB=y | |
29 | + | |
30 | +CONFIG_USB_GADGET=y | |
31 | +#CONFIG_CI_UDC=y | |
32 | +CONFIG_USB_GADGET_DOWNLOAD=y | |
33 | +CONFIG_USB_GADGET_MANUFACTURER="FSL" | |
34 | +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1 | |
35 | +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02 | |
36 | + | |
37 | +CONFIG_USB_CDNS3=y | |
38 | +CONFIG_USB_CDNS3_GADGET=y | |
39 | +CONFIG_USB_GADGET_DUALSPEED=y | |
40 | + | |
41 | +CONFIG_DM_GPIO=y | |
42 | +CONFIG_DM_PCA953X=y | |
43 | +CONFIG_BOOTDELAY=1 | |
44 | +CONFIG_CMD_MMC=y | |
45 | +CONFIG_DM_MMC=y | |
46 | +CONFIG_MMC_IO_VOLTAGE=y | |
47 | +CONFIG_MMC_UHS_SUPPORT=y | |
48 | +CONFIG_MMC_HS400_SUPPORT=y | |
49 | +CONFIG_FSL_FSPI=y | |
50 | +CONFIG_DM_SPI=y | |
51 | +CONFIG_DM_SPI_FLASH=y | |
52 | +CONFIG_SPI_FLASH=y | |
53 | +CONFIG_SPI_FLASH_4BYTES_ADDR=y | |
54 | +CONFIG_SPI_FLASH_STMICRO=y | |
55 | + | |
56 | +CONFIG_DM_REGULATOR=y | |
57 | +CONFIG_DM_REGULATOR_FIXED=y | |
58 | +CONFIG_DM_REGULATOR_GPIO=y | |
59 | + | |
60 | +CONFIG_PINCTRL=y | |
61 | +CONFIG_PINCTRL_IMX8=y | |
62 | + | |
63 | +CONFIG_CMD_NET=n | |
64 | +CONFIG_CMD_NFS=n | |
65 | +CONFIG_CMD_BDI=n | |
66 | +CONFIG_CMD_CONSOLE=n | |
67 | +CONFIG_CMD_BOOTD=n | |
68 | +CONFIG_CMD_BOOTEFI=n | |
69 | +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n | |
70 | +CONFIG_CMD_ELF=n | |
71 | +CONFIG_CMD_GO=n | |
72 | +CONFIG_CMD_RUN=n | |
73 | +CONFIG_CMD_IMI=n | |
74 | +CONFIG_CMD_IMLS=n | |
75 | +CONFIG_CMD_XIMG=n | |
76 | +CONFIG_CMD_EXPORTENV=n | |
77 | +CONFIG_CMD_IMPORTENV=n | |
78 | +CONFIG_CMD_EDITENV=n | |
79 | +CONFIG_CMD_ENV_EXISTS=n | |
80 | +CONFIG_CMD_CRC32=n | |
81 | +CONFIG_CMD_DM=n | |
82 | +CONFIG_CMD_LOADB=n | |
83 | +CONFIG_CMD_LOADS=n | |
84 | +CONFIG_CMD_FLASH=n | |
85 | +CONFIG_CMD_GPT=n | |
86 | +CONFIG_CMD_FPGA=n | |
87 | +CONFIG_CMD_ECHO=n | |
88 | +CONFIG_CMD_ITEST=n | |
89 | +CONFIG_CMD_SOURCE=n | |
90 | +CONFIG_CMD_SETEXPR=n | |
91 | +CONFIG_CMD_MISC=n | |
92 | +CONFIG_CMD_UNZIP=n | |
93 | +CONFIG_CMD_LZMADEC=n | |
94 | +CONFIG_CMD_SAVEENV=n | |
95 | + | |
96 | +CONFIG_DISPLAY_CPUINFO=n | |
97 | +CONFIG_DISPLAY_BOARDINFO=n | |
98 | +CONFIG_EFI_LOADER=n | |
99 | + | |
100 | +CONFIG_POWER_DOMAIN=y | |
101 | +CONFIG_IMX8_POWER_DOMAIN=y | |
102 | + | |
103 | +CONFIG_DM_THERMAL=y | |
104 | +CONFIG_IMX_SC_THERMAL=y | |
105 | + | |
106 | +CONFIG_ENV_IS_IN_MMC=y | |
107 | +CONFIG_LZ4=y | |
108 | + | |
109 | +CONFIG_SMC_FUSE=y | |
110 | +CONFIG_CMD_MEMTEST=y | |
111 | + | |
112 | +CONFIG_SPL=y | |
113 | +CONFIG_SPL_MMC_SUPPORT=y | |
114 | +CONFIG_SPL_GPIO_SUPPORT=y | |
115 | + | |
116 | +CONFIG_SPL_ENV_SUPPORT=y | |
117 | +CONFIG_SPL_LIBDISK_SUPPORT=y | |
118 | + | |
119 | +CONFIG_NOT_UUU_BUILD=y | |
120 | +CONFIG_SHA256=y | |
121 | +CONFIG_SPL_MMC_WRITE=y | |
122 | +CONFIG_DUAL_BOOTLOADER=y | |
123 | +CONFIG_APPEND_BOOTARGS=y | |
124 | + | |
125 | +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 | |
126 | +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x01000000 |
configs/imx8qm_mek_androidauto_defconfig
configs/imx8qm_mek_androidauto_trusty_defconfig
configs/imx8qm_mek_androidauto_xen_defconfig
configs/imx8qm_mek_androidauto_xen_dual_defconfig
configs/imx8qm_mek_defconfig
configs/imx8qm_mek_fspi_defconfig
configs/imx8qm_mek_spl_defconfig
configs/imx8qm_mek_spl_fspi_defconfig
configs/imx8qm_mek_spl_trusty_defconfig
configs/imx8qxp_17x17_val_defconfig
configs/imx8qxp_ddr3_arm2_defconfig
configs/imx8qxp_lpddr4_arm2_android_defconfig
configs/imx8qxp_lpddr4_arm2_defconfig
configs/imx8qxp_lpddr4_arm2_fspi_defconfig
configs/imx8qxp_lpddr4_arm2_nand_defconfig
configs/imx8qxp_lpddr4_arm2_spl_defconfig
configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig
configs/imx8qxp_mek_android_defconfig
configs/imx8qxp_mek_android_uuu_defconfig
configs/imx8qxp_mek_androidauto2_trusty_defconfig
1 | +CONFIG_ARM=y | |
2 | +CONFIG_ARCH_IMX8=y | |
3 | +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek-auto" | |
4 | +CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" | |
5 | +CONFIG_TARGET_IMX8QXP_MEK=y | |
6 | +CONFIG_SYS_TEXT_BASE=0x80020000 | |
7 | +CONFIG_EFI_PARTITION=y | |
8 | +CONFIG_SYS_MALLOC_F_LEN=0x2000 | |
9 | +CONFIG_DM=y | |
10 | +CONFIG_DM_WARN=n | |
11 | +CONFIG_DM_DEVICE_REMOVE=n | |
12 | +CONFIG_IMX_TRUSTY_OS=y | |
13 | + | |
14 | +CONFIG_DM_SERIAL=y | |
15 | +CONFIG_FSL_LPUART=y | |
16 | +CONFIG_OF_CONTROL=y | |
17 | +CONFIG_DM_I2C=y | |
18 | +# CONFIG_DM_I2C_COMPAT is not set | |
19 | +CONFIG_SYS_I2C_IMX_LPI2C=y | |
20 | +CONFIG_CMD_I2C=n | |
21 | +CONFIG_I2C_MUX=y | |
22 | +CONFIG_I2C_MUX_PCA954x=y | |
23 | + | |
24 | +CONFIG_USB_XHCI_HCD=y | |
25 | +CONFIG_USB_XHCI_IMX8=y | |
26 | + | |
27 | +CONFIG_DM_USB=y | |
28 | + | |
29 | +CONFIG_USB=y | |
30 | + | |
31 | +CONFIG_USB_GADGET=y | |
32 | +#CONFIG_CI_UDC=y | |
33 | +CONFIG_USB_GADGET_DOWNLOAD=y | |
34 | +CONFIG_USB_GADGET_MANUFACTURER="FSL" | |
35 | +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1 | |
36 | +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02 | |
37 | + | |
38 | +CONFIG_USB_CDNS3=y | |
39 | +CONFIG_USB_CDNS3_GADGET=y | |
40 | +CONFIG_USB_GADGET_DUALSPEED=y | |
41 | + | |
42 | +CONFIG_DM_GPIO=y | |
43 | +CONFIG_DM_PCA953X=y | |
44 | +CONFIG_BOOTDELAY=1 | |
45 | +CONFIG_CMD_MMC=y | |
46 | +CONFIG_DM_MMC=y | |
47 | +CONFIG_MMC_IO_VOLTAGE=y | |
48 | +CONFIG_MMC_UHS_SUPPORT=y | |
49 | +CONFIG_MMC_HS400_SUPPORT=y | |
50 | +CONFIG_FSL_FSPI=y | |
51 | +CONFIG_DM_SPI=y | |
52 | +CONFIG_DM_SPI_FLASH=y | |
53 | +CONFIG_SPI_FLASH=y | |
54 | +CONFIG_SPI_FLASH_4BYTES_ADDR=y | |
55 | +CONFIG_SPI_FLASH_STMICRO=y | |
56 | + | |
57 | +CONFIG_DM_REGULATOR=y | |
58 | +CONFIG_DM_REGULATOR_FIXED=y | |
59 | +CONFIG_DM_REGULATOR_GPIO=y | |
60 | + | |
61 | +CONFIG_PINCTRL=y | |
62 | +CONFIG_PINCTRL_IMX8=y | |
63 | + | |
64 | +CONFIG_CMD_NET=n | |
65 | +CONFIG_CMD_NFS=n | |
66 | +CONFIG_CMD_BDI=n | |
67 | +CONFIG_CMD_CONSOLE=n | |
68 | +CONFIG_CMD_BOOTD=n | |
69 | +CONFIG_CMD_BOOTEFI=n | |
70 | +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n | |
71 | +CONFIG_CMD_ELF=n | |
72 | +CONFIG_CMD_GO=n | |
73 | +CONFIG_CMD_RUN=n | |
74 | +CONFIG_CMD_IMI=n | |
75 | +CONFIG_CMD_IMLS=n | |
76 | +CONFIG_CMD_XIMG=n | |
77 | +CONFIG_CMD_EXPORTENV=n | |
78 | +CONFIG_CMD_IMPORTENV=n | |
79 | +CONFIG_CMD_EDITENV=n | |
80 | +CONFIG_CMD_ENV_EXISTS=n | |
81 | +CONFIG_CMD_CRC32=n | |
82 | +CONFIG_CMD_DM=n | |
83 | +CONFIG_CMD_LOADB=n | |
84 | +CONFIG_CMD_LOADS=n | |
85 | +CONFIG_CMD_FLASH=n | |
86 | +CONFIG_CMD_GPT=n | |
87 | +CONFIG_CMD_FPGA=n | |
88 | +CONFIG_CMD_ECHO=n | |
89 | +CONFIG_CMD_ITEST=n | |
90 | +CONFIG_CMD_SOURCE=n | |
91 | +CONFIG_CMD_SETEXPR=n | |
92 | +CONFIG_CMD_MISC=n | |
93 | +CONFIG_CMD_UNZIP=n | |
94 | +CONFIG_CMD_LZMADEC=n | |
95 | +CONFIG_CMD_SAVEENV=n | |
96 | + | |
97 | +CONFIG_DISPLAY_CPUINFO=n | |
98 | +CONFIG_DISPLAY_BOARDINFO=n | |
99 | +CONFIG_EFI_LOADER=n | |
100 | + | |
101 | +CONFIG_POWER_DOMAIN=y | |
102 | +CONFIG_IMX8_POWER_DOMAIN=y | |
103 | + | |
104 | +CONFIG_DM_THERMAL=y | |
105 | +CONFIG_IMX_SC_THERMAL=y | |
106 | + | |
107 | +CONFIG_ENV_IS_IN_MMC=y | |
108 | +CONFIG_LZ4=y | |
109 | + | |
110 | +CONFIG_SMC_FUSE=y | |
111 | +CONFIG_CMD_MEMTEST=y | |
112 | + | |
113 | +CONFIG_SPL=y | |
114 | +CONFIG_SPL_MMC_SUPPORT=y | |
115 | +CONFIG_SPL_GPIO_SUPPORT=y | |
116 | + | |
117 | +CONFIG_SPL_ENV_SUPPORT=y | |
118 | +CONFIG_SPL_LIBDISK_SUPPORT=y | |
119 | + | |
120 | +CONFIG_NOT_UUU_BUILD=y | |
121 | +CONFIG_SHA256=y | |
122 | +CONFIG_SPL_MMC_WRITE=y | |
123 | +CONFIG_DUAL_BOOTLOADER=y | |
124 | +CONFIG_APPEND_BOOTARGS=y | |
125 | + | |
126 | +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 | |
127 | +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x00800000 |
configs/imx8qxp_mek_androidauto_defconfig
configs/imx8qxp_mek_androidauto_trusty_defconfig
configs/imx8qxp_mek_defconfig
configs/imx8qxp_mek_fspi_defconfig
configs/imx8qxp_mek_spl_defconfig
configs/imx8qxp_mek_spl_fspi_defconfig
include/configs/imx8qm_arm2.h
include/configs/imx8qm_mek.h
... | ... | @@ -441,8 +441,6 @@ |
441 | 441 | #endif |
442 | 442 | |
443 | 443 | #define CONFIG_OF_SYSTEM_SETUP |
444 | -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 | |
445 | -#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ | |
446 | 444 | |
447 | 445 | #if defined(CONFIG_ANDROID_SUPPORT) |
448 | 446 | #include "imx8qm_mek_android.h" |
include/configs/imx8qxp_arm2.h
include/configs/imx8qxp_mek.h
... | ... | @@ -420,8 +420,6 @@ |
420 | 420 | #endif |
421 | 421 | |
422 | 422 | #define CONFIG_OF_SYSTEM_SETUP |
423 | -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 | |
424 | -#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ | |
425 | 423 | |
426 | 424 | #if defined(CONFIG_ANDROID_SUPPORT) |
427 | 425 | #include "imx8qxp_mek_android.h" |