From 78f003fca7c5f9c3e7ffa432aeb6942940b5a6f3 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Wed, 23 Feb 2022 16:03:29 +0100 Subject: [PATCH] Revert CM4 USB controller back to dwc2 SDXC controller was not playing nice with rpiboot. --- embedded/build.sh | 1 + embedded/imager/board/kernel_config_fragment_imager | 8 ++++++++ embedded/imager/configs/rpi-imager_defconfig | 2 +- embedded/output/config.txt | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/embedded/build.sh b/embedded/build.sh index 3b1de03..80ff4cb 100755 --- a/embedded/build.sh +++ b/embedded/build.sh @@ -35,6 +35,7 @@ touch output/bootcode.bin mkdir -p output/overlays +mv -f output/dwc2-overlay.dtb output/overlays/dwc2.dtbo mv -f output/vc4-fkms-v3d-pi4-overlay.dtb output/overlays/vc4-fkms-v3d-pi4.dtbo mv -f output/vc4-kms-v3d-pi4-overlay.dtb output/overlays/vc4-kms-v3d-pi4.dtbo mv -f output/disable-bt-overlay.dtb output/overlays/disable-bt.dtbo diff --git a/embedded/imager/board/kernel_config_fragment_imager b/embedded/imager/board/kernel_config_fragment_imager index b2db35d..831fe1b 100644 --- a/embedded/imager/board/kernel_config_fragment_imager +++ b/embedded/imager/board/kernel_config_fragment_imager @@ -69,6 +69,14 @@ CONFIG_NFS_FS=n CONFIG_IP_PNP=n CONFIG_MODULES=n +# +# Alternative USB driver +# If used, you must also built the dwc2 overlay, +# and enable it in config.txt +# + +CONFIG_USB_DWC2=y + # Extra filessytems for using images from USB stick CONFIG_EXFAT_FS=y diff --git a/embedded/imager/configs/rpi-imager_defconfig b/embedded/imager/configs/rpi-imager_defconfig index 360988f..d4d7198 100644 --- a/embedded/imager/configs/rpi-imager_defconfig +++ b/embedded/imager/configs/rpi-imager_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_IMAGER_PATH)/board/bcm2711_d BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_IMAGER_PATH)/board/kernel_config_fragment_imager" BR2_LINUX_KERNEL_ZSTD=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4 overlays/vc4-fkms-v3d-pi4-overlay overlays/vc4-kms-v3d-pi4-overlay overlays/disable-bt-overlay overlays/disable-wifi-overlay" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4 overlays/dwc2-overlay overlays/vc4-fkms-v3d-pi4-overlay overlays/vc4-kms-v3d-pi4-overlay overlays/disable-bt-overlay overlays/disable-wifi-overlay" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_XZ=y BR2_PACKAGE_MESA3D=y diff --git a/embedded/output/config.txt b/embedded/output/config.txt index 35f4bb2..4f2be77 100644 --- a/embedded/output/config.txt +++ b/embedded/output/config.txt @@ -13,5 +13,5 @@ dtoverlay=disable-wifi arm_boost=1 [cm4] -# Pinmux SoC USB port to XHCI host-only controller -otg_mode=1 +dtoverlay=dwc2,dr_mode=host +