From 1a46824760db5e2d8fb0399c5bd741f80d0d0bc8 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Tue, 1 Jun 2021 15:52:30 +0100 Subject: [PATCH] arm-bsp/u-boot/fvp-base: Make usage of config fragments to set CONFIG_BOOTARGS Since u-boot recipe supports using config fragments let's use it instead of patching the vexpress_aemv8a_semi_defconfig file. Issue-Id: SCM-2329 Signed-off-by: Diego Sueiro Change-Id: I7feba5d23a6eab501cade38c188cb8414d0b86bd Signed-off-by: Jon Mason --- .../u-boot/u-boot/fvp-base/bootargs.cfg | 1 + .../u-boot/fvp-base/u-boot_vexpress_fvp.patch | 17 ----------------- .../recipes-bsp/u-boot/u-boot_%.bbappend | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/u-boot_vexpress_fvp.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg new file mode 100644 index 00000000..b7510f48 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg @@ -0,0 +1 @@ +CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda1 rw rootwait" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/u-boot_vexpress_fvp.patch deleted file mode 100644 index b0cbe0d8..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/u-boot_vexpress_fvp.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate [OE config specific] -Signed-off-by: Anders Dellien - -diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig -index f0ac2f9da3..93fcd3026a 100644 ---- a/configs/vexpress_aemv8a_semi_defconfig -+++ b/configs/vexpress_aemv8a_semi_defconfig -@@ -10,7 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y - CONFIG_ANDROID_BOOT_IMAGE=y - CONFIG_BOOTDELAY=1 - CONFIG_USE_BOOTARGS=y --CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9" -+CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda1 rw rootwait loglevel=9" - # CONFIG_USE_BOOTCOMMAND is not set - # CONFIG_DISPLAY_CPUINFO is not set - # CONFIG_DISPLAY_BOARDINFO is not set - diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index a572347f..692b4ebc 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -5,7 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # # FVP BASE # -SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch" +SRC_URI_append_fvp-base = " file://bootargs.cfg" # # FVP BASE ARM32