Update U-Boot to 2018.05.

This commit is contained in:
jmcneill 2018-05-25 10:45:22 +00:00
parent add5625540
commit 1eca6fc7c6
26 changed files with 40 additions and 252 deletions

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:19 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
UBOOT_TARGET= a10-olinuxino-lime
UBOOT_CONFIG= A10-OLinuXino-Lime_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
UBOOT_TARGET= bananapi-m3
UBOOT_CONFIG= Sinovoip_BPI_M3_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:19 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
UBOOT_TARGET= bananapi
UBOOT_CONFIG= Bananapi_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= chip-pro
UBOOT_CONFIG= CHIP_pro_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
UBOOT_TARGET= chip
UBOOT_CONFIG= CHIP_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= cubieboard2
UBOOT_CONFIG= Cubieboard2_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= cubieboard4
UBOOT_CONFIG= Cubieboard4_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= cubietruck
UBOOT_CONFIG= Cubietruck_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= hummingbird-a31
UBOOT_CONFIG= Hummingbird_A31_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2018/02/18 16:25:45 jmcneill Exp $
PKGREVISION= 2
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= nanopi-neo-plus2
UBOOT_CONFIG= nanopi_neo_plus2_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= nanopi-neo
UBOOT_CONFIG= nanopi_neo_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
PKGREVISION= 2
# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= nanopi-neo2
UBOOT_CONFIG= nanopi_neo2_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.4 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= orangepi-2
UBOOT_CONFIG= orangepi_2_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= orangepi-one
UBOOT_CONFIG= orangepi_one_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.4 2017/12/18 23:31:20 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:23 jmcneill Exp $
UBOOT_TARGET= orangepi-plus2e
UBOOT_CONFIG= orangepi_plus2e_defconfig

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.4 2018/04/05 19:13:57 joerg Exp $
PKGREVISION= 3
# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:24 jmcneill Exp $
UBOOT_TARGET= pine64
UBOOT_CONFIG= pine64_plus_defconfig

View file

@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.4 2018/02/18 16:25:45 jmcneill Exp $
# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:24 jmcneill Exp $
UBOOT_VERSION= 2018.01
UBOOT_VERSION= 2018.05
UBOOT_TARGET= pinebook
UBOOT_CONFIG= pinebook_defconfig
UBOOT_BIN= u-boot-sunxi-with-spl.bin
# Use anarsoul's fork of mainline U-Boot with Pinebook support patched in
MASTER_SITES= ${MASTER_SITE_GITHUB:=anarsoul/}
GITHUB_PROJECT= u-boot-pine64
GITHUB_TAG= 98b74f94efc0bfa40ff78785f99a8f0a1fb0110a
MASTER_SITES= ${MASTER_SITE_GITHUB:=evadot/}
GITHUB_PROJECT= u-boot
GITHUB_TAG= 01c860679dabd8ac37bd0eccc90abff7d284a206
DISTNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
EXTRACT_SUFX= .tar.gz

View file

@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.3 2018/02/18 12:27:20 jmcneill Exp $
$NetBSD: distinfo,v 1.4 2018/05/25 10:45:24 jmcneill Exp $
SHA1 (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = e2fc6b456b88acd23e9b70d92fb520602d2242c9
RMD160 (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = 6057d6237829bca77269ce1cbf0a2ca86721545b
SHA512 (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = 14fa032f26f36ff96c0237be63785087b2dfb8ea4c6b0c90c3baa962ca2f03a6eb8403d503dda72544b7a464f3b7d50fb889e313a6d98ae9e7243596a55bee6a
Size (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = 15350995 bytes
SHA1 (u-boot-pinebook-2018.05-01c860679dabd8ac37bd0eccc90abff7d284a206.tar.gz) = d818ea3481be6a57596d53b1b3bbd7c389c7eda6
RMD160 (u-boot-pinebook-2018.05-01c860679dabd8ac37bd0eccc90abff7d284a206.tar.gz) = 9524713276bff72cd96b8a6c52468cc2f2cb38fa
SHA512 (u-boot-pinebook-2018.05-01c860679dabd8ac37bd0eccc90abff7d284a206.tar.gz) = 1994eae86c5e201c61ad3d869b7a6bd85c925bc00fa1f22a81524dd6c07a961dd7aeb63417e93fc2207f33836de06e60bb7fe3a5ab6988915c921816d1a112e3
Size (u-boot-pinebook-2018.05-01c860679dabd8ac37bd0eccc90abff7d284a206.tar.gz) = 15871209 bytes
SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 82dee7f627ba721ba3548b49569ee2491764d86a
SHA1 (patch-include_configs_sunxi-common.h) = 175027c9d7c96104e52ef1833cff4c26e8ed2ac3
SHA1 (patch-lib_bch.c) = 00a80689266d3ab8d2af862327e7c852220a0713

View file

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.3 2017/12/18 23:31:21 jmcneill Exp $
PKGREVISION= 1
# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:24 jmcneill Exp $
UBOOT_TARGET= pocketchip
UBOOT_CONFIG= CHIP_defconfig

View file

@ -1,14 +1,10 @@
$NetBSD: distinfo,v 1.11 2018/01/10 00:55:27 jakllsch Exp $
$NetBSD: distinfo,v 1.12 2018/05/25 10:45:22 jmcneill Exp $
SHA1 (u-boot-2017.11.tar.bz2) = 6a3932b39a0f165aba210663ea2500bcfb9c8794
RMD160 (u-boot-2017.11.tar.bz2) = 38e1331640b81e74ea78ebf41f94bcdbd675dcb2
SHA512 (u-boot-2017.11.tar.bz2) = 485b9ab7cea0a250d964822bdb99a8426852b4e815b506329dedc4f5a69757c8b1a812998561161d44d98f6fabb9c8937e8250de1244d258fc9f13624b38d643
Size (u-boot-2017.11.tar.bz2) = 11982382 bytes
SHA1 (u-boot-2018.05.tar.bz2) = 605543501f7450ffa4e9c7fd98d2f36dbc0657b0
RMD160 (u-boot-2018.05.tar.bz2) = b305357058feb875233c3a32f41e14548b97855d
SHA512 (u-boot-2018.05.tar.bz2) = 218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2
Size (u-boot-2018.05.tar.bz2) = 12469276 bytes
SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
SHA1 (patch-arch_arm_dts_Makefile) = 13e812abd46ffd7bf6dca6c78e2f5adf9731b7c6
SHA1 (patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts) = af01f257b0bec9a71a3fbf2324bed6a4471062b0
SHA1 (patch-configs_nanopi__neo__plus2__defconfig) = 58156ff8c5f9bd841b3039413911e67ddf8d692a
SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
SHA1 (patch-include_configs_tegra-common.h) = 01b68620414f85edd029e54f7f8dc158888c4072
SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
SHA1 (patch-tools_Makefile) = adc5082d369363113135d5c892822b57ee80ff19

View file

@ -1,12 +0,0 @@
$NetBSD: patch-arch_arm_dts_Makefile,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
--- arch/arm/dts/Makefile.orig 2017-11-14 01:08:06.000000000 +0000
+++ arch/arm/dts/Makefile
@@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
dtb-$(CONFIG_MACH_SUN8I_V3S) += \
sun8i-v3s-licheepi-zero.dtb
dtb-$(CONFIG_MACH_SUN50I_H5) += \
+ sun50i-h5-nanopi-neo-plus2.dtb \
sun50i-h5-nanopi-neo2.dtb \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \

View file

@ -1,125 +0,0 @@
$NetBSD: patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
--- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts.orig 2018-01-10 00:43:42.000000000 +0000
+++ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>
+ * Copyright (C) 2017 Jagan Teki <jteki@openedev.com>
+ *
+ * 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 library 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 library 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 "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "FriendlyARM NanoPi NEO Plus 2";
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc",
+ "allwinner,sun5i-a13-mmc";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <&reg_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <&reg_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
+
+&emac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&emac_rgmii_pins>;
+ phy-mode = "rgmii";
+ phy = <&phy7>;
+ status = "okay";
+
+ phy7: ethernet-phy@7 {
+ reg = <7>;
+ };
+};

View file

@ -1,23 +0,0 @@
$NetBSD: patch-configs_nanopi__neo__plus2__defconfig,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
--- configs/nanopi_neo_plus2_defconfig.orig 2018-01-10 00:30:46.000000000 +0000
+++ configs/nanopi_neo_plus2_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H5=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881977
+CONFIG_MACPWR="PD6"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
+# 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_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+# CONFIG_VIDEO_DE2 is not set

View file

@ -1,10 +1,10 @@
$NetBSD: patch-include_configs_tegra-common.h,v 1.1 2017/09/23 17:33:12 jmcneill Exp $
$NetBSD: patch-include_configs_tegra-common.h,v 1.2 2018/05/25 10:45:22 jmcneill Exp $
--- include/configs/tegra-common.h.orig 2017-07-10 17:07:38.000000000 +0000
--- include/configs/tegra-common.h.orig 2018-05-07 15:32:36.000000000 +0000
+++ include/configs/tegra-common.h
@@ -101,4 +101,7 @@
#include <config_distro_defaults.h>
#endif
@@ -92,4 +92,7 @@
/* Misc utility code */
#define CONFIG_BOUNCE_BUFFER
+/* Override default uimg size limit */
+#define CONFIG_SYS_BOOTM_LEN 0x1000000

View file

@ -1,13 +0,0 @@
$NetBSD: patch-tools_Makefile,v 1.1 2017/09/18 23:07:49 jmcneill Exp $
--- tools/Makefile.orig 2017-07-10 17:07:38.000000000 +0000
+++ tools/Makefile
@@ -69,7 +69,7 @@ LIBFDT_CSRCS := fdt.c fdt_ro.c fdt_wip.c
# Fatal error: can't create build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o:
# No such file or directory
# To fix this, use an absolute path.
-libfdt_tree := $(shell readlink -f $(srctree)/lib/libfdt)
+libfdt_tree := $(realpath $(srctree)/lib/libfdt)
LIBFDT_SRCS := $(addprefix $(libfdt_tree)/, $(LIBFDT_CSRCS))
LIBFDT_SWIG := $(addprefix $(libfdt_tree)/, pylibfdt/libfdt.i)

View file

@ -1,3 +1,3 @@
# $NetBSD: u-boot-version.mk,v 1.1 2018/05/24 22:35:56 jmcneill Exp $
# $NetBSD: u-boot-version.mk,v 1.2 2018/05/25 10:45:22 jmcneill Exp $
UBOOT_VERSION?= 2017.11
UBOOT_VERSION?= 2018.05