From e1ab0cbed91007cadf27f571ebf199a60057e70c Mon Sep 17 00:00:00 2001 From: ThomasKaiser Date: Wed, 1 Nov 2017 15:39:22 +0100 Subject: [PATCH] Add USB DT overlays to small H2+/H3/H5 boards Enables USB ports on pin headers by default on future Armbian images --- config/boards/nanopiair.conf | 3 ++- config/boards/nanopiduo.conf | 2 +- config/boards/nanopineo.conf | 3 ++- config/boards/nanopineo2.conf | 3 ++- config/boards/nanopineoplus2.wip | 1 + config/boards/orangepizero.conf | 3 ++- config/boards/orangepizeroplus2-h3.conf | 3 ++- config/boards/orangepizeroplus2-h5.conf | 3 ++- config/templates/customize-image.sh.template | 3 +-- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/config/boards/nanopiair.conf b/config/boards/nanopiair.conf index c298b3f0d..65f72a4c6 100644 --- a/config/boards/nanopiair.conf +++ b/config/boards/nanopiair.conf @@ -5,6 +5,7 @@ BOOTCONFIG="nanopi_neo_air_defconfig" # MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial" MODULES_NEXT="brcmfmac g_serial" +DEFAULT_OVERLAYS="usbhost1 usbhost2" CPUMIN="240000" CPUMAX="912000" # @@ -22,4 +23,4 @@ CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/" HARDWARE="https://linux-sunxi.org/FriendlyARM_NanoPi_NEO" FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/" MISC3="Minimize consumption" -BUY="https://s.click.aliexpress.com/e/33723rR" \ No newline at end of file +BUY="https://s.click.aliexpress.com/e/33723rR" diff --git a/config/boards/nanopiduo.conf b/config/boards/nanopiduo.conf index 8efa7e2ad..e4bfaffae 100644 --- a/config/boards/nanopiduo.conf +++ b/config/boards/nanopiduo.conf @@ -5,7 +5,7 @@ BOOTCONFIG="nanopi_duo_defconfig" MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir xradio_wlan g_serial xradio_wlan" MODULES_NEXT="g_serial" MODULES_BLACKLIST="dhd" -DEFAULT_OVERLAYS="usbhost2" +DEFAULT_OVERLAYS="usbhost2 usbhost3" CPUMIN=240000 CPUMAX=1200000 BUILD_DESKTOP="no" diff --git a/config/boards/nanopineo.conf b/config/boards/nanopineo.conf index c52cece42..8f71127d7 100644 --- a/config/boards/nanopineo.conf +++ b/config/boards/nanopineo.conf @@ -5,6 +5,7 @@ BOOTCONFIG="nanopi_neo_defconfig" # MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir g_serial" MODULES_NEXT="g_serial" +DEFAULT_OVERLAYS="usbhost1 usbhost2" CPUMIN="240000" CPUMAX="912000" # @@ -22,4 +23,4 @@ CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/" HARDWARE="https://linux-sunxi.org/FriendlyARM_NanoPi_NEO" FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/" MISC3="Minimize consumption" -BUY="https://s.click.aliexpress.com/e/33723rR" \ No newline at end of file +BUY="https://s.click.aliexpress.com/e/33723rR" diff --git a/config/boards/nanopineo2.conf b/config/boards/nanopineo2.conf index 5270f53c7..1bc94bd86 100644 --- a/config/boards/nanopineo2.conf +++ b/config/boards/nanopineo2.conf @@ -5,6 +5,7 @@ BOOTCONFIG="nanopi_neo2_defconfig" # MODULES="" MODULES_NEXT="" +DEFAULT_OVERLAYS="usbhost1 usbhost2" CPUMIN="480000" CPUMAX="912000" # @@ -21,4 +22,4 @@ BOARDRATING="" CHIP="https://docs.armbian.com/Hardware_Allwinner-H5-A64/" HARDWARE="" FORUMS="https://forum.armbian.com/index.php/forum/11-other-boards/" -BUY="https://s.click.aliexpress.com/e/33723rR" \ No newline at end of file +BUY="https://s.click.aliexpress.com/e/33723rR" diff --git a/config/boards/nanopineoplus2.wip b/config/boards/nanopineoplus2.wip index faf321c21..60ca2fd4e 100644 --- a/config/boards/nanopineoplus2.wip +++ b/config/boards/nanopineoplus2.wip @@ -4,6 +4,7 @@ LINUXFAMILY="sun50iw2" BOOTCONFIG="nanopi_neo_plus2_defconfig" MODULES="" MODULES_NEXT="" +DEFAULT_OVERLAYS="usbhost1 usbhost2" CPUMIN="480000" CPUMAX="1008000" # diff --git a/config/boards/orangepizero.conf b/config/boards/orangepizero.conf index 157e331b9..c8bdb073a 100644 --- a/config/boards/orangepizero.conf +++ b/config/boards/orangepizero.conf @@ -6,6 +6,7 @@ BOOTCONFIG="orangepi_zero_defconfig" MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir xradio_wlan g_serial xradio_wlan" MODULES_NEXT="g_serial" MODULES_BLACKLIST="dhd" +DEFAULT_OVERLAYS="usbhost2 usbhost3" CPUMIN=240000 CPUMAX=1200000 BUILD_DESKTOP="no" @@ -21,4 +22,4 @@ BOARDRATING="" CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/" HARDWARE="http://linux-sunxi.org/Xunlong_Orange_Pi_Zero" FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/" -BUY="http://s.click.aliexpress.com/e/VbA6AEq" \ No newline at end of file +BUY="http://s.click.aliexpress.com/e/VbA6AEq" diff --git a/config/boards/orangepizeroplus2-h3.conf b/config/boards/orangepizeroplus2-h3.conf index a14e757f0..751bfa4d2 100644 --- a/config/boards/orangepizeroplus2-h3.conf +++ b/config/boards/orangepizeroplus2-h3.conf @@ -6,6 +6,7 @@ BOOTCONFIG="orangepi_zero_plus2_h3_defconfig" MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial" MODULES_NEXT="brcmfmac g_serial" MODULES_BLACKLIST="" +DEFAULT_OVERLAYS="usbhost2 usbhost3" CPUMIN=240000 CPUMAX=1200000 # @@ -23,4 +24,4 @@ CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/" HARDWARE="http://linux-sunxi.org/Xunlong_Orange_Pi_Zero_Plus_2" FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/" MISC3="Minimize consumption" -BUY="http://s.click.aliexpress.com/e/VbA6AEq" \ No newline at end of file +BUY="http://s.click.aliexpress.com/e/VbA6AEq" diff --git a/config/boards/orangepizeroplus2-h5.conf b/config/boards/orangepizeroplus2-h5.conf index eb1838f4a..877b59f10 100644 --- a/config/boards/orangepizeroplus2-h5.conf +++ b/config/boards/orangepizeroplus2-h5.conf @@ -6,6 +6,7 @@ BOOTCONFIG="orangepi_zero_plus2_defconfig" MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial" MODULES_NEXT="brcmfmac g_serial" MODULES_BLACKLIST="" +DEFAULT_OVERLAYS="usbhost2 usbhost3" CPUMIN=240000 CPUMAX=1200000 BUILD_DESKTOP="no" @@ -22,4 +23,4 @@ CHIP="http://docs.armbian.com/Hardware_Allwinner-H5/" HARDWARE="http://linux-sunxi.org/Xunlong_Orange_Pi_Zero" FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/" MISC3="Minimize consumption" -BUY="http://s.click.aliexpress.com/e/VbA6AEq" \ No newline at end of file +BUY="http://s.click.aliexpress.com/e/VbA6AEq" diff --git a/config/templates/customize-image.sh.template b/config/templates/customize-image.sh.template index 456b4d39a..285de0d35 100644 --- a/config/templates/customize-image.sh.template +++ b/config/templates/customize-image.sh.template @@ -153,9 +153,8 @@ InstallOpenMediaVault() { sed -i '/systemctl\ disable\ firstrun/a \ sleep 30 && sync && reboot' /etc/init.d/firstrun - # add USB3 Gigabit Ethernet and NAS Dock support + # add USB3 Gigabit Ethernet support echo -e "r8152\nax88179_178a" >>/etc/modules - egrep -q "air|neo|zero" <<<${BOARD} && echo "overlays=usbhost0 usbhost2 usbhost3" >>/boot/armbianEnv.txt # Special treatment for ODROID-XU4 (and later Amlogic S912, RK3399 and other big.LITTLE # based devices). Move all NAS daemons to the big cores.