Correct debdiff
-- .''`. Mateusz Łukasik : :' : http://mati75.eu `. `' Debian Member - [email protected] `- GPG: D93B 0C12 C8D0 4D7A AFBC FA27 CCD9 1D61 11A0 6851
diff -Nru u-boot-2016.11+dfsg1/debian/changelog u-boot-2016.11+dfsg1/debian/changelog --- u-boot-2016.11+dfsg1/debian/changelog 2016-12-16 14:10:52.000000000 +0100 +++ u-boot-2016.11+dfsg1/debian/changelog 2016-12-17 21:10:17.000000000 +0100 @@ -1,3 +1,10 @@ +u-boot (2016.11+dfsg1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * u-boot-sunxi: Add orangepi_zero target. + + -- Mateusz Łukasik <[email protected]> Sat, 17 Dec 2016 21:10:17 +0100 + u-boot (2016.11+dfsg1-2) unstable; urgency=medium * u-boot-sunxi: Add nanopi_neo target. diff -Nru u-boot-2016.11+dfsg1/debian/patches/series u-boot-2016.11+dfsg1/debian/patches/series --- u-boot-2016.11+dfsg1/debian/patches/series 2016-12-16 12:39:28.000000000 +0100 +++ u-boot-2016.11+dfsg1/debian/patches/series 2016-12-17 21:10:17.000000000 +0100 @@ -28,3 +28,6 @@ odroid/0001-Convert-odroid-to-use-distro_bootcmd.patch odroid-xu3/bootdelay + +sunxi-add-proper-device-tree-for-Orange-Pi-Zero-boards.patch +sunxi-add-orangepi-zero-defconfig.patch diff -Nru u-boot-2016.11+dfsg1/debian/patches/sunxi-add-orangepi-zero-defconfig.patch u-boot-2016.11+dfsg1/debian/patches/sunxi-add-orangepi-zero-defconfig.patch --- u-boot-2016.11+dfsg1/debian/patches/sunxi-add-orangepi-zero-defconfig.patch 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-2016.11+dfsg1/debian/patches/sunxi-add-orangepi-zero-defconfig.patch 2016-12-17 21:10:17.000000000 +0100 @@ -0,0 +1,37 @@ +diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS +index e23d45eed9..2321b8b08f 100644 +--- a/board/sunxi/MAINTAINERS ++++ b/board/sunxi/MAINTAINERS +@@ -232,6 +232,11 @@ M: Jelle van der Waa <[email protected]> + S: Maintained + F: configs/nanopi_neo_defconfig + ++ORANGEPI ZERO BOARD ++M: Icenowy Zheng <[email protected]> ++S: Maintained ++F: configs/orangepi_zero_defconfig ++ + R16 EVB PARROT BOARD + M: Quentin Schulz <[email protected]> + S: Maintained +diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig +new file mode 100644 +index 0000000000..8813927bc1 +--- /dev/null ++++ b/configs/orangepi_zero_defconfig +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=672 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_CONSOLE_MUX=y ++CONFIG_SPL=y ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_SUN8I_EMAC=y ++CONFIG_USB_EHCI_HCD=y diff -Nru u-boot-2016.11+dfsg1/debian/patches/sunxi-add-proper-device-tree-for-Orange-Pi-Zero-boards.patch u-boot-2016.11+dfsg1/debian/patches/sunxi-add-proper-device-tree-for-Orange-Pi-Zero-boards.patch --- u-boot-2016.11+dfsg1/debian/patches/sunxi-add-proper-device-tree-for-Orange-Pi-Zero-boards.patch 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-2016.11+dfsg1/debian/patches/sunxi-add-proper-device-tree-for-Orange-Pi-Zero-boards.patch 2016-12-17 21:07:20.000000000 +0100 @@ -0,0 +1,161 @@ +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index f43746966c..5553351f7d 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -271,6 +271,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ + sun8i-a83t-cubietruck-plus.dtb \ + sun8i-a83t-sinovoip-bpi-m3.dtb + dtb-$(CONFIG_MACH_SUN8I_H3) += \ ++ sun8i-h2-plus-orangepi-zero.dtb \ + sun8i-h3-bananapi-m2-plus.dtb \ + sun8i-h3-orangepi-2.dtb \ + sun8i-h3-orangepi-lite.dtb \ +diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +new file mode 100644 +index 0000000000..0989434074 +--- /dev/null ++++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +@@ -0,0 +1,143 @@ ++/* ++ * Copyright (C) 2016 Icenowy Zheng <[email protected]> ++ * ++ * Based on sun8i-h3-orangepi-one.dts, which is: ++ * Copyright (C) 2016 Hans de Goede <[email protected]> ++ * ++ * 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 <dt-bindings/gpio/gpio.h> ++#include <dt-bindings/input/input.h> ++#include <dt-bindings/pinctrl/sun4i-a10.h> ++ ++/ { ++ model = "Xunlong Orange Pi Zero"; ++ compatible = "xunlong,orangepi-zero", "allwinner,sun8i-h2-plus"; ++ ++ aliases { ++ serial0 = &uart0; ++ /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ ++ ethernet1 = &xr819; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ pwr_led { ++ label = "orangepi:green:pwr"; ++ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; ++ default-state = "on"; ++ }; ++ ++ status_led { ++ label = "orangepi:red:status"; ++ gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ reg_vcc_wifi: reg_vcc_wifi { ++ compatible = "regulator-fixed"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-wifi"; ++ enable-active-high; ++ gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; ++ }; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&mmc0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc0_pins_a>; ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ ++ cd-inverted; ++ status = "okay"; ++}; ++ ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins_a>; ++ vmmc-supply = <®_vcc_wifi>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ /* ++ * Explicitly define the sdio device, so that we can add an ethernet ++ * alias for it (which e.g. makes u-boot set a mac-address). ++ */ ++ xr819: sdio_wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pins_a>; ++ status = "okay"; ++}; ++ ++&usbphy { ++ /* USB VBUS is always on */ ++ status = "okay"; ++}; diff -Nru u-boot-2016.11+dfsg1/debian/targets u-boot-2016.11+dfsg1/debian/targets --- u-boot-2016.11+dfsg1/debian/targets 2016-12-16 12:39:28.000000000 +0100 +++ u-boot-2016.11+dfsg1/debian/targets 2016-12-17 21:10:17.000000000 +0100 @@ -148,6 +148,9 @@ # Vagrant Cascadian <[email protected]>, Orange PI Plus2 armhf sunxi orangepi_plus u-boot-sunxi-with-spl.bin +# Mateusz Łukasik <[email protected]>, Orange PI Zero +armhf sunxi orangepi_zero u-boot-sunxi-with-spl.bin + # Ricardo Salveti <[email protected]> arm64 qcom dragonboard410c u-boot.bin
