diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-raspberrypi/recipes-bsp | |
parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-raspberrypi/recipes-bsp')
3 files changed, 18 insertions, 4 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}" |