summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhang sanshan <pete.zhang@nxp.com>2019-04-23 12:43:17 +0800
committerzhang sanshan <pete.zhang@nxp.com>2019-04-23 16:53:37 +0800
commit1248a36d87a882f6adc658c62836166bbf24f7cd (patch)
tree399d4ffc9463c0d3dc944ab6a1e6c0cf90448d45
parentdd556ebf3e4aabb6c724a6f6941973ece88ad8a5 (diff)
MA-14651-2 add dependence between CONFIG_ANDROID_AB_SUPPORT and CONFIG_SYSTEM_RAMDISK_SUPPORT
system can't enable CONFIG_SYSTEM_RAMDISK_SUPPORT in non-AB system. boot.img have normal boot kernel and recovery ramdisk. So ota can't update boot.img in both normal boot and recovery mode. Change-Id: I137b098ba58e4fbd97105382903683e6713b8b29 Signed-off-by: zhang sanshan <pete.zhang@nxp.com>
Diffstat
-rw-r--r--include/configs/imx8mm_evk_android.h2
-rw-r--r--include/configs/imx8mq_aiy_android.h2
-rw-r--r--include/configs/imx8mq_evk_android.h2
-rw-r--r--include/configs/imx8mq_evk_androidthings.h2
-rw-r--r--include/configs/imx8qm_mek_android.h2
-rw-r--r--include/configs/imx8qm_mek_android_auto.h2
-rw-r--r--include/configs/imx8qxp_mek_android.h2
-rw-r--r--include/configs/imx8qxp_mek_android_auto.h2
-rw-r--r--include/configs/multa-imx7d_androidthings.h3
-rw-r--r--include/configs/mx6ul_nxpu_iopb_android_things.h4
-rw-r--r--include/configs/mx6ul_spriot_android_things.h3
-rw-r--r--include/configs/mx7dsabresd_androidthings.h3
-rw-r--r--include/configs/pico-imx6dl_android_things.h3
-rw-r--r--include/configs/pico-imx7dandroidthings.h2
-rw-r--r--include/configs/picosom-imx6ul_android_things.h4
15 files changed, 37 insertions, 1 deletions
diff --git a/include/configs/imx8mm_evk_android.h b/include/configs/imx8mm_evk_android.h
index 1bb37cc3bb..2c35735c84 100644
--- a/include/configs/imx8mm_evk_android.h
+++ b/include/configs/imx8mm_evk_android.h
@@ -13,7 +13,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_AVB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 0
#define CONFIG_AVB_FUSE_BANK_START 0
#define CONFIG_AVB_FUSE_BANK_END 0
diff --git a/include/configs/imx8mq_aiy_android.h b/include/configs/imx8mq_aiy_android.h
index 5b5a86c2c5..ee269a5f60 100644
--- a/include/configs/imx8mq_aiy_android.h
+++ b/include/configs/imx8mq_aiy_android.h
@@ -11,7 +11,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 4
#define CONFIG_AVB_FUSE_BANK_START 14
#define CONFIG_AVB_FUSE_BANK_END 14
diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index fa06e01cc3..ea76aebd0d 100644
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -12,7 +12,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_AVB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 0
#define CONFIG_AVB_FUSE_BANK_START 0
#define CONFIG_AVB_FUSE_BANK_END 0
diff --git a/include/configs/imx8mq_evk_androidthings.h b/include/configs/imx8mq_evk_androidthings.h
index a67b5d4180..8c2ac1dcf3 100644
--- a/include/configs/imx8mq_evk_androidthings.h
+++ b/include/configs/imx8mq_evk_androidthings.h
@@ -11,7 +11,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 4
#define CONFIG_AVB_FUSE_BANK_START 14
#define CONFIG_AVB_FUSE_BANK_END 14
diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h
index 42a261f020..d8d7569dca 100644
--- a/include/configs/imx8qm_mek_android.h
+++ b/include/configs/imx8qm_mek_android.h
@@ -16,7 +16,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_AVB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 0
#define CONFIG_AVB_FUSE_BANK_START 0
#define CONFIG_AVB_FUSE_BANK_END 0
diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h
index c0a0683ad3..6b731550ef 100644
--- a/include/configs/imx8qm_mek_android_auto.h
+++ b/include/configs/imx8qm_mek_android_auto.h
@@ -28,7 +28,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_AVB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 0
#define CONFIG_AVB_FUSE_BANK_START 0
#define CONFIG_AVB_FUSE_BANK_END 0
diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index dddcf454e9..992013fb0e 100644
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_mek_android.h
@@ -16,7 +16,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_AVB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 0
#define CONFIG_AVB_FUSE_BANK_START 0
#define CONFIG_AVB_FUSE_BANK_END 0
diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h
index 1ebd7ff7d0..f564765044 100644
--- a/include/configs/imx8qxp_mek_android_auto.h
+++ b/include/configs/imx8qxp_mek_android_auto.h
@@ -27,7 +27,9 @@
#define CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_AVB_SUPPORT
#define CONFIG_SUPPORT_EMMC_RPMB
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#define CONFIG_AVB_FUSE_BANK_SIZEW 0
#define CONFIG_AVB_FUSE_BANK_START 0
#define CONFIG_AVB_FUSE_BANK_END 0
diff --git a/include/configs/multa-imx7d_androidthings.h b/include/configs/multa-imx7d_androidthings.h
index 23d05fca2c..8e25d7c2bf 100644
--- a/include/configs/multa-imx7d_androidthings.h
+++ b/include/configs/multa-imx7d_androidthings.h
@@ -41,8 +41,9 @@
#define CONFIG_SYS_MMC_ENV_PART 1 /* boot0 area */
#endif
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
-
+#endif
#define CONFIG_AVB_SUPPORT
diff --git a/include/configs/mx6ul_nxpu_iopb_android_things.h b/include/configs/mx6ul_nxpu_iopb_android_things.h
index 4cefd8e45a..ab16a1180c 100644
--- a/include/configs/mx6ul_nxpu_iopb_android_things.h
+++ b/include/configs/mx6ul_nxpu_iopb_android_things.h
@@ -37,7 +37,11 @@
#endif
#define CONFIG_ANDROID_AB_SUPPORT
+
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
+
#define CONFIG_CMD_FSL_CAAM_KB
#define CONFIG_SHA1
#define CONFIG_SHA256
diff --git a/include/configs/mx6ul_spriot_android_things.h b/include/configs/mx6ul_spriot_android_things.h
index 278bda765c..03628dfc5a 100644
--- a/include/configs/mx6ul_spriot_android_things.h
+++ b/include/configs/mx6ul_spriot_android_things.h
@@ -33,7 +33,10 @@
#define CONFIG_SHA256
#define CONFIG_AVB_SUPPORT
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
+
#ifdef CONFIG_AVB_SUPPORT
#ifdef CONFIG_SYS_MALLOC_LEN
diff --git a/include/configs/mx7dsabresd_androidthings.h b/include/configs/mx7dsabresd_androidthings.h
index 51b0a84173..18542ce84a 100644
--- a/include/configs/mx7dsabresd_androidthings.h
+++ b/include/configs/mx7dsabresd_androidthings.h
@@ -33,7 +33,10 @@
#define CONFIG_SYS_MMC_ENV_PART 1 /* boot0 area */
#endif
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
+
#define CONFIG_CMD_FS_GENERIC
#define CONFIG_AVB_SUPPORT
diff --git a/include/configs/pico-imx6dl_android_things.h b/include/configs/pico-imx6dl_android_things.h
index 469d7aff9b..3040055924 100644
--- a/include/configs/pico-imx6dl_android_things.h
+++ b/include/configs/pico-imx6dl_android_things.h
@@ -21,7 +21,10 @@
#define CONFIG_SHA256
#define CONFIG_AVB_SUPPORT
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
+
#ifdef CONFIG_AVB_SUPPORT
#ifdef CONFIG_SYS_MALLOC_LEN
diff --git a/include/configs/pico-imx7dandroidthings.h b/include/configs/pico-imx7dandroidthings.h
index d06e0c1305..b8aa4815ff 100644
--- a/include/configs/pico-imx7dandroidthings.h
+++ b/include/configs/pico-imx7dandroidthings.h
@@ -48,7 +48,9 @@
#define CONFIG_SHA1
#define CONFIG_SHA256
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
#ifdef CONFIG_SYS_MMC_ENV_DEV
#undef CONFIG_SYS_MMC_ENV_DEV
diff --git a/include/configs/picosom-imx6ul_android_things.h b/include/configs/picosom-imx6ul_android_things.h
index d75222544a..d2487719dc 100644
--- a/include/configs/picosom-imx6ul_android_things.h
+++ b/include/configs/picosom-imx6ul_android_things.h
@@ -40,7 +40,11 @@
#define CONFIG_SHA256
#define CONFIG_AVB_SUPPORT
+
+#ifdef CONFIG_ANDROID_AB_SUPPORT
#define CONFIG_SYSTEM_RAMDISK_SUPPORT
+#endif
+
#ifdef CONFIG_AVB_SUPPORT
#ifdef CONFIG_SYS_MALLOC_LEN
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-30 14:59:46 +0000