cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 07:55:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert CM4 USB controller back to dwc2

Browse source 
SDXC controller was not playing nice with rpiboot.
This commit is contained in:
Floris Bos 2022-02-23 16:03:29 +01:00
parent 367b111a77
commit 78f003fca7
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
embedded/build.sh
View file

@ -35,6 +35,7 @@ touch output/bootcode.bin
mkdir -p output/overlays 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-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/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 mv -f output/disable-bt-overlay.dtb output/overlays/disable-bt.dtbo

8
embedded/imager/board/kernel_config_fragment_imager
View file

@ -69,6 +69,14 @@ CONFIG_NFS_FS=n
CONFIG_IP_PNP=n CONFIG_IP_PNP=n
CONFIG_MODULES=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 # Extra filessytems for using images from USB stick
CONFIG_EXFAT_FS=y CONFIG_EXFAT_FS=y

2
embedded/imager/configs/rpi-imager_defconfig
View file

@ -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_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_IMAGER_PATH)/board/kernel_config_fragment_imager"
BR2_LINUX_KERNEL_ZSTD=y BR2_LINUX_KERNEL_ZSTD=y
BR2_LINUX_KERNEL_DTS_SUPPORT=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_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_XZ=y BR2_PACKAGE_XZ=y
BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D=y

4
embedded/output/config.txt
View file

@ -13,5 +13,5 @@ dtoverlay=disable-wifi
arm_boost=1 arm_boost=1
[cm4] [cm4]
# Pinmux SoC USB port to XHCI host-only controller dtoverlay=dwc2,dr_mode=host
otg_mode=1