From: Jan Kiszka <[email protected]> Finally, the retirement of the downstream fork. A little bit of tuning is still needed, though:
- alias for uart1 so that TF-A continue to provide output - aliases for mmc0/mmc1 to ensure stable topology (--use-uuid does not help as wic has no knowledge of the RPi bootloader) Both changes are applied as DT overlay to avoid patches. The RPi firmware needs an update as well. In the config.txt, we can now drop enable_gic=1 as this is default. Signed-off-by: Jan Kiszka <[email protected]> --- conf/machine/rpi4.conf | 2 -- .../rpi-firmware/files/debian/aliases.dts | 30 +++++++++++++++++++ .../rpi-firmware/files/debian/cmdline.txt | 2 +- .../rpi-firmware/files/debian/config.txt | 2 +- .../rpi-firmware/files/debian/jailhouse.dts | 13 +++++++- .../files/debian/rpi-firmware.install | 1 + recipes-bsp/rpi-firmware/files/rules | 1 + ...20200819.bb => rpi-firmware_1.20210303.bb} | 2 +- .../linux/linux-jailhouse-rpi_5.4.59.bb | 15 ---------- recipes-kernel/linux/linux-jailhouse_5.4.inc | 23 -------------- 10 files changed, 47 insertions(+), 44 deletions(-) create mode 100644 recipes-bsp/rpi-firmware/files/debian/aliases.dts rename recipes-bsp/rpi-firmware/{rpi-firmware_1.20200819.bb => rpi-firmware_1.20210303.bb} (86%) delete mode 100644 recipes-kernel/linux/linux-jailhouse-rpi_5.4.59.bb delete mode 100644 recipes-kernel/linux/linux-jailhouse_5.4.inc diff --git a/conf/machine/rpi4.conf b/conf/machine/rpi4.conf index b26effa..e8985e8 100644 --- a/conf/machine/rpi4.conf +++ b/conf/machine/rpi4.conf @@ -30,7 +30,5 @@ IMAGE_BOOT_FILES = " \ /vmlinuz;kernel8.img \ " -KERNEL_NAME ?= "jailhouse-rpi" - IMAGE_PREINSTALL_append = " firmware-brcm80211" IMAGE_INSTALL_append = " rpi-firmware-brcm80211" diff --git a/recipes-bsp/rpi-firmware/files/debian/aliases.dts b/recipes-bsp/rpi-firmware/files/debian/aliases.dts new file mode 100644 index 0000000..857bb96 --- /dev/null +++ b/recipes-bsp/rpi-firmware/files/debian/aliases.dts @@ -0,0 +1,30 @@ +/* + * Jailhouse, a Linux-based partitioning hypervisor + * + * Copyright (c) Siemens AG, 2021 + * + * Authors: + * Jan Kiszka <[email protected]> + * + * SPDX-License-Identifier: MIT + */ + +/dts-v1/; +/plugin/; +/ { + compatible = "brcm,bcm2835"; + + fragment@0 { + target-path = "/"; + __overlay__ { + aliases { + /* Needed to enable UART1 for use by TF-A */ + uart1 = "/soc/serial@7e215040"; + + /* Ensure stable /dev/mmcblk0 assignment */ + mmc0 = "/emmc2bus/emmc2@7e340000"; + mmc1 = "/soc/sdhci@7e300000"; + }; + }; + }; +}; diff --git a/recipes-bsp/rpi-firmware/files/debian/cmdline.txt b/recipes-bsp/rpi-firmware/files/debian/cmdline.txt index cafe0e1..9d72941 100644 --- a/recipes-bsp/rpi-firmware/files/debian/cmdline.txt +++ b/recipes-bsp/rpi-firmware/files/debian/cmdline.txt @@ -1 +1 @@ -console=serial0,115200 root=/dev/mmcblk0p2 rootwait +console=ttyS1,115200 root=/dev/mmcblk0p2 rootwait diff --git a/recipes-bsp/rpi-firmware/files/debian/config.txt b/recipes-bsp/rpi-firmware/files/debian/config.txt index b41ef6f..f72db53 100644 --- a/recipes-bsp/rpi-firmware/files/debian/config.txt +++ b/recipes-bsp/rpi-firmware/files/debian/config.txt @@ -7,6 +7,6 @@ max_framebuffers=2 [all] enable_uart=1 arm_64bit=1 -enable_gic=1 armstub=bl31.bin +dtoverlay=aliases dtoverlay=jailhouse diff --git a/recipes-bsp/rpi-firmware/files/debian/jailhouse.dts b/recipes-bsp/rpi-firmware/files/debian/jailhouse.dts index b51163e..7ee9336 100644 --- a/recipes-bsp/rpi-firmware/files/debian/jailhouse.dts +++ b/recipes-bsp/rpi-firmware/files/debian/jailhouse.dts @@ -1,3 +1,14 @@ +/* + * Jailhouse, a Linux-based partitioning hypervisor + * + * Copyright (c) Siemens AG, 2020-2021 + * + * Authors: + * Jan Kiszka <[email protected]> + * + * SPDX-License-Identifier: MIT + */ + /dts-v1/; /plugin/; / { @@ -20,7 +31,7 @@ }; fragment@1 { - target = <&pcie0>; + target-path = "/scb/pcie@7d500000"; __overlay__ { linux,pci-domain = <0x00000000>; }; diff --git a/recipes-bsp/rpi-firmware/files/debian/rpi-firmware.install b/recipes-bsp/rpi-firmware/files/debian/rpi-firmware.install index dba3266..9de5c71 100644 --- a/recipes-bsp/rpi-firmware/files/debian/rpi-firmware.install +++ b/recipes-bsp/rpi-firmware/files/debian/rpi-firmware.install @@ -4,6 +4,7 @@ boot/*.dat usr/lib/rpi-firmware/ boot/*.dtb usr/lib/rpi-firmware/ boot/*.elf usr/lib/rpi-firmware/ boot/overlays/README usr/lib/rpi-firmware/overlays/ +boot/overlays/aliases.dtbo usr/lib/rpi-firmware/overlays/ boot/overlays/jailhouse.dtbo usr/lib/rpi-firmware/overlays/ debian/cmdline.txt usr/lib/rpi-firmware/ debian/config.txt usr/lib/rpi-firmware/ diff --git a/recipes-bsp/rpi-firmware/files/rules b/recipes-bsp/rpi-firmware/files/rules index 8d60529..286b525 100644 --- a/recipes-bsp/rpi-firmware/files/rules +++ b/recipes-bsp/rpi-firmware/files/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f override_dh_auto_build: + dtc -O dtb -b 0 -@ debian/aliases.dts -o boot/overlays/aliases.dtbo dtc -O dtb -b 0 -@ debian/jailhouse.dts -o boot/overlays/jailhouse.dtbo %: diff --git a/recipes-bsp/rpi-firmware/rpi-firmware_1.20200819.bb b/recipes-bsp/rpi-firmware/rpi-firmware_1.20210303.bb similarity index 86% rename from recipes-bsp/rpi-firmware/rpi-firmware_1.20200819.bb rename to recipes-bsp/rpi-firmware/rpi-firmware_1.20210303.bb index 67b92a5..ed678be 100644 --- a/recipes-bsp/rpi-firmware/rpi-firmware_1.20200819.bb +++ b/recipes-bsp/rpi-firmware/rpi-firmware_1.20210303.bb @@ -15,7 +15,7 @@ SRC_URI = " \ https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz \ file://debian \ file://rules" -SRC_URI[sha256sum] = "661e4c2c33ef9354da50ff2f679b697ea94d2d820166cde749692133e3461c34" +SRC_URI[sha256sum] = "9b57137c602ecb0d05de6c530c5e5e77d0ad2cb3ffe43e98db81cd44b046de85" S = "${WORKDIR}/firmware-${PV}" diff --git a/recipes-kernel/linux/linux-jailhouse-rpi_5.4.59.bb b/recipes-kernel/linux/linux-jailhouse-rpi_5.4.59.bb deleted file mode 100644 index a8b296e..0000000 --- a/recipes-kernel/linux/linux-jailhouse-rpi_5.4.59.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Jailhouse, a Linux-based partitioning hypervisor -# -# Copyright (c) Siemens AG, 2020 -# -# Authors: -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -require recipes-kernel/linux/linux-jailhouse_5.4.inc - -SRC_URI[sha256sum] = "dc9719a70743bf98057eb1a4d1e40a2cbed9ea08fc752a1a1ddb0285d23a2ede" -SRCREV = "108bab72978d4ec29ef6ac32506eb1783af599a2" diff --git a/recipes-kernel/linux/linux-jailhouse_5.4.inc b/recipes-kernel/linux/linux-jailhouse_5.4.inc deleted file mode 100644 index c56e1c0..0000000 --- a/recipes-kernel/linux/linux-jailhouse_5.4.inc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Jailhouse, a Linux-based partitioning hypervisor -# -# Copyright (c) Siemens AG, 2018-2020 -# -# Authors: -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -require recipes-kernel/linux/linux-custom.inc - -KERNEL_DEFCONFIG = "${DISTRO_ARCH}_defconfig_5.4" -KERNEL_DEFCONFIG_rpi4 = "rpi4_defconfig_5.4" - -SRC_URI += " \ - https://github.com/siemens/linux/archive/${SRCREV}.tar.gz;downloadfilename=linux-${SRCREV}.tar.gz \ - file://${KERNEL_DEFCONFIG}" - -S = "${WORKDIR}/linux-${SRCREV}" - -KBUILD_DEPENDS += "liblz4-tool" -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/c048a8d6024cba5caf1009ae168242d6e39ca6ba.1618866389.git.jan.kiszka%40siemens.com.
