diff options
| author | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-05-31 11:39:13 +0200 |
|---|---|---|
| committer | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-05-31 11:39:13 +0200 |
| commit | 51ffd871c18c87c3756af7265011ba7efbc7ba39 (patch) | |
| tree | 342cca3a0214bf2dbd5e48eda7251dfa8158c3e1 /include/configs | |
| parent | ffef75d174819a90bf0efeb7c0ccc6047680d7b7 (diff) | |
| parent | 1939a721eedbd5f3eba8ae7ecdec8cc570d7a9fb (diff) | |
Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04
* origin/imx_v2022.04:
MA-20327 imx8q: add dual bootloader support
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/imx8qm_mek_android.h | 3 | ||||
| -rw-r--r-- | include/configs/imx8qm_mek_android_auto.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8qxp_mek_android.h | 3 | ||||
| -rw-r--r-- | include/configs/imx8qxp_mek_android_auto.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h index 4347d4b047c..8d44391db00 100644 --- a/include/configs/imx8qm_mek_android.h +++ b/include/configs/imx8qm_mek_android.h @@ -24,6 +24,8 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ +#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000 + #ifdef CONFIG_IMX_TRUSTY_OS #define NS_ARCH_ARM64 1 #define KEYSLOT_HWPARTITION_ID 2 @@ -34,7 +36,6 @@ #define BOOTLOADER_RBIDX_START 0x3FF000 #define BOOTLOADER_RBIDX_LEN 0x08 #define BOOTLOADER_RBIDX_INITVAL 0 -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000 #endif #endif /* IMX8QM_MEK_ANDROID_H */ diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h index 63d1288158b..23d5cc3af0e 100644 --- a/include/configs/imx8qm_mek_android_auto.h +++ b/include/configs/imx8qm_mek_android_auto.h @@ -36,9 +36,7 @@ #define NS_ARCH_ARM64 1 #define KEYSLOT_HWPARTITION_ID 2 #define KEYSLOT_BLKS 0x3FFF -#endif -#ifdef CONFIG_DUAL_BOOTLOADER #define BOOTLOADER_RBIDX_OFFSET 0x3FE000 #define BOOTLOADER_RBIDX_START 0x3FF000 #define BOOTLOADER_RBIDX_LEN 0x08 diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h index 6fc1f09f7bf..88a40dc96c9 100644 --- a/include/configs/imx8qxp_mek_android.h +++ b/include/configs/imx8qxp_mek_android.h @@ -21,6 +21,8 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ +#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000 + #ifdef CONFIG_IMX_TRUSTY_OS #define NS_ARCH_ARM64 1 #define KEYSLOT_HWPARTITION_ID 2 @@ -31,7 +33,6 @@ #define BOOTLOADER_RBIDX_START 0x3FF000 #define BOOTLOADER_RBIDX_LEN 0x08 #define BOOTLOADER_RBIDX_INITVAL 0 -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000 #endif #endif /* IMX8QXP_MEK_ANDROID_H */ diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h index 2bd73a69c1a..49c017c3400 100644 --- a/include/configs/imx8qxp_mek_android_auto.h +++ b/include/configs/imx8qxp_mek_android_auto.h @@ -32,9 +32,7 @@ #define AVB_RPMB #define KEYSLOT_HWPARTITION_ID 2 #define KEYSLOT_BLKS 0x3FFF -#endif -#ifdef CONFIG_DUAL_BOOTLOADER #define BOOTLOADER_RBIDX_OFFSET 0x3FE000 #define BOOTLOADER_RBIDX_START 0x3FF000 #define BOOTLOADER_RBIDX_LEN 0x08 |