From 4338e38b8a9654d834f985e1083318634b5585ff Mon Sep 17 00:00:00 2001 From: Vineeth Raveendran Date: Thu, 7 May 2020 11:00:53 +0100 Subject: [PATCH] arm-bsp: add dunfell support for fvps, juno and gem5 Make following machines compatible with dunfell: - foundation-armv8 - fvp-base - juno - gem5 Major changes include moving kernel version to 5.4 and U-BOOT version to v2020 Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75 Issue-Id: SCM-833 Signed-off-by: Vineeth Raveendran Reviewed-by: Bertrand Marquis Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-common/fvp.inc | 4 ++-- meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 +- .../files/fvp-common/u-boot_vexpress_fvp.patch | 13 +++++++++++++ .../recipes-bsp/u-boot/u-boot_2019.%.bbappend | 9 --------- .../recipes-bsp/u-boot/u-boot_2020.%.bbappend | 13 +++++++++++++ ...yocto_4.19.bbappend => linux-yocto_5.4.bbappend} | 0 6 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend rename meta-arm-bsp/recipes-kernel/linux/{linux-yocto_4.19.bbappend => linux-yocto_5.4.bbappend} (100%) diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc index 702a1d20..08f8b15a 100644 --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc @@ -35,9 +35,9 @@ DISK_IMG_PARTITION3_CONTENT = "" SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" # FVP u-boot configuration -UBOOT_MACHINE = "vexpress_aemv8a_dram_defconfig" +UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" diff --git a/meta-arm-bsp/conf/machine/gem5-arm64.conf b/meta-arm-bsp/conf/machine/gem5-arm64.conf index e07cc812..4db86c97 100644 --- a/meta-arm-bsp/conf/machine/gem5-arm64.conf +++ b/meta-arm-bsp/conf/machine/gem5-arm64.conf @@ -20,7 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" EXTRA_IMAGEDEPENDS += "virtual/gem5-bootloader" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" # Uncomment the following if you need to build gem5 provided bootloader, else 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/files/fvp-common/u-boot_vexpress_fvp.patch new file mode 100644 index 00000000..bdca202c --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch @@ -0,0 +1,13 @@ +diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig +index c9cec8322c..3a339be6a2 100644 +--- a/configs/vexpress_aemv8a_semi_defconfig ++++ b/configs/vexpress_aemv8a_semi_defconfig +@@ -9,7 +9,7 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a" + CONFIG_DISTRO_DEFAULTS=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 earlyprintk=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_2019.%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend deleted file mode 100644 index 1dd7d897..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# u-boot_2019 patch for Juno board (Adding boot env) - -# -# Patch u-boot to add environment variables from Flash -# - -FILESEXTRAPATHS_prepend := "${THISDIR}/files/${MACHINE}:" - -SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend new file mode 100644 index 00000000..a46e36f0 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend @@ -0,0 +1,13 @@ +# u-boot_2020 patch for fvp machinesboard + +# +# Patch u-boot to change kernel command line +# + +FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:" +FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:" +FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files:" + +SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch" +SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch" +SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch" diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend similarity index 100% rename from meta-arm-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend