summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorJi Luo <ji.luo@nxp.com>2022-05-24 17:42:28 +0800
committerJi Luo <ji.luo@nxp.com>2022-05-25 12:00:53 +0800
commit0bacc32bffadc1404a83bf7ac27762c72e6f2a87 (patch)
treed38a4b80535364f6503d0625048207cf2240d5bb /include/configs
parent587c0e19a32ac49e681c8e05926e10cb9a9a43a7 (diff)
MA-20303-2 Enable configs to check rollback index
Enable related configs to support the rollback index check in single bootloader case. Change-Id: I836a39fdf4b67e6358af8ef5db0cba489d271d43 Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/imx8mm_evk_android.h3
-rw-r--r--include/configs/imx8mn_evk_android.h3
-rw-r--r--include/configs/imx8mp_evk_android.h3
-rw-r--r--include/configs/imx8mq_evk_android.h3
-rw-r--r--include/configs/imx8qm_mek_android.h5
-rw-r--r--include/configs/imx8qxp_mek_android.h5
-rw-r--r--include/configs/imx8ulp_evk_android.h3
7 files changed, 10 insertions, 15 deletions
diff --git a/include/configs/imx8mm_evk_android.h b/include/configs/imx8mm_evk_android.h
index 393c019736b..463e872541e 100644
--- a/include/configs/imx8mm_evk_android.h
+++ b/include/configs/imx8mm_evk_android.h
@@ -27,7 +27,6 @@
#define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
#endif
-#ifdef CONFIG_DUAL_BOOTLOADER
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
#ifdef CONFIG_IMX_TRUSTY_OS
@@ -37,8 +36,6 @@
#define BOOTLOADER_RBIDX_INITVAL 0
#endif
-#endif
-
#ifdef CONFIG_IMX_TRUSTY_OS
#define AVB_RPMB
#define KEYSLOT_HWPARTITION_ID 2
diff --git a/include/configs/imx8mn_evk_android.h b/include/configs/imx8mn_evk_android.h
index 2ced41c9238..a7f155c9f4c 100644
--- a/include/configs/imx8mn_evk_android.h
+++ b/include/configs/imx8mn_evk_android.h
@@ -27,7 +27,6 @@
#define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
#endif
-#ifdef CONFIG_DUAL_BOOTLOADER
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
#ifdef CONFIG_IMX_TRUSTY_OS
@@ -37,8 +36,6 @@
#define BOOTLOADER_RBIDX_INITVAL 0
#endif
-#endif
-
#ifdef CONFIG_IMX_TRUSTY_OS
#define AVB_RPMB
#define KEYSLOT_HWPARTITION_ID 2
diff --git a/include/configs/imx8mp_evk_android.h b/include/configs/imx8mp_evk_android.h
index 42bd9626721..09e3841908b 100644
--- a/include/configs/imx8mp_evk_android.h
+++ b/include/configs/imx8mp_evk_android.h
@@ -27,7 +27,6 @@
#define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
#endif
-#ifdef CONFIG_DUAL_BOOTLOADER
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
#ifdef CONFIG_IMX_TRUSTY_OS
@@ -37,8 +36,6 @@
#define BOOTLOADER_RBIDX_INITVAL 0
#endif
-#endif
-
#ifdef CONFIG_IMX_TRUSTY_OS
#define AVB_RPMB
#define KEYSLOT_HWPARTITION_ID 2
diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index ed9046e813b..5fb3c33fd84 100644
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -27,7 +27,6 @@
#define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
#endif
-#ifdef CONFIG_DUAL_BOOTLOADER
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
#ifdef CONFIG_IMX_TRUSTY_OS
@@ -37,8 +36,6 @@
#define BOOTLOADER_RBIDX_INITVAL 0
#endif
-#endif
-
#ifdef CONFIG_IMX_TRUSTY_OS
#define AVB_RPMB
#define KEYSLOT_HWPARTITION_ID 2
diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h
index f06d11ca581..4347d4b047c 100644
--- a/include/configs/imx8qm_mek_android.h
+++ b/include/configs/imx8qm_mek_android.h
@@ -30,6 +30,11 @@
#define KEYSLOT_BLKS 0x3FFF
#define AVB_RPMB
+#define BOOTLOADER_RBIDX_OFFSET 0x3FE000
+#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/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index a4187004761..6fc1f09f7bf 100644
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_mek_android.h
@@ -27,6 +27,11 @@
#define KEYSLOT_BLKS 0x3FFF
#define AVB_RPMB
+#define BOOTLOADER_RBIDX_OFFSET 0x3FE000
+#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/imx8ulp_evk_android.h b/include/configs/imx8ulp_evk_android.h
index f65d079b8b7..ae967eaf5b3 100644
--- a/include/configs/imx8ulp_evk_android.h
+++ b/include/configs/imx8ulp_evk_android.h
@@ -27,7 +27,6 @@
#define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
#endif
-#ifdef CONFIG_DUAL_BOOTLOADER
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000
#ifdef CONFIG_IMX_TRUSTY_OS
@@ -37,8 +36,6 @@
#define BOOTLOADER_RBIDX_INITVAL 0
#endif
-#endif
-
#ifdef CONFIG_IMX_TRUSTY_OS
#define AVB_RPMB
#define KEYSLOT_HWPARTITION_ID 2