summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJi Luo <ji.luo@nxp.com>2020-09-21 16:22:21 +0800
committerJi Luo <ji.luo@nxp.com>2020-09-22 17:01:14 +0800
commit2c2363e47b858bd178c44869328eca211b2c3f62 (patch)
treef1f993b2ac76e087a58af9665b4633587e8f24af /include
parent601eda60064b5c1e27daadf7b963090f0381d388 (diff)
MA-17916-1 Clean Up: Guard codes with correct configs
This commit does some clean-up to guard the codes/configs with correct configs, so we can enable/disable the feature without modifying the codes. Test: builds and boots on imx8qm. Signed-off-by: Ji Luo <ji.luo@nxp.com> Change-Id: Ic4cf4d9f47bd5a4317b2621a5378cb4b192e52fb
Diffstat (limited to 'include')
-rw-r--r--include/configs/imx8qm_mek_android_auto.h3
-rw-r--r--include/configs/imx8qxp_mek_android_auto.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h
index 54899665e2..4574e8b053 100644
--- a/include/configs/imx8qm_mek_android_auto.h
+++ b/include/configs/imx8qm_mek_android_auto.h
@@ -65,6 +65,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
@@ -74,8 +75,6 @@
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000
#endif
-#endif
-
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_BLK
diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h
index c1b59c878b..448bab7461 100644
--- a/include/configs/imx8qxp_mek_android_auto.h
+++ b/include/configs/imx8qxp_mek_android_auto.h
@@ -57,6 +57,7 @@
#define AVB_RPMB
#define KEYSLOT_HWPARTITION_ID 2
#define KEYSLOT_BLKS 0x3FFF
+#endif
#ifdef CONFIG_DUAL_BOOTLOADER
#define BOOTLOADER_RBIDX_OFFSET 0x3FE000
@@ -65,7 +66,6 @@
#define BOOTLOADER_RBIDX_INITVAL 0
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000
#endif
-#endif
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_BLK