From 8442d2ccfa2c193e55f769089b86debde439b4a8 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 23 Nov 2020 11:10:55 +0100 Subject: [PATCH] ODROID: disable USB enumeration (#1015) * Fix N2+ boot by disabling USB enumeration On some devices USB enumeration in U-Boot seems to freeze: starting USB... Bus usb@ff500000: Register 3000140 NbrPorts 3 Starting the controller USB XHCI 1.10 scanning bus usb@ff500000 for devices... We don't use USB currenty in the U-Boot script, disable it for now. * Disable USB enumeration on all ODROID devices --- buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush | 2 -- buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush | 2 -- buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush | 2 -- buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush | 2 -- 4 files changed, 8 deletions(-) diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush index c25d08d33..88d4935a7 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush @@ -25,8 +25,6 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait" setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait" -usb start - # Load extraargs fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline fatload mmc ${devnum}:1 ${fdt_addr_r} meson-gxbb-odroidc2.dtb diff --git a/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush index 98fcbe3af..c600615fe 100644 --- a/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush @@ -25,8 +25,6 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait" setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait" -usb start - # Load extraargs fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline fatload mmc ${devnum}:1 ${fdt_addr_r} meson-sm1-odroid-c4.dtb diff --git a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush index 8ae0f2f2e..24fc2a762 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush @@ -25,8 +25,6 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait" setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait" -usb start - # Load extraargs fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline if test "${board_rev}" = "c"; then diff --git a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush index 54a8a0812..98edf5c9a 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush @@ -27,8 +27,6 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait" setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait" -#usb start - # Load extraargs fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline fatload mmc ${devnum}:1 ${fdt_addr_r} exynos5422-odroidxu4.dtb