diff --git a/common/image-android.c b/common/image-android.c index 71b93da2d5..1646e5051a 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -233,6 +233,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, strncat(commandline, bootargs_trusty, sizeof(commandline) - strlen(commandline)); } +#ifdef CONFIG_APPEND_BOOTARGS /* Add 'append_bootargs' to hold some paramemters which need to be appended * to bootargs */ char *append_bootargs = env_get("append_bootargs"); @@ -245,6 +246,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, strncat(commandline, append_bootargs, sizeof(commandline) - strlen(commandline)); } } +#endif debug("Kernel command line: %s\n", commandline); env_set("bootargs", commandline); diff --git a/configs/imx8mm_ddr4_evk_android_defconfig b/configs/imx8mm_ddr4_evk_android_defconfig index f5c71e3fa4..a0f006d384 100755 --- a/configs/imx8mm_ddr4_evk_android_defconfig +++ b/configs/imx8mm_ddr4_evk_android_defconfig @@ -62,3 +62,4 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8mm_evk_android_defconfig b/configs/imx8mm_evk_android_defconfig index 9765d6e3d7..316e15f7ff 100755 --- a/configs/imx8mm_evk_android_defconfig +++ b/configs/imx8mm_evk_android_defconfig @@ -62,3 +62,4 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8mm_evk_android_trusty_defconfig b/configs/imx8mm_evk_android_trusty_defconfig index 6217f623db..b18590b0c8 100755 --- a/configs/imx8mm_evk_android_trusty_defconfig +++ b/configs/imx8mm_evk_android_trusty_defconfig @@ -63,3 +63,4 @@ CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_IMX_TRUSTY_OS=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8mq_aiy_android_defconfig b/configs/imx8mq_aiy_android_defconfig index 28ae888083..2fafc03f76 100644 --- a/configs/imx8mq_aiy_android_defconfig +++ b/configs/imx8mq_aiy_android_defconfig @@ -76,3 +76,4 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig index ed7d27205f..38705418ec 100644 --- a/configs/imx8mq_evk_android_defconfig +++ b/configs/imx8mq_evk_android_defconfig @@ -78,3 +78,4 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig index d4daca6a68..97896f6b60 100644 --- a/configs/imx8qm_mek_android_defconfig +++ b/configs/imx8qm_mek_android_defconfig @@ -90,3 +90,4 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index bc6a97d05b..0a8c3cb7e0 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -120,3 +120,4 @@ CONFIG_NOT_UUU_BUILD=y CONFIG_SHA256=y CONFIG_SPL_MMC_WRITE=y CONFIG_DUAL_BOOTLOADER=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig index 600be95234..a8710eba57 100644 --- a/configs/imx8qm_mek_androidauto_xen_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_defconfig @@ -122,3 +122,4 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig index fe33e72f77..184e52e811 100644 --- a/configs/imx8qxp_mek_android_defconfig +++ b/configs/imx8qxp_mek_android_defconfig @@ -90,3 +90,4 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index e501c40e1b..0611773513 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -121,3 +121,4 @@ CONFIG_NOT_UUU_BUILD=y CONFIG_SHA256=y CONFIG_SPL_MMC_WRITE=y CONFIG_DUAL_BOOTLOADER=y +CONFIG_APPEND_BOOTARGS=y diff --git a/include/configs/mx_android_common.h b/include/configs/mx_android_common.h index d1cec92ec3..3e1e96e4b2 100644 --- a/include/configs/mx_android_common.h +++ b/include/configs/mx_android_common.h @@ -50,5 +50,6 @@ #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_SIZE 0x19000000 +#define CONFIG_APPEND_BOOTARGS #endif /*MX_ANDROID_COMMON_H*/ diff --git a/lib/Kconfig b/lib/Kconfig index aff37a9a8d..064afeaafb 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -7,6 +7,9 @@ config AVB_ATX bool "Enable AVB_ATX support" depends on AVB_SUPPORT +config APPEND_BOOTARGS + bool "Append bootargs support" + config BCH bool "Enable Software based BCH ECC" help