diff options
| author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
| commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
| tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-raspberrypi/recipes-bsp/bootfiles | |
| parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
| parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
| download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz | |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'meta-raspberrypi/recipes-bsp/bootfiles')
| -rw-r--r-- | meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb | 8 | ||||
| -rw-r--r-- | meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb | 8 |
2 files changed, 15 insertions, 1 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 |