mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-07-26 19:17:05 +00:00
arm-bsp/fvp-base-arm32: use correct DeviceTree
The 64-bit fvp-base machine uses the upstream fvp-base-recv devicetree, but fvp-base-arm32 was accidentally using the old fvp-base-gicv3-psci-custom that we patch into the kernel. As the only difference between these platforms at a "hardware" level is whether the cores boot in 32- or 64-bit mode, they should both use fvp-base-revc. This isn't trivial as devicetree files need to be under the correct arch/ directory, so we need to symlink into arch/arm the right files from arch/arm64. This has several improvements, but primarily virtio networking works so we can now use testimage with fvp-base-arm32. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -67,8 +67,14 @@ FILESEXTRAPATHS:prepend:fvp-base := "${ARMBSPFILESPATHS}"
|
||||
COMPATIBLE_MACHINE:fvp-base-arm32 = "fvp-base-arm32"
|
||||
KMACHINE:fvp-base-arm32 = "fvp-arm32"
|
||||
FILESEXTRAPATHS:prepend:fvp-base-arm32 := "${ARMBSPFILESPATHS}"
|
||||
SRC_URI:append:fvp-base-arm32 = " file://fvp-base-arm32-dts.patch \
|
||||
file://0001-ARM-vexpress-enable-GICv3.patch"
|
||||
SRC_URI:append:fvp-base-arm32 = " file://0001-ARM-vexpress-enable-GICv3.patch"
|
||||
# We want to use the DT in the arm64 tree but the kernel build doesn't like that, so symlink it
|
||||
do_compile:prepend:fvp-base-arm32() {
|
||||
mkdir --parents ${S}/arch/arm/boot/dts/arm
|
||||
for file in fvp-base-revc.dts rtsm_ve-motherboard.dtsi rtsm_ve-motherboard-rs2.dtsi; do
|
||||
ln -fsr ${S}/arch/arm64/boot/dts/arm/$file ${S}/arch/arm/boot/dts/arm
|
||||
done
|
||||
}
|
||||
|
||||
#
|
||||
# FVP BaseR AEMv8r64 Machine
|
||||
|
||||
Reference in New Issue
Block a user