From bd71c2c9c9ab9ba23dd8afb690ab91aba7d55ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 28 Dec 2015 12:26:28 +0100 Subject: [PATCH] Missing patches for u-boot default branch and fixes for "build all" --- build-all.sh | 18 +- main.sh | 2 +- .../u-boot-default/add-awsom-uboot.patch | 23 ++ .../u-boot-default/add-cubieboard4.patch | 21 ++ .../u-boot-default/add-lamobo-r1-uboot.patch | 267 ++++++++++++++++++ .../u-boot-default/sunxi-boot-splash.patch | 42 +++ 6 files changed, 363 insertions(+), 10 deletions(-) create mode 100644 patch/u-boot/u-boot-default/add-awsom-uboot.patch create mode 100644 patch/u-boot/u-boot-default/add-cubieboard4.patch create mode 100644 patch/u-boot/u-boot-default/add-lamobo-r1-uboot.patch create mode 100644 patch/u-boot/u-boot-default/sunxi-boot-splash.patch diff --git a/build-all.sh b/build-all.sh index e4b1df143..d0d3b216b 100644 --- a/build-all.sh +++ b/build-all.sh @@ -43,18 +43,18 @@ while [[ $k1 -lt ${#MYARRAY1[@]} ]] else BUILD_DESKTOP="no" fi - unset IFS LINUXFAMILY LINUXCONFIG LINUXKERNEL LINUXSOURCE KERNELBRANCH BOOTLOADER BOOTSOURCE BOOTBRANCH CPUMIN GOVERNOR + unset IFS LINUXFAMILY LINUXCONFIG LINUXKERNEL LINUXSOURCE KERNELBRANCH BOOTLOADER BOOTSOURCE BOOTBRANCH CPUMIN GOVERNOR needs_uboot needs_kernel source $SRC/lib/configuration.sh - if [[ $KERNEL_ONLY == "yes" ]]; then - if [[ "$OLDFAMILY" != *"$LINUXFAMILY$BRANCH"* ]]; then +# if [[ $KERNEL_ONLY == "yes" ]]; then +# if [[ "$OLDFAMILY" != *"$LINUXFAMILY$BRANCH"* ]]; then +# display_alert "$BOARD" "$RELEASE $BRANCH $BUILD_DESKTOP $LINUXFAMILY" "info" +# [[ $BUILD_ALL != "demo" ]] && source $SRC/lib/main.sh +# OLDFAMILY=$OLDFAMILY"$LINUXFAMILY$BRANCH" +# fi +# else display_alert "$BOARD" "$RELEASE $BRANCH $BUILD_DESKTOP $LINUXFAMILY" "info" [[ $BUILD_ALL != "demo" ]] && source $SRC/lib/main.sh - OLDFAMILY=$OLDFAMILY"$LINUXFAMILY$BRANCH" - fi - else - display_alert "$BOARD" "$RELEASE $BRANCH $BUILD_DESKTOP $LINUXFAMILY" "info" - [[ $BUILD_ALL != "demo" ]] && source $SRC/lib/main.sh - fi # kernel only +# fi # kernel only IFS=";" k1=$[$k1+2] diff --git a/main.sh b/main.sh index 681b8cd88..06b0d1e98 100644 --- a/main.sh +++ b/main.sh @@ -198,7 +198,7 @@ echo `date +"%d.%m.%Y %H:%M:%S"` $VERSION >> $DEST/debug/install.log umount_image # let's start with fresh screen -clear + display_alert "Starting Armbian build script" "@host" "info" # optimize build time with 100% CPU usage diff --git a/patch/u-boot/u-boot-default/add-awsom-uboot.patch b/patch/u-boot/u-boot-default/add-awsom-uboot.patch new file mode 100644 index 000000000..32ab6f159 --- /dev/null +++ b/patch/u-boot/u-boot-default/add-awsom-uboot.patch @@ -0,0 +1,23 @@ +=================================================================== +--- /dev/null ++++ u-boot-2015.01/configs/Awsom_defconfig +@@ -0,0 +1,19 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN7I=y ++CONFIG_DRAM_CLK=480 ++CONFIG_DRAM_ZQ=127 ++CONFIG_DRAM_EMR1=4 ++CONFIG_MMC0_CD_PIN="PB9" ++CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_DM_ETH=y ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_DM_SERIAL=y ++CONFIG_USB=y ++CONFIG_DM_USB=y diff --git a/patch/u-boot/u-boot-default/add-cubieboard4.patch b/patch/u-boot/u-boot-default/add-cubieboard4.patch new file mode 100644 index 000000000..326415f00 --- /dev/null +++ b/patch/u-boot/u-boot-default/add-cubieboard4.patch @@ -0,0 +1,21 @@ +diff --git a/arch/arm/dts/Cubieboard4_defconfig b/arch/arm/dts/Cubieboard4_defconfig +new file mode 100755 +index 0000000..f400ed2 +--- /dev/null ++++ b/arch/arm/dts/Cubieboard4_defconfig +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN9I=y ++CONFIG_DRAM_CLK=360 ++CONFIG_DRAM_ZQ=123 ++CONFIG_SYS_CLK_FREQ=1008000000 ++CONFIG_MMC0_CD_PIN="PH18" ++# CONFIG_VIDEO is not set ++CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-cubieboard4" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_CMD_GPIO=y ++CONFIG_SYS_NS16550=y diff --git a/patch/u-boot/u-boot-default/add-lamobo-r1-uboot.patch b/patch/u-boot/u-boot-default/add-lamobo-r1-uboot.patch new file mode 100644 index 000000000..4eb7ddb78 --- /dev/null +++ b/patch/u-boot/u-boot-default/add-lamobo-r1-uboot.patch @@ -0,0 +1,267 @@ +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +old mode 100644 +new mode 100755 +index 0a8c88d..2ca592d +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -126,6 +126,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ + sun7i-a20-ainol-aw1.dtb \ + sun7i-a20-bananapi.dtb \ + sun7i-a20-bananapro.dtb \ ++ sun7i-a20-lamobo-r1.dtb \ + sun7i-a20-cubieboard2.dtb \ + sun7i-a20-cubietruck.dtb \ + sun7i-a20-hummingbird.dtb \ +diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts +new file mode 100755 +index 0000000..4f826f1 +--- /dev/null ++++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts +@@ -0,0 +1,223 @@ ++/* ++ * Copyright 2014 Hans de Goede ++ * ++ * Hans de Goede ++ * ++ * 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 "sun7i-a20.dtsi" ++#include "sunxi-common-regulators.dtsi" ++ ++#include ++#include ++#include ++ ++/ { ++ model = "Lamobo R1"; ++ compatible = "lemaker,bananapi", "allwinner,sun7i-a20"; ++ ++ aliases { ++ serial0 = &uart0; ++ serial1 = &uart3; ++ serial2 = &uart7; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&led_pins_bananapi>; ++ ++ green { ++ label = "bananapi:green:usr"; ++ gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gmac_power_pin_bananapi>; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ enable-active-high; ++ gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++&ahci { ++ status = "okay"; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&gmac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gmac_pins_rgmii_a>; ++ phy = <&phy1>; ++ phy-mode = "rgmii"; ++ phy-supply = <®_gmac_3v3>; ++ status = "okay"; ++ ++ phy1: ethernet-phy@1 { ++ reg = <1>; ++ }; ++}; ++ ++&i2c0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c0_pins_a>; ++ status = "okay"; ++ ++ axp209: pmic@34 { ++ compatible = "x-powers,axp209"; ++ reg = <0x34>; ++ interrupt-parent = <&nmi_intc>; ++ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; ++ ++ interrupt-controller; ++ #interrupt-cells = <1>; ++ }; ++}; ++ ++&i2c2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c2_pins_a>; ++ status = "okay"; ++}; ++ ++&ir0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ir0_rx_pins_a>; ++ status = "okay"; ++}; ++ ++&mmc0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>; ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ ++ cd-inverted; ++ status = "okay"; ++}; ++ ++&ohci0 { ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&pio { ++ mmc0_cd_pin_bananapi: mmc0_cd_pin@0 { ++ allwinner,pins = "PH10"; ++ allwinner,function = "gpio_in"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++ ++ gmac_power_pin_bananapi: gmac_power_pin@0 { ++ allwinner,pins = "PH23"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++ ++ led_pins_bananapi: led_pins@0 { ++ allwinner,pins = "PH24"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++}; ++ ++®_usb1_vbus { ++ status = "okay"; ++}; ++ ++®_usb2_vbus { ++ status = "okay"; ++}; ++ ++&spi0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&spi0_pins_a>, ++ <&spi0_cs0_pins_a>, ++ <&spi0_cs1_pins_a>; ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pins_a>; ++ status = "okay"; ++}; ++ ++&uart3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart3_pins_b>; ++ status = "okay"; ++}; ++ ++&uart7 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart7_pins_a>; ++ status = "okay"; ++}; ++ ++&usbphy { ++ usb1_vbus-supply = <®_usb1_vbus>; ++ usb2_vbus-supply = <®_usb2_vbus>; ++ status = "okay"; ++}; +diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig +new file mode 100755 +index 0000000..1b27ce4 +--- /dev/null ++++ b/configs/Lamobo_R1_defconfig +@@ -0,0 +1,18 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN7I=y ++CONFIG_DRAM_CLK=432 ++CONFIG_GMAC_TX_DELAY=4 ++CONFIG_VIDEO_COMPOSITE=y ++CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,SATAPWR=SUNXI_GPB(3)" ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_DM_ETH=y ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_USB_EHCI_HCD=y ++ ++ diff --git a/patch/u-boot/u-boot-default/sunxi-boot-splash.patch b/patch/u-boot/u-boot-default/sunxi-boot-splash.patch new file mode 100644 index 000000000..8aa3e2df8 --- /dev/null +++ b/patch/u-boot/u-boot-default/sunxi-boot-splash.patch @@ -0,0 +1,42 @@ +diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h +old mode 100644 +new mode 100755 +index 3a360ca4..0423c08 +--- a/include/config_distro_bootcmd.h ++++ b/include/config_distro_bootcmd.h +@@ -186,6 +186,9 @@ + BOOTENV_SHARED_SCSI \ + BOOTENV_SHARED_IDE \ + "boot_prefixes=/ /boot/\0" \ ++ "splashpos=m,m\0" \ ++ "splashimage=66000000\0" \ ++ "loadsplash=ext4load mmc 0 ${splashimage} /boot/boot.bmp || fatload mmc 0 ${splashimage} boot.bmp; bmp d ${splashimage}\0" \ + "boot_scripts=boot.scr.uimg boot.scr\0" \ + "boot_script_dhcp=boot.scr.uimg\0" \ + BOOTENV_BOOT_TARGETS \ +@@ -243,7 +245,7 @@ + "done\0" + + #ifndef CONFIG_BOOTCOMMAND +-#define CONFIG_BOOTCOMMAND "run distro_bootcmd" ++#define CONFIG_BOOTCOMMAND "run loadsplash; run distro_bootcmd" + #endif + + #endif /* _CONFIG_CMD_DISTRO_BOOTCMD_H */ +diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h +old mode 100644 +new mode 100755 +index 2d6b815..33a7b86 +--- a/include/configs/sunxi-common.h ++++ b/include/configs/sunxi-common.h +@@ -10,6 +10,10 @@ + * SPDX-License-Identifier: GPL-2.0+ + */ + ++#define CONFIG_SPLASH_SCREEN ++#define CONFIG_SPLASH_SCREEN_ALIGN ++#define CONFIG_CMD_BMP ++#define CONFIG_VIDEO_BMP_RLE8 + #ifndef _SUNXI_COMMON_CONFIG_H + #define _SUNXI_COMMON_CONFIG_H +