From 81b48574a6a522674c4642c8eee34554e635ef42 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Mon, 14 Feb 2022 11:11:11 +0100 Subject: [PATCH] Embedded build: use XHCI host-only USB controller block on CM4 Closes #358 --- embedded/build.sh | 1 - .../imager/board/kernel_config_fragment_imager | 16 +--------------- embedded/imager/configs/rpi-imager_defconfig | 2 +- embedded/output/config.txt | 6 +++++- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/embedded/build.sh b/embedded/build.sh index 80ff4cb..3b1de03 100755 --- a/embedded/build.sh +++ b/embedded/build.sh @@ -35,7 +35,6 @@ 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 d6d4015..c34eae0 100644 --- a/embedded/imager/board/kernel_config_fragment_imager +++ b/embedded/imager/board/kernel_config_fragment_imager @@ -65,20 +65,6 @@ 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 -#CONFIG_USB_GADGET=y -#CONFIG_USB_CONFIGFS=y -#CONFIG_USB_CONFIGFS_SERIAL=y -#CONFIG_USB_CONFIGFS_ACM=y -#CONFIG_USB_CONFIGFS_ECM=y - - # Extra filessytems for using images from USB stick CONFIG_EXFAT_FS=y @@ -153,6 +139,6 @@ CONFIG_BLK_DEBUG_FS=n CONFIG_RELAY=n CONFIG_AUDIT=n CONFIG_KALLSYMS=n - +CONFIG_USB_DWCOTG=n diff --git a/embedded/imager/configs/rpi-imager_defconfig b/embedded/imager/configs/rpi-imager_defconfig index d4d7198..360988f 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/dwc2-overlay 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/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 ddbc32b..35f4bb2 100644 --- a/embedded/output/config.txt +++ b/embedded/output/config.txt @@ -8,6 +8,10 @@ initramfs rootfs.cpio.zst disable_overscan=1 enable_uart=1 dtoverlay=vc4-fkms-v3d-pi4 -dtoverlay=dwc2,dr_mode=host dtoverlay=disable-bt dtoverlay=disable-wifi +arm_boost=1 + +[cm4] +# Pinmux SoC USB port to XHCI host-only controller +otg_mode=1