From 5db22bcc8d2eb175c5caf19f075c8bb5b42733f1 Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Wed, 12 Aug 2020 20:59:54 +0100 Subject: [PATCH] arm-bsp/u-boot: Rebase FVP patches on u-boot 2020.07 This removes fuzz warnings when applying the patches. Also change 'earlyprintk' parameter to 'earlycon' as the former isn't support for AArch64. Change-Id: I7d9ee3e3ab47877e1d85862dbc835e0d5dac0ecc Signed-off-by: Anders Dellien --- .../fvp-common/u-boot_vexpress_fvp.patch | 2 +- .../fvp-common/u-boot_vexpress_fvp.patch | 16 ++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) rename meta-arm-bsp/recipes-bsp/u-boot/{files => u-boot-2020.01}/fvp-common/u-boot_vexpress_fvp.patch (78%) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-common/u-boot_vexpress_fvp.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.01/fvp-common/u-boot_vexpress_fvp.patch similarity index 78% rename from meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.01/fvp-common/u-boot_vexpress_fvp.patch index bdca202c..19e1a569 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.01/fvp-common/u-boot_vexpress_fvp.patch @@ -7,7 +7,7 @@ index c9cec8322c..3a339be6a2 100644 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9" -+CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9" ++CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 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-2020.07/fvp-common/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-common/u-boot_vexpress_fvp.patch new file mode 100644 index 00000000..9a21687e --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-common/u-boot_vexpress_fvp.patch @@ -0,0 +1,16 @@ +Upstream-Status: Inappropriate [OE config specific] + +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/vda2 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 5fc3723c..205c3c47 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -2,8 +2,8 @@ THIS_DIR := "${THISDIR}" FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:" -FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:" -FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:" +FILESEXTRAPATHS_prepend_fvp-base = "${THIS_DIR}/${BP}/fvp-common:" +FILESEXTRAPATHS_prepend_foundation-armv8 = "${THIS_DIR}/${BP}/fvp-common:" # # Cortex-A5 DesignStart KMACHINE