From bd39bf61761e73b494e69f07ae975547e8ac771e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 31 Mar 2021 13:35:44 -0500 Subject: meta-raspberrypi: subtree update:853ccd7440..d1f191ed30 Khem Raj (3): layer.conf: Drop gatesgarth and add honister to LAYERSERIES_COMPAT gitignore: Ignore .pyc files tune-arm1176jzf-s.inc: Rework to match oe-core Mike Looijmans (3): raspberrypi-firmware: Update to 2021-02-25 linux-raspberrypi: Upgrade to 5.10.17 rpi-base: Add missing overlay_map.dtb and vc4-kms-v3d-pi4.dtbo Signed-off-by: Andrew Geissler Change-Id: Ic9ac546a343a39b164b8322a310265e118d79ea6 --- meta-raspberrypi/.gitignore | 1 + meta-raspberrypi/conf/layer.conf | 2 +- meta-raspberrypi/conf/machine/include/rpi-base.inc | 14 ++++++++------ .../conf/machine/include/tune-arm1176jzf-s.inc | 18 ++++++++++-------- .../recipes-bsp/common/raspberrypi-firmware.inc | 6 +++--- .../recipes-kernel/linux/linux-raspberrypi_5.10.bb | 4 ++-- 6 files changed, 25 insertions(+), 20 deletions(-) (limited to 'meta-raspberrypi') diff --git a/meta-raspberrypi/.gitignore b/meta-raspberrypi/.gitignore index 073cf0615..d8d50e0e7 100644 --- a/meta-raspberrypi/.gitignore +++ b/meta-raspberrypi/.gitignore @@ -6,3 +6,4 @@ build* *.log docs/_build /layers +*.pyc diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index aa3174a38..0f081960b 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "gatesgarth hardknott" +LAYERSERIES_COMPAT_raspberrypi = "hardknott honister" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 8b33a0fb7..572fe2241 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -15,6 +15,7 @@ XSERVER = " \ " RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ + overlays/overlay_map.dtb \ overlays/at86rf233.dtbo \ overlays/disable-bt.dtbo \ overlays/dwc2.dtbo \ @@ -44,6 +45,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/rpi-poe.dtbo \ overlays/vc4-fkms-v3d.dtbo \ overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-kms-v3d-pi4.dtbo \ overlays/vc4-kms-dsi-7inch.dtbo \ overlays/w1-gpio.dtbo \ overlays/w1-gpio-pullup.dtbo \ @@ -110,17 +112,17 @@ def make_dtb_boot_files(d): def transform(dtb): base = os.path.basename(dtb) - if dtb.endswith('dtb'): - # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: bcm2708-rpi-b.dtb - # destination: bcm2708-rpi-b.dtb - return base - elif dtb.endswith('dtbo'): + if dtb.endswith('dtbo') or base == 'overlay_map.dtb': # overlay dtb: # eg: overlays/hifiberry-amp.dtbo has: # DEPLOYDIR file: hifiberry-amp.dtbo # destination: overlays/hifiberry-amp.dtbo return '{};{}'.format(base, dtb) + elif dtb.endswith('dtb'): + # eg: whatever/bcm2708-rpi-b.dtb has: + # DEPLOYDIR file: bcm2708-rpi-b.dtb + # destination: bcm2708-rpi-b.dtb + return base return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) diff --git a/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc b/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc index b6fcc59cc..b9e0377fd 100644 --- a/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc +++ b/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc @@ -1,15 +1,17 @@ -DEFAULTTUNE ?= "armv6" +DEFAULTTUNE ?= "arm1176jzfshf" require conf/machine/include/arm/arch-armv6.inc TUNEVALID[arm1176jzfs] = "Enable arm1176jzfs specific processor optimizations" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzfs", "-mtune=arm1176jzf-s", "", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "vfp", "-mfpu=vfp", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', ' -mcpu=arm1176jzf-s', '', d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" -AVAILTUNES += "arm1176jzfs arm1176jzfshf" +AVAILTUNES += "arm1176jzfs" ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" -ARMPKGARCH_tune-arm1176jzfshf = "arm1176jzfs" -TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs" +TUNE_FEATURES_tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1176jzfs" + +AVAILTUNES += "arm1176jzfshf" +ARMPKGARCH_tune-arm1176jzfshf = "${ARMPKGARCH_tune-arm1176jzfs}" TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1176jzfshf-vfp" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} arm1176jzfshf-vfp" diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 591c6157f..5cebd7c3a 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20210205" -SRCREV ?= "7d91570f20378afc9414107dccdad70705a8a342" +RPIFW_DATE ?= "20210225" +SRCREV ?= "5985247fb75681985547641d66196c77499f26b9" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-firmware-${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "2cc9bf2cbcab8283db2eb53ed2a49372b70fe76538994c32f6d261e2da3e9ff4" +SRC_URI[sha256sum] = "3e2c00e1473bd70e808134925e1b25cd765789d9f0e0683749135b124d835000" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb index 6af434e07..56c7621d4 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,7 +1,7 @@ -LINUX_VERSION ?= "5.10.13" +LINUX_VERSION ?= "5.10.17" LINUX_RPI_BRANCH ?= "rpi-5.10.y" -SRCREV_machine = "34263dc81a12862c66e2593bb26c09d5fd20f46d" +SRCREV_machine = "ec967eb45f8d4ed59bebafb5748da38118383be7" SRCREV_meta = "5833ca701711d487c9094bd1efc671e8ef7d001e" KMETA = "kernel-meta" -- cgit v1.2.3