LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MA-14120 Add config to guard append bootargs support 

Grant user the permission to change the bootargs can be very
dangerous, so add config 'CONFIG_APPEND_BOOTARGS' to guard the
bootargs appending feature.

Test: bootargs can't be appended if "CONFIG_APPEND_BOOTARGS" is
      not set.

Change-Id: I6d6879415ca251c806b56490290e5032aef24277
Signed-off-by: Ji Luo <ji.luo@nxp.com>
This commit is contained in:
Ji Luo 2019-02-21 17:01:43 +08:00
parent 3a62d022b9
commit 24e33164cb
13 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/image-android.c
View File

@ -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)); strncat(commandline, bootargs_trusty, sizeof(commandline) - strlen(commandline));
} }
#ifdef CONFIG_APPEND_BOOTARGS
/* Add 'append_bootargs' to hold some paramemters which need to be appended /* Add 'append_bootargs' to hold some paramemters which need to be appended
* to bootargs */ * to bootargs */
char *append_bootargs = env_get("append_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)); strncat(commandline, append_bootargs, sizeof(commandline) - strlen(commandline));
} }
} }
#endif
debug("Kernel command line: %s\n", commandline); debug("Kernel command line: %s\n", commandline);
env_set("bootargs", commandline); env_set("bootargs", commandline);

1
configs/imx8mm_ddr4_evk_android_defconfig
View File

@ -62,3 +62,4 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_NOT_UUU_BUILD=y CONFIG_NOT_UUU_BUILD=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8mm_evk_android_defconfig
View File

@ -62,3 +62,4 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_NOT_UUU_BUILD=y CONFIG_NOT_UUU_BUILD=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8mm_evk_android_trusty_defconfig
View File

@ -63,3 +63,4 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_IMX_TRUSTY_OS=y CONFIG_IMX_TRUSTY_OS=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8mq_aiy_android_defconfig
View File

@ -76,3 +76,4 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_NOT_UUU_BUILD=y CONFIG_NOT_UUU_BUILD=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8mq_evk_android_defconfig
View File

@ -78,3 +78,4 @@ CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_GADGET=y
CONFIG_NOT_UUU_BUILD=y CONFIG_NOT_UUU_BUILD=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8qm_mek_android_defconfig
View File

@ -90,3 +90,4 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_NOT_UUU_BUILD=y CONFIG_NOT_UUU_BUILD=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8qm_mek_androidauto_trusty_defconfig
View File

@ -120,3 +120,4 @@ CONFIG_NOT_UUU_BUILD=y
CONFIG_SHA256=y CONFIG_SHA256=y
CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_MMC_WRITE=y
CONFIG_DUAL_BOOTLOADER=y CONFIG_DUAL_BOOTLOADER=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8qm_mek_androidauto_xen_defconfig
View File

@ -122,3 +122,4 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8qxp_mek_android_defconfig
View File

@ -90,3 +90,4 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_NOT_UUU_BUILD=y CONFIG_NOT_UUU_BUILD=y
CONFIG_APPEND_BOOTARGS=y

1
configs/imx8qxp_mek_androidauto_trusty_defconfig
View File

@ -121,3 +121,4 @@ CONFIG_NOT_UUU_BUILD=y
CONFIG_SHA256=y CONFIG_SHA256=y
CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_MMC_WRITE=y
CONFIG_DUAL_BOOTLOADER=y CONFIG_DUAL_BOOTLOADER=y
CONFIG_APPEND_BOOTARGS=y

1
include/configs/mx_android_common.h
View File

@ -50,5 +50,6 @@
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_FASTBOOT_BUF_SIZE 0x19000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x19000000
#define CONFIG_APPEND_BOOTARGS
#endif /*MX_ANDROID_COMMON_H*/ #endif /*MX_ANDROID_COMMON_H*/

3
lib/Kconfig
View File

@ -7,6 +7,9 @@ config AVB_ATX
bool "Enable AVB_ATX support" bool "Enable AVB_ATX support"
depends on AVB_SUPPORT depends on AVB_SUPPORT
config APPEND_BOOTARGS
bool "Append bootargs support"
config BCH config BCH
bool "Enable Software based BCH ECC" bool "Enable Software based BCH ECC"
help help