diff --git a/config/boards/bananapim2zero.csc b/config/boards/bananapim2zero.csc index 647b5a30c9..0897f0ab19 100644 --- a/config/boards/bananapim2zero.csc +++ b/config/boards/bananapim2zero.csc @@ -1,25 +1,14 @@ # H3/H2+ quad core 512MB SoC Wi-Fi/BT BOARD_NAME="Banana Pi M2 Zero" BOARDFAMILY="sun8i" -BOOTCONFIG="Sinovoip_BPI_M2_Zero_defconfig" +BOOTCONFIG="bananapi_m2_zero_defconfig" # MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir dhd hci_uart rfcomm hidp" MODULES_NEXT="brcmfmac g_serial" -CPUMIN="240000" -CPUMAX="1200000" # KERNEL_TARGET="default,next,dev" CLI_TARGET="" DESKTOP_TARGET="" # -CLI_BETA_TARGET="stretch:next" +CLI_BETA_TARGET="" DESKTOP_BETA_TARGET="" -# -RECOMMENDED="Debian_stretch_next_nightly:75" -# -BOARDRATING="" -CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/" -REVIEW="https://forum.armbian.com/topic/4801-banana-pi-zero/" -HARDWARE="https://linux-sunxi.org/Sinovoip_Banana_Pi_M2_Zero" -FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/" -BUY="http://amzn.to/2Hi9DVt" diff --git a/patch/u-boot/u-boot-sunxi/add-bananapi-bpi-zero.patch b/patch/u-boot/u-boot-sunxi/add-bananapi-bpi-zero.patch deleted file mode 100644 index 0fddcf2cad..0000000000 --- a/patch/u-boot/u-boot-sunxi/add-bananapi-bpi-zero.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index d36447d..3093c11 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -365,6 +365,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ - sun8i-a83t-cubietruck-plus.dtb \ - sun8i-a83t-tbs-a711.dts - dtb-$(CONFIG_MACH_SUN8I_H3) += \ -+ sun8i-h2-plus-bananapi-m2-zero.dtb \ - sun8i-h2-plus-libretech-all-h3-cc.dtb \ - sun8i-h2-plus-orangepi-r1.dtb \ - sun8i-h2-plus-orangepi-zero.dtb \ -diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts -new file mode 100644 -index 0000000..61de91d ---- /dev/null -+++ b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts -@@ -0,0 +1,141 @@ -+/* -+ * Copyright (C) 2017 Icenowy Zheng -+ * -+ * Based on sun8i-h3-bananapi-m2-plus.dts, which is: -+ * Copyright (C) 2016 Chen-Yu Tsai -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+#include "sun8i-h3.dtsi" -+#include "sunxi-common-regulators.dtsi" -+ -+#include -+#include -+ -+/ { -+ model = "Banana Pi BPI-M2-Zero"; -+ compatible = "sinovoip,bpi-m2-zero", "allwinner,sun8i-h2-plus"; -+ -+ aliases { -+ serial0 = &uart0; -+ serial1 = &uart1; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ -+ pwr_led { -+ label = "bananapi-m2-zero:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ default-state = "on"; -+ }; -+ }; -+ -+ gpio_keys { -+ compatible = "gpio-keys"; -+ pinctrl-names = "default"; -+ -+ sw4 { -+ label = "power"; -+ linux,code = ; -+ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ wifi_pwrseq: wifi_pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ pinctrl-names = "default"; -+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ -+ }; -+}; -+ -+&mmc0 { -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ /* -+ * On the production batch of this board the card detect GPIO is -+ * high active (card inserted), although on the early samples it's -+ * low active. -+ */ -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ -+ status = "okay"; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <®_vcc3v3>; -+ mmc-pwrseq = <&wifi_pwrseq>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ brcmf: wifi@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&pio>; -+ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ -+ interrupt-names = "host-wake"; -+ }; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pins_a>; -+ status = "okay"; -+}; -+ -+&usbphy { -+ usb0_id_det-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ -+ /* -+ * There're two micro-USB connectors, one is power-only and another is -+ * OTG. The Vbus of these two connectors are connected together, so -+ * the external USB device will be powered just by the power input -+ * from the power-only USB port. -+ */ -+ status = "okay"; -+}; -diff --git a/configs/Sinovoip_BPI_M2_Zero_defconfig b/configs/Sinovoip_BPI_M2_Zero_defconfig -new file mode 100644 -index 0000000..8f96ac1 ---- /dev/null -+++ b/configs/Sinovoip_BPI_M2_Zero_defconfig -@@ -0,0 +1,19 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_SYS_TEXT_BASE=0x4a000000 -+CONFIG_MACH_SUN8I_H3=y -+CONFIG_DRAM_CLK=408 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_DRAM_ODT_EN=y -+CONFIG_MMC_SUNXI_SLOT_EXTRA=-1 -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_SPL=y -+# CONFIG_CMD_FLASH is not set -+# CONFIG_CMD_FPGA is not set -+# CONFIG_SPL_DOS_PARTITION is not set -+# CONFIG_SPL_ISO_PARTITION is not set -+# CONFIG_SPL_EFI_PARTITION is not set -+CONFIG_SUN8I_EMAC=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_MMC0_CD_PIN="" diff --git a/patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patch b/patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patc.disabled similarity index 100% rename from patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patch rename to patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patc.disabled diff --git a/patch/u-boot/u-boot-sunxi/branch_next/workaround-reboot-is-poweroff-olimex-a20.patch b/patch/u-boot/u-boot-sunxi/branch_next/workaround-reboot-is-poweroff-olimex-a20.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-sunxi/branch_next/workaround-reboot-is-poweroff-olimex-a20.patch rename to patch/u-boot/u-boot-sunxi/branch_next/workaround-reboot-is-poweroff-olimex-a20.patch.disabled diff --git a/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch b/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch rename to patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch.disabled