diff options
Diffstat (limited to 'meta-raspberrypi')
4 files changed, 21 insertions, 7 deletions
diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 74550efd1..50c2b5318 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -29,6 +29,13 @@ CMDLINE_LOGO ?= '${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nol # to enable kernel debugging. CMDLINE_DEBUG ?= "" +# Add RNDIS capabilities (must be after rootwait) +# example: +# CMDLINE_RNDIS = "modules-load=dwc2,g_ether g_ether.host_addr=<some MAC +# address> g_ether.dev_addr=<some MAC address>" +# if the MAC addresses are omitted, random values will be used +CMDLINE_RNDIS ?= "" + CMDLINE = " \ ${CMDLINE_DWC_OTG} \ ${CMDLINE_SERIAL} \ @@ -38,6 +45,7 @@ CMDLINE = " \ ${CMDLINE_LOGO} \ ${CMDLINE_PITFT} \ ${CMDLINE_DEBUG} \ + ${CMDLINE_RNDIS} \ " do_compile() { diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb index 583144d05..657123faa 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb @@ -215,7 +215,7 @@ do_deploy() { fi # DWC2 USB peripheral support - if [ "${ENABLE_DWC2_PERIPHERAL}" = "1" ]; then + if ([ "${ENABLE_DWC2_PERIPHERAL}" = "1" ] && [ "${ENABLE_DWC2_OTG}" != "1" ]); then echo "# Enable USB peripheral mode" >> $CONFIG echo "dtoverlay=dwc2,dr_mode=peripheral" >> $CONFIG fi @@ -225,6 +225,12 @@ do_deploy() { echo "# Enable USB host mode" >> $CONFIG echo "dtoverlay=dwc2,dr_mode=host" >> $CONFIG fi + + # DWC2 USB OTG support + if ([ "${ENABLE_DWC2_OTG}" = "1" ] && [ "${ENABLE_DWC2_PERIPHERAL}" != "1" ]); then + echo "# Enable USB OTG mode" >> $CONFIG + echo "dtoverlay=dwc2,dr_mode=otg" >> $CONFIG + fi # AT86RF23X support if [ "${ENABLE_AT86RF}" = "1" ]; then diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 8a2a6e117..3dcfb9d8b 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 ?= "20210819" -SRCREV ?= "25e2b597ebfb2495eab4816a276758dcc6ea21f1" +RPIFW_DATE ?= "20210914" +SRCREV ?= "d5d14f484cec739901a088a58eed62452b6dadeb" 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] = "abecc797c057ae57663eb54f2f0f5af79fb317bf873d2b3345f333848a5da3ee" +SRC_URI[sha256sum] = "f5b3d9fa60afbc103b00bc7f5899ea49ef61d353b88624b42dbf7669446a44ac" 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 e8aa8789a..347c72669 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,9 +1,9 @@ -LINUX_VERSION ?= "5.10.59" +LINUX_VERSION ?= "5.10.63" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "7f4de43d1e8f06f63697c7b571b509348fb29642" -SRCREV_meta = "e44a7f9801f8fc6b670bf121038d912257a83d7e" +SRCREV_machine = "4117cba235d24a7c4630dc38cb55cc80a04f5cf3" +SRCREV_meta = "e0147386e9f3c4cabc6f6d256d457fd4e67eb221" KMETA = "kernel-meta" |