arm-bsp/juno: update to use u-boot v2023.01
PATCH 1/3 arm-bsp/juno: update to use u-boot v2023.01
Update the compressed kernel patch and drop the unnecessary custom bootcmd patch.
--- meta-arm-bsp/conf/machine/juno.conf | 1 - ...tom-bootcmd-to-autoboot-from-uEnv.tx.patch | 50 ------------------- ...-modify-to-boot-compressed-initramfs.patch | 27 ++++++++++ ...-modify-to-boot-compressed-initramfs.patch | 41 --------------- .../recipes-bsp/u-boot/u-boot_%.bbappend | 4 +- 5 files changed, 28 insertions(+), 95 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch
meta-arm-bsp/conf/machine/juno.conf +0 -1
@@ -18,7 +18,6 @@ IMAGE_FSTYPES += "tar.bz2 ext4 cpio.gz" SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_u-boot ?= "2022.04" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" EXTRA_IMAGEDEPENDS += "trusted-firmware-a virtual/bootloader firmware-image-juno"
meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch deleted +0 -50
50 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 726f8b4dbd3c5b1873aad531d5e26af3acd9b9ca Mon Sep 17 00:00:00 2001 +From: Jon Mason <[email protected]> +Date: Mon, 19 Dec 2022 11:36:04 -0500 +Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs + +Signed-off-by: Jon Mason <[email protected]> +Upstream-Status: Inappropriate +--- + include/configs/vexpress_aemv8.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h +index 0c11b6b3331e..4ba4bebfbbae 100644 +--- a/include/configs/vexpress_aemv8.h ++++ b/include/configs/vexpress_aemv8.h +@@ -192,8 +192,10 @@ + #define VEXPRESS_RAMDISK_ADDR 0x8fe00000 + + #define EXTRA_ENV_NAMES \ ++ "kernel_comp_addr_r=0x90000000\0" \ ++ "kernel_comp_size=0x3000000\0" \ + "kernel_name=norkern\0" \ +- "kernel_alt_name=Image\0" \ ++ "kernel_alt_name=Image.gz\0" \ + "ramdisk_name=ramdisk.img\0" \ + "fdtfile=board.dtb\0" \ + "fdt_alt_name=juno\0"
meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch deleted +0 -41
41 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +1 -3
@@ -77,9 +77,7 @@ SRC_URI:append:fvp-baser-aemv8r64 = " \ # # Juno Machines # -SRC_URI:append:juno = " file://0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch \ - file://0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch \ - " +SRC_URI:append:juno = " file://0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch" #
Signature · 1 line
2.25.1
PATCH 2/3 arm-bsp/juno: update kernel patches for 6.1
Update kernel patches and configs for the v6.1 kernel. Previously, it was using the linux defconfig as a starting point. It is now using the local kernel metadata.
---
.../bsp/arm-platforms/juno.scc | 1 +
.../bsp/arm-platforms/juno/juno-board.cfg | 5 +-
.../bsp/arm-platforms/juno/juno-net.cfg | 1 +
.../bsp/arm-platforms/juno/juno-pci.cfg | 1 +
.../bsp/arm-platforms/juno/juno-sata.cfg | 1 -
.../bsp/arm-platforms/juno/juno-thermal.cfg | 3 +
...cache-properties-for-Arm-Ltd-platfo.patch} | 5 +-
...uno-Add-thermal-critical-trip-points.patch | 60 -------------------
...4-dts-fvp-Add-SPE-to-Foundation-FVP.patch} | 5 +-
...-information-about-L1-and-L2-caches.patch} | 5 +-
...-align-LED-node-names-with-dtschema.patch} | 5 +-
.../linux/linux-arm-platforms.inc | 13 ++--
12 files changed, 19 insertions(+), 86 deletions(-)
rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch => 0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch} (98%)
delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch
rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch => 0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch} (93%)
rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch => 0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch} (98%)
rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch => 0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch} (96%)meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc +1 -0
@@ -1,5 +1,6 @@ include features/input/input.scc include features/net/net.scc +include features/usb/usb-base.scc include features/bluetooth/bluetooth.scc include cfg/timer/no_hz.scc include cfg/usb-mass-storage.scc
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg +3 -2
@@ -13,7 +13,9 @@ CONFIG_MAILBOX=y CONFIG_ARM_MHU=y # SCMI support +CONFIG_HWMON=y CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y CONFIG_ARM_SCMI_POWER_DOMAIN=y CONFIG_SENSORS_ARM_SCMI=y CONFIG_COMMON_CLK_SCMI=y
@@ -28,7 +30,6 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y CONFIG_CPU_FREQ=y CONFIG_ARM_SCPI_CPUFREQ=y
@@ -38,4 +39,4 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CONNECTOR=y -CONFIG_ARM_TIMER_SP804=y +CONFIG_PRINTK_TIME=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg +1 -0
@@ -1,2 +1,3 @@ +CONFIG_NET_VENDOR_SMSC=y CONFIG_SMSC911X=y CONFIG_SMC91X=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg +1 -0
@@ -1,4 +1,5 @@ CONFIG_PCI=y +CONFIG_PCI_IOV=y CONFIG_PCI_MSI=y CONFIG_PCI_REALLOC_ENABLE_AUTO=y CONFIG_PCI_PRI=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg +0 -1
@@ -1,3 +1,2 @@ CONFIG_ATA=y CONFIG_SATA_SIL24=y -CONFIG_SKY2=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg +3 -0
@@ -1,4 +1,7 @@ CONFIG_THERMAL=y +CONFIG_THERMAL_OF=y +CONFIG_ENERGY_MODEL=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y
meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch renamed from meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch +1 -4
@@ -1,4 +1,4 @@ -From 59fb813f9742b349f48250bd7793279cafe2752c Mon Sep 17 00:00:00 2001 +From dc250cab31c6611cc7fa76bc8b2027dbd56dd65d Mon Sep 17 00:00:00 2001 From: Pierre Gondois <[email protected]> Date: Mon, 7 Nov 2022 16:56:58 +0100 Subject: [PATCH] arm64: dts: Update cache properties for Arm Ltd platforms
@@ -136,6 +136,3 @@ index 5b6d9d8e934d..796cd7d02eb5 100644 }; }; --- -2.30.2 -
meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch deleted +0 -60
60 lines not on this page · raw message
meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch renamed from meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch +1 -4
@@ -1,4 +1,4 @@ -From 3bd7a0219082c2c91570b81afc35f2aec57cade2 Mon Sep 17 00:00:00 2001 +From bd354219987dddbf8ab6fd11450b4046547aca1b Mon Sep 17 00:00:00 2001 From: James Clark <[email protected]> Date: Thu, 17 Nov 2022 10:25:36 +0000 Subject: [PATCH] arm64: dts: fvp: Add SPE to Foundation FVP
@@ -33,6 +33,3 @@ index c8bd23b1a7ba..029578072d8f 100644 watchdog@2a440000 { compatible = "arm,sbsa-gwdt"; reg = <0x0 0x2a440000 0 0x1000>, --- -2.30.2 -
meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch renamed from meta-arm-bsp/recipes-kernel/linux/files/juno/0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch +1 -4
@@ -1,4 +1,4 @@ -From b2d5025e129289d9b914c696646e64495a7453c0 Mon Sep 17 00:00:00 2001 +From 22e740d069e14875a64864bf86e0826a96560b44 Mon Sep 17 00:00:00 2001 From: Sudeep Holla <[email protected]> Date: Fri, 18 Nov 2022 15:10:17 +0000 Subject: [PATCH] arm64: dts: fvp: Add information about L1 and L2 caches
@@ -144,6 +144,3 @@ index 5f6f30c801a7..60472d65a355 100644 }; }; --- -2.30.2 -
meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch renamed from meta-arm-bsp/recipes-kernel/linux/files/juno/0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch +1 -4
@@ -1,4 +1,4 @@ -From e15031539490733279c41ba87f4ef2b440a685f5 Mon Sep 17 00:00:00 2001 +From 4edb625e2256d5761312110e34cbc0164915d772 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <[email protected]> Date: Fri, 25 Nov 2022 15:41:12 +0100 Subject: [PATCH] ARM: dts: vexpress: align LED node names with dtschema
@@ -79,6 +79,3 @@ index f434fe5cf4a1..def538ce8769 100644 label = "v2m:green:user8"; gpios = <&v2m_led_gpios 7 0>; linux,default-trigger = "cpu5"; --- -2.30.2 -
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +6 -7
@@ -97,15 +97,14 @@ SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/a # Juno KMACHINE # COMPATIBLE_MACHINE:juno = "juno" -KBUILD_DEFCONFIG:juno = "defconfig" -KCONFIG_MODE:juno = "--alldefconfig" +#KBUILD_DEFCONFIG:juno = "defconfig" +#KCONFIG_MODE:juno = "--alldefconfig" FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}" SRC_URI:append:juno = " \ - file://0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch \ - file://0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \ - file://0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \ - file://0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \ - file://0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \ + file://0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \ + file://0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \ + file://0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \ + file://0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \ " #
Signature · 1 line
2.25.1
PATCH 3/3 arm-bsp/fvp-base: update kernel config to remove warning
In reply to Jon MasonWith the 6.1 kernel, fvp-base logs the warning:
[NOTE]: 'CONFIG_ARM_CPUIDLE' last val (y) and .config val (n) do not match
This is because the kernel idle configs have changed. Remove this entry, as it is no longer necessary.
--- .../arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg | 1 - 1 file changed, 1 deletion(-)
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg +0 -1
@@ -8,4 +8,3 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y
Signature · 1 line
2.25.1