From ad7fa35594a3fae494741eb1eedb30b3cef38b1f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 23 Jul 2021 12:55:23 -0400 Subject: meta-raspberrypi: subtree update:17b56ab075..8dc3a31088 Andrei Gherzan (1): rpi-cmdline: Make rootfstype easier to customize Martin Jansa (1): python3-adafruit-*: fix branch parameter Omer Akram (1): Update raspberrypi firmware to 20210527 Signed-off-by: Andrew Geissler Change-Id: I04fd1914fc163c98595bd66483db61e7710be7b0 --- meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb | 4 +++- meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc | 6 +++--- .../recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb | 2 +- .../python/python3-adafruit-circuitpython-busdevice_5.0.5.bb | 2 +- .../python/python3-adafruit-circuitpython-motor_3.2.6.bb | 2 +- .../python/python3-adafruit-circuitpython-motorkit_1.6.1.bb | 2 +- .../python/python3-adafruit-circuitpython-pca9685_3.3.4.bb | 2 +- .../python/python3-adafruit-circuitpython-register_1.9.4.bb | 2 +- .../python/python3-adafruit-platformdetect_3.1.1.bb | 2 +- .../recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) (limited to 'meta-raspberrypi') diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 13fe304a57..74550efd14 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -7,7 +7,9 @@ INHIBIT_DEFAULT_DEPS = "1" inherit deploy nopackages CMDLINE_DWC_OTG ?= "dwc_otg.lpm_enable=0" -CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" + +CMDLINE_ROOT_FSTYPE ?= "rootfstype=ext4" +CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait" CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 6358fba4f5..891bd1ac32 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 ?= "20210421" -SRCREV ?= "2ac4de4eaac5c1d1b25acec4a5e0a9fdb16f0c91" +RPIFW_DATE ?= "20210527" +SRCREV ?= "1eb8921ae7158249894f89e8bb6c4bfb04ec7377" 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] = "c687aa1b5127a8dc0773e8aefb1f009f24bf71ccb4c9e8b40a1d46cbbb7bee0c" +SRC_URI[sha256sum] = "32fb5cc72703247622839c3cb4df2f369f91d2185770df867ac9758283bf5380" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb index 7d3120f76d..dc9e6802b3 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_Blinka" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=660e614bc7efb0697cc793d8a22a55c2" -SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git" +SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git;branch=main" SRCREV = "dc688f354fe779c9267c208b99f310af87e79272" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb index c14d6f3d65..7c1a26742e 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git;branch=main" SRCREV = "1bfe8005293205e2f7b2cc498ab5a946f1133b40" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb index e05e2ab5e1..b0475e6efd 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Motor" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b72678307cc7c10910b5ef460216af07" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git;branch=main" SRCREV = "2251bfc0501d0acfb96c0a43f4f2b4c6a10ca14e" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb index f35d48cf26..12a63f3a59 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_MotorKit" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad4a8854b39ad474755ef1aea813bac" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git;branch=main" SRCREV = "8c1462b4129b21f6db156d1517abb017bb74b982" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb index 0b65c81ea1..a46b13044c 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_PCA9685" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7eb6b599fb0cfb06485c64cd4242f62" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git;branch=main" SRCREV = "2780c4102f4c23fbab252aa1198b61ba7e2d1b2c" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb index f1af80bea7..7d0377b49d 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Register" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git;branch=main" S = "${WORKDIR}/git" SRCREV = "5fee6e0c3878110844bc51e16063eeae7d94c457" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb index 4454d247d7..0574c532a5 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_Python_PlatformDetect" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c" -SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git" +SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git;branch=main" SRCREV = "e0fe1b012898fa824944d6805ca74be0fa027968" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb index 82415f9548..a59e6f5738 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_Python_PureIO" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009" -SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git" +SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git;branch=main" SRCREV = "f4d0973da05b8b21905ff6bab69cdb652128f342" S = "${WORKDIR}/git" -- cgit v1.2.3