diff options
Diffstat (limited to 'meta-raspberrypi')
10 files changed, 18 insertions, 95 deletions
diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index 9488ac9380..deea4a1a89 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -11,6 +11,9 @@ BBFILE_PRIORITY_raspberrypi = "9" LAYERSERIES_COMPAT_raspberrypi = "nanbield scarthgap" LAYERDEPENDS_raspberrypi = "core" +# Recommended for u-boot support for raspberrypi5 +# https://git.yoctoproject.org/meta-lts-mixins 'scarthgap/u-boot' branch +LAYERRECOMMENDS_raspberrypi = "lts-u-boot-mixin" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" diff --git a/meta-raspberrypi/conf/machine/raspberrypi5.conf b/meta-raspberrypi/conf/machine/raspberrypi5.conf index 8c38637a2a..03f15c35fb 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi5.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi5.conf @@ -22,5 +22,11 @@ SERIAL_CONSOLES ?= "115200;ttyAMA10" VC4DTBO ?= "vc4-kms-v3d" +# When u-boot is enabled we need to use the "Image" format and the "booti" +# command to load the kernel +KERNEL_IMAGETYPE_UBOOT ?= "Image" # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet KERNEL_IMAGETYPE_DIRECT ?= "Image" +KERNEL_BOOTCMD ?= "booti" + +UBOOT_MACHINE = "rpi_arm64_config" diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index a22f50d643..461934b9e4 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -46,6 +46,9 @@ CMDLINE_ISOL_CPUS ?= "${@setup_isolcpus(d)}" # if the MAC addresses are omitted, random values will be used CMDLINE_RNDIS ?= "" +# That allows to keep the traditional network interface names +CMDLINE_IFNAMES ?= "net.ifnames=0" + CMDLINE = " \ ${CMDLINE_ISOL_CPUS} \ ${CMDLINE_DWC_OTG} \ @@ -57,6 +60,7 @@ CMDLINE = " \ ${CMDLINE_PITFT} \ ${CMDLINE_DEBUG} \ ${CMDLINE_RNDIS} \ + ${CMDLINE_IFNAMES} \ " do_compile() { diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index 78b3e484aa..e50acf5fb3 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -12,6 +12,3 @@ do_install:append:rpi () { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } - -# Temporary avoid Raspberry Pi 5 because U-Boot has not been ported yet -COMPATIBLE_MACHINE:raspberrypi5 = "(-)" diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index 959513dcac..1b4305820e 100644 --- a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -34,6 +34,7 @@ do_install() { for fw in \ brcmfmac43430-sdio \ + brcmfmac43430b0-sdio \ brcmfmac43436-sdio \ brcmfmac43436s-sdio \ brcmfmac43455-sdio \ @@ -69,7 +70,10 @@ FILES:${PN}-bcm43430 = " \ ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin \ ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob \ " -FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*" +FILES:${PN}-bcm43436 = " \ + ${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-* \ + ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430b0-* \ +" FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*" FILES:${PN}-bcm43439 = " \ ${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined \ diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch deleted file mode 100644 index 4f6468761c..0000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 32f53700aeef2f5c7797ddda66348fc0b29e1047 Mon Sep 17 00:00:00 2001 -From: Kees Cook <keescook@chromium.org> -Date: Wed, 18 Jan 2023 12:21:35 -0800 -Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13 - -The gimple-iterator.h header must be included before gimple-fold.h -starting with GCC 13. Reorganize gimple headers to work for all GCC -versions. - -Reported-by: Palmer Dabbelt <palmer@rivosinc.com> -Acked-by: Palmer Dabbelt <palmer@rivosinc.com> -Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/ -Cc: linux-hardening@vger.kernel.org -Signed-off-by: Kees Cook <keescook@chromium.org> ---- -Upstream-Status: Pending - - scripts/gcc-plugins/gcc-common.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h -index 0c087614fc3e..27770c31214c 100644 ---- a/scripts/gcc-plugins/gcc-common.h -+++ b/scripts/gcc-plugins/gcc-common.h -@@ -77,8 +77,10 @@ - #include "varasm.h" - #include "stor-layout.h" - #include "internal-fn.h" -+#include "gimple.h" - #include "gimple-expr.h" - #include "gimple-fold.h" -+#include "gimple-iterator.h" - #include "context.h" - #include "tree-ssa-alias.h" - #include "tree-ssa.h" -@@ -91,11 +93,9 @@ - #include "tree-eh.h" - #include "stmt.h" - #include "gimplify.h" --#include "gimple.h" - #include "tree-ssa-operands.h" - #include "tree-phinodes.h" - #include "tree-cfg.h" --#include "gimple-iterator.h" - #include "gimple-ssa.h" - #include "ssa-iterators.h" - --- -2.39.1 - diff --git a/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg b/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg deleted file mode 100644 index fd97ed71f1..0000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# see emmc node -CONFIG_MMC_SDHCI_IPROC=y diff --git a/meta-raspberrypi/recipes-kernel/linux/files/rpi.scc b/meta-raspberrypi/recipes-kernel/linux/files/rpi.scc deleted file mode 100644 index bb6fffd978..0000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/rpi.scc +++ /dev/null @@ -1 +0,0 @@ -patch 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb deleted file mode 100644 index 788398514f..0000000000 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com> -# -# SPDX-License-Identifier: MIT - -require linux-raspberrypi-v7.inc -require linux-raspberrypi_5.15.bb diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb deleted file mode 100644 index 3f167bb29d..0000000000 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb +++ /dev/null @@ -1,32 +0,0 @@ -LINUX_VERSION ?= "5.15.92" -LINUX_RPI_BRANCH ?= "rpi-5.15.y" -LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15" - -SRCREV_machine = "14b35093ca68bf2c81bbc90aace5007142b40b40" -SRCREV_meta = "509f4b9d68337f103633d48b621c1c9aa0dc975d" - -KMETA = "kernel-meta" - -SRC_URI = " \ - git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \ - file://rpi.scc \ - file://powersave.cfg \ - file://android-drivers.cfg \ - " - -require linux-raspberrypi.inc - -KERNEL_DTC_FLAGS += "-@ -H epapr" - -RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base" -RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image" -RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev" -RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux" -RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules" -RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg" - -DEPLOYDEP = "" -DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy" -do_deploy[depends] += "${DEPLOYDEP}" |