diff options
| author | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-10-11 10:10:25 +0200 |
|---|---|---|
| committer | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-10-11 10:10:25 +0200 |
| commit | 283fd454a88888cde9e440668b43b402f1cf8658 (patch) | |
| tree | b12026a4e3868b5863575bc443f7b419f95d29aa /configs | |
| parent | 04bca82019c6235214d533a420b6f4535a2f5d8b (diff) | |
| parent | 320096439b63134c293092b835454bac10cffb40 (diff) | |
Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04
* origin/imx_v2022.04:
MA-20738 imx8ulp: bumps CONFIG_LMB_MAX_REGIONS
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/imx8ulp_9x9_evk_android_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_evk_android_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_evk_android_dual_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_evk_android_trusty_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_evk_android_trusty_dual_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_watch_android_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_watch_android_dual_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8ulp_watch_android_trusty_dual_defconfig | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/configs/imx8ulp_9x9_evk_android_defconfig b/configs/imx8ulp_9x9_evk_android_defconfig index 7f326aacf1..0fcdcad4bb 100644 --- a/configs/imx8ulp_9x9_evk_android_defconfig +++ b/configs/imx8ulp_9x9_evk_android_defconfig @@ -149,3 +149,4 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0xC8 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0 CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig b/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig index 6dc7a0d6cf..99c61f4228 100644 --- a/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig +++ b/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig @@ -156,3 +156,4 @@ CONFIG_ATTESTATION_ID_MANUFACTURER="nxp" CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP" CONFIG_DUAL_BOOTLOADER=y CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_evk_android_defconfig b/configs/imx8ulp_evk_android_defconfig index df603245f0..57fa5ff1a8 100644 --- a/configs/imx8ulp_evk_android_defconfig +++ b/configs/imx8ulp_evk_android_defconfig @@ -149,3 +149,4 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0xC8 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0 CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_evk_android_dual_defconfig b/configs/imx8ulp_evk_android_dual_defconfig index 1fef689c74..e7050ab71c 100644 --- a/configs/imx8ulp_evk_android_dual_defconfig +++ b/configs/imx8ulp_evk_android_dual_defconfig @@ -150,3 +150,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0xC8 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0 CONFIG_DUAL_BOOTLOADER=y CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_evk_android_trusty_defconfig b/configs/imx8ulp_evk_android_trusty_defconfig index 5e54aca9d7..f624bedc72 100644 --- a/configs/imx8ulp_evk_android_trusty_defconfig +++ b/configs/imx8ulp_evk_android_trusty_defconfig @@ -155,3 +155,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="evk_8ulp" CONFIG_ATTESTATION_ID_MANUFACTURER="nxp" CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP" CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_evk_android_trusty_dual_defconfig b/configs/imx8ulp_evk_android_trusty_dual_defconfig index 93ca30df1d..8e7d7797bd 100644 --- a/configs/imx8ulp_evk_android_trusty_dual_defconfig +++ b/configs/imx8ulp_evk_android_trusty_dual_defconfig @@ -156,3 +156,4 @@ CONFIG_ATTESTATION_ID_MANUFACTURER="nxp" CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP" CONFIG_DUAL_BOOTLOADER=y CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig b/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig index 1693cc577c..b6b358546d 100644 --- a/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig +++ b/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig @@ -157,3 +157,4 @@ CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP" CONFIG_DUAL_BOOTLOADER=y CONFIG_SECURE_UNLOCK=y CONFIG_AHAB_BOOT=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_watch_android_defconfig b/configs/imx8ulp_watch_android_defconfig index 3d7a8c2a56..1197272579 100644 --- a/configs/imx8ulp_watch_android_defconfig +++ b/configs/imx8ulp_watch_android_defconfig @@ -136,3 +136,4 @@ CONFIG_ANDROID_AB_SUPPORT=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0xC8 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0 +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_watch_android_dual_defconfig b/configs/imx8ulp_watch_android_dual_defconfig index c268a330de..60dffc0c15 100644 --- a/configs/imx8ulp_watch_android_dual_defconfig +++ b/configs/imx8ulp_watch_android_dual_defconfig @@ -137,3 +137,4 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0xC8 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0 CONFIG_DUAL_BOOTLOADER=y +CONFIG_LMB_MAX_REGIONS=9 diff --git a/configs/imx8ulp_watch_android_trusty_dual_defconfig b/configs/imx8ulp_watch_android_trusty_dual_defconfig index 80b5d52c1b..ab439b3943 100644 --- a/configs/imx8ulp_watch_android_trusty_dual_defconfig +++ b/configs/imx8ulp_watch_android_trusty_dual_defconfig @@ -143,3 +143,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="watch_8ulp" CONFIG_ATTESTATION_ID_MANUFACTURER="nxp" CONFIG_ATTESTATION_ID_MODEL="WATCH_8ULP" CONFIG_DUAL_BOOTLOADER=y +CONFIG_LMB_MAX_REGIONS=9 |