diff options
Diffstat (limited to 'meta-arm/meta-arm-bsp')
18 files changed, 47 insertions, 182 deletions
diff --git a/meta-arm/meta-arm-bsp/conf/machine/juno.conf b/meta-arm/meta-arm-bsp/conf/machine/juno.conf index 4a86d4e267..43d6b3e331 100644 --- a/meta-arm/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm/meta-arm-bsp/conf/machine/juno.conf @@ -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" diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch deleted file mode 100644 index a6838390c7..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 13dde05efae99c5261ed213108087d0f7ac9581e Mon Sep 17 00:00:00 2001 -From: Damodar Santhapuri <damodar.santhapuri@arm.com> -Date: Thu, 5 Nov 2020 22:40:48 +0530 -Subject: [PATCH] arm: juno: add custom bootcmd to autoboot from uEnv.txt file - -enable autoboot support with custom bootcmd loads uEnv.txt -from NOR to DRAM and import. - -Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com> -Upstream-Status: Pending ---- - include/configs/vexpress_aemv8.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h -index f0c5ceb3849a..cd7f6c1b9ba0 100644 ---- a/include/configs/vexpress_aemv8.h -+++ b/include/configs/vexpress_aemv8.h -@@ -137,13 +137,13 @@ - " afs load ${fdt_alt_name} ${fdt_addr_r}; "\ - "fi ; "\ - "fdt addr ${fdt_addr_r}; fdt resize; " \ -- "if afs load ${ramdisk_name} ${ramdisk_addr_r} ; "\ -+ "if afs load ${initrd_name} ${initrd_addr_r} ; "\ - "then "\ -- " setenv ramdisk_param ${ramdisk_addr_r}; "\ -+ " setenv initrd_param ${initrd_addr_r}; "\ - "else "\ -- " setenv ramdisk_param -; "\ -+ " setenv initrd_param -; "\ - "fi ; " \ -- "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}\0" -+ "booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}" - #define BOOTENV_DEV_NAME_AFS(devtypeu, devtypel, instance) "afs " - - #define BOOT_TARGET_DEVICES(func) \ -@@ -164,8 +164,8 @@ - "kernel_name=norkern\0" \ - "kernel_alt_name=Image\0" \ - "kernel_addr_r=0x80080000\0" \ -- "ramdisk_name=ramdisk.img\0" \ -- "ramdisk_addr_r=0x88000000\0" \ -+ "initrd_name=ramdisk.img\0" \ -+ "initrd_addr_r=0x88000000\0" \ - "fdtfile=board.dtb\0" \ - "fdt_alt_name=juno\0" \ - "fdt_addr_r=0x80000000\0" \ --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch new file mode 100644 index 0000000000..0967df76dd --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch @@ -0,0 +1,27 @@ +From 726f8b4dbd3c5b1873aad531d5e26af3acd9b9ca Mon Sep 17 00:00:00 2001 +From: Jon Mason <jdmason@kudzu.us> +Date: Mon, 19 Dec 2022 11:36:04 -0500 +Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs + +Signed-off-by: Jon Mason <jdmason@kudzu.us> +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" diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch deleted file mode 100644 index 2bf68fe6dc..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 097a43223da4fa42335944295903ede2755e2dfd Mon Sep 17 00:00:00 2001 -From: Jon Mason <jdmason@kudzu.us> -Date: Mon, 19 Dec 2022 11:36:04 -0500 -Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs - -Signed-off-by: Jon Mason <jdmason@kudzu.us> -Upstream-Status: Inappropriate - ---- - configs/vexpress_aemv8a_juno_defconfig | 1 + - include/configs/vexpress_aemv8.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig -index e02124cc7f54..6ffe8f5fe67e 100644 ---- a/configs/vexpress_aemv8a_juno_defconfig -+++ b/configs/vexpress_aemv8a_juno_defconfig -@@ -16,6 +16,7 @@ CONFIG_SYS_LOAD_ADDR=0x90000000 - CONFIG_BOOTDELAY=1 - CONFIG_USE_BOOTARGS=y - CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/sda2 rw rootwait earlycon=pl011,0x7ff80000 debug user_debug=31 androidboot.hardware=juno loglevel=9" -+CONFIG_BOOTCOMMAND="echo running default boot command; afs load ${kernel_name} ${kernel_addr_r} ; if test $? -eq 1; then echo Loading ${kernel_alt_name} instead of ${kernel_name}; afs load ${kernel_alt_name} ${kernel_addr_r};fi ; afs load ${fdtfile} ${fdt_addr_r} ; if test $? -eq 1; then echo Loading ${fdt_alt_name} instead of ${fdtfile}; afs load ${fdt_alt_name} ${fdt_addr_r}; fi ; fdt addr ${fdt_addr_r}; fdt resize; if afs load ${initrd_name} ${initrd_addr_r} ; then setenv initrd_param ${initrd_addr_r}; else setenv initrd_param -; fi ; booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}" - # CONFIG_DISPLAY_CPUINFO is not set - # CONFIG_DISPLAY_BOARDINFO is not set - CONFIG_SYS_PROMPT="VExpress64# " -diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h -index cd7f6c1b9ba0..c2f5eb302076 100644 ---- a/include/configs/vexpress_aemv8.h -+++ b/include/configs/vexpress_aemv8.h -@@ -164,6 +164,8 @@ - "kernel_name=norkern\0" \ - "kernel_alt_name=Image\0" \ - "kernel_addr_r=0x80080000\0" \ -+ "kernel_comp_addr_r=0x90000000\0" \ -+ "kernel_comp_size=0x3000000\0" \ - "initrd_name=ramdisk.img\0" \ - "initrd_addr_r=0x88000000\0" \ - "fdtfile=board.dtb\0" \ --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index f26ab4a648..b89ea872c7 100644 --- a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -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" # diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg index 2fd0264a27..a9ee80e11a 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg @@ -8,4 +8,3 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc index 240ecf5e48..a167d2254d 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc @@ -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 diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg index 654efa4520..2d7ad8c475 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg @@ -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 diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg index 54e3686d37..20cc408f39 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg @@ -1,2 +1,3 @@ +CONFIG_NET_VENDOR_SMSC=y CONFIG_SMSC911X=y CONFIG_SMC91X=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg index 295d190d19..ec919e39a2 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg @@ -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 diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg index a159af8f98..179d7b8f95 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg @@ -1,3 +1,2 @@ CONFIG_ATA=y CONFIG_SATA_SIL24=y -CONFIG_SKY2=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg index 6241374a64..f4d220e0de 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg @@ -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 diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch index f19fb8b9e2..329c939fb6 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch @@ -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 <pierre.gondois@arm.com> 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 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch deleted file mode 100644 index 1c0f25eba1..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c4a7b9b587ca1bb4678d48d8be7132492b23a81c Mon Sep 17 00:00:00 2001 -From: Cristian Marussi <cristian.marussi@arm.com> -Date: Fri, 28 Oct 2022 15:08:33 +0100 -Subject: [PATCH] arm64: dts: juno: Add thermal critical trip points - -When thermnal zones are defined, trip points definitions are mandatory. -Define a couple of critical trip points for monitoring of existing -PMIC and SOC thermal zones. - -This was lost between txt to yaml conversion and was re-enforced recently -via the commit 8c596324232d ("dt-bindings: thermal: Fix missing required property") - -Cc: Rob Herring <robh+dt@kernel.org> -Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> -Cc: devicetree@vger.kernel.org -Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> -Fixes: f7b636a8d83c ("arm64: dts: juno: add thermal zones for scpi sensors") -Link: https://lore.kernel.org/r/20221028140833.280091-8-cristian.marussi@arm.com -Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> - -Signed-off-by: Jon Mason <jon.mason@arm.com> -Upstream-Status: Backport ---- - arch/arm64/boot/dts/arm/juno-base.dtsi | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi -index 2f27619d8abd..8b4d280b1e7e 100644 ---- a/arch/arm64/boot/dts/arm/juno-base.dtsi -+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi -@@ -751,12 +751,26 @@ pmic { - polling-delay = <1000>; - polling-delay-passive = <100>; - thermal-sensors = <&scpi_sensors0 0>; -+ trips { -+ pmic_crit0: trip0 { -+ temperature = <90000>; -+ hysteresis = <2000>; -+ type = "critical"; -+ }; -+ }; - }; - - soc { - polling-delay = <1000>; - polling-delay-passive = <100>; - thermal-sensors = <&scpi_sensors0 3>; -+ trips { -+ soc_crit0: trip0 { -+ temperature = <80000>; -+ hysteresis = <2000>; -+ type = "critical"; -+ }; -+ }; - }; - - big_cluster_thermal_zone: big-cluster { --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch index 34dd025189..4495f397bd 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch @@ -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 <james.clark@arm.com> 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 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch index 72f7161fee..fc02751004 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch @@ -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 <sudeep.holla@arm.com> 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 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch index c551250869..e3828ec96a 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch @@ -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 <krzysztof.kozlowski@linaro.org> 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 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 4f9bcfdf57..e2a36c9b60 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -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 \ " # |