diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 6ca39bdadb..8a5d95f5c2 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -28,8 +28,8 @@ case "$PROJECT" in PKG_PATCH_DIRS="rockchip" ;; *) - PKG_VERSION="2019.04" - PKG_SHA256="76b7772d156b3ddd7644c8a1736081e55b78828537ff714065d21dbade229bef" + PKG_VERSION="2019.07" + PKG_SHA256="bff4fa77e8da17521c030ca4c5b947a056c1b1be4d3e6ee8637020b8d50251d0" PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2" ;; esac diff --git a/projects/Allwinner/devices/H6/patches/u-boot/001-update-dt.patch b/projects/Allwinner/devices/H6/patches/u-boot/001-update-dt.patch deleted file mode 100644 index 47ca8b24ea..0000000000 --- a/projects/Allwinner/devices/H6/patches/u-boot/001-update-dt.patch +++ /dev/null @@ -1,608 +0,0 @@ -diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts -index ceffc40810..bdb8470fc8 100644 ---- a/arch/arm/dts/sun50i-h6-pine-h64.dts -+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts -@@ -14,6 +14,7 @@ - compatible = "pine64,pine-h64", "allwinner,sun50i-h6"; - - aliases { -+ ethernet0 = &emac; - serial0 = &uart0; - }; - -@@ -21,6 +22,17 @@ - stdout-path = "serial0:115200n8"; - }; - -+ connector { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_con_in: endpoint { -+ remote-endpoint = <&hdmi_out_con>; -+ }; -+ }; -+ }; -+ - leds { - compatible = "gpio-leds"; - -@@ -39,6 +51,56 @@ - gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ - }; - }; -+ -+ reg_usb_vbus: vbus { -+ compatible = "regulator-fixed"; -+ regulator-name = "usb-vbus"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ startup-delay-us = <100000>; -+ gpio = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ }; -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ext_rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ phy-supply = <®_aldo2>; -+ allwinner,rx-delay-ps = <200>; -+ allwinner,tx-delay-ps = <200>; -+ status = "okay"; -+}; -+ -+&mdio { -+ ext_rgmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ -+&de { -+ status = "okay"; -+}; -+ -+&hdmi { -+ status = "okay"; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&ehci3 { -+ status = "okay"; - }; - - &mmc0 { -@@ -46,6 +108,7 @@ - pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; -+ bus-width = <4>; - status = "okay"; - }; - -@@ -56,6 +119,15 @@ - vqmmc-supply = <®_bldo2>; - non-removable; - cap-mmc-hw-reset; -+ bus-width = <8>; -+ status = "okay"; -+}; -+ -+&ohci0 { -+ status = "okay"; -+}; -+ -+&ohci3 { - status = "okay"; - }; - -@@ -83,6 +155,7 @@ - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "vcc-ac200"; -+ regulator-enable-ramp-delay = <100000>; - }; - - reg_aldo3: aldo3 { -@@ -183,3 +256,14 @@ - pinctrl-0 = <&uart0_ph_pins>; - status = "okay"; - }; -+ -+&usb2otg { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb2phy { -+ usb0_vbus-supply = <®_usb_vbus>; -+ usb3_vbus-supply = <®_usb_vbus>; -+ status = "okay"; -+}; -diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi -index cfa5fffcf6..c9e861a50a 100644 ---- a/arch/arm/dts/sun50i-h6.dtsi -+++ b/arch/arm/dts/sun50i-h6.dtsi -@@ -6,8 +6,11 @@ - #include - #include - #include -+#include -+#include - #include - #include -+#include - - / { - interrupt-parent = <&gic>; -@@ -19,34 +22,40 @@ - #size-cells = <0>; - - cpu0: cpu@0 { -- compatible = "arm,cortex-a53", "arm,armv8"; -+ compatible = "arm,cortex-a53"; - device_type = "cpu"; - reg = <0>; - enable-method = "psci"; - }; - - cpu1: cpu@1 { -- compatible = "arm,cortex-a53", "arm,armv8"; -+ compatible = "arm,cortex-a53"; - device_type = "cpu"; - reg = <1>; - enable-method = "psci"; - }; - - cpu2: cpu@2 { -- compatible = "arm,cortex-a53", "arm,armv8"; -+ compatible = "arm,cortex-a53"; - device_type = "cpu"; - reg = <2>; - enable-method = "psci"; - }; - - cpu3: cpu@3 { -- compatible = "arm,cortex-a53", "arm,armv8"; -+ compatible = "arm,cortex-a53"; - device_type = "cpu"; - reg = <3>; - enable-method = "psci"; - }; - }; - -+ de: display-engine { -+ compatible = "allwinner,sun50i-h6-display-engine"; -+ allwinner,pipelines = <&mixer0>; -+ status = "disabled"; -+ }; -+ - iosc: internal-osc-clk { - #clock-cells = <0>; - compatible = "fixed-clock"; -@@ -92,6 +101,88 @@ - #size-cells = <1>; - ranges; - -+ display-engine@1000000 { -+ compatible = "allwinner,sun50i-h6-de3", -+ "allwinner,sun50i-a64-de2"; -+ reg = <0x1000000 0x400000>; -+ allwinner,sram = <&de2_sram 1>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges = <0 0x1000000 0x400000>; -+ -+ display_clocks: clock@0 { -+ compatible = "allwinner,sun50i-h6-de3-clk"; -+ reg = <0x0 0x10000>; -+ clocks = <&ccu CLK_DE>, -+ <&ccu CLK_BUS_DE>; -+ clock-names = "mod", -+ "bus"; -+ resets = <&ccu RST_BUS_DE>; -+ #clock-cells = <1>; -+ #reset-cells = <1>; -+ }; -+ -+ mixer0: mixer@100000 { -+ compatible = "allwinner,sun50i-h6-de3-mixer-0"; -+ reg = <0x100000 0x100000>; -+ clocks = <&display_clocks CLK_BUS_MIXER0>, -+ <&display_clocks CLK_MIXER0>; -+ clock-names = "bus", -+ "mod"; -+ resets = <&display_clocks RST_MIXER0>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ mixer0_out: port@1 { -+ reg = <1>; -+ -+ mixer0_out_tcon_top_mixer0: endpoint { -+ remote-endpoint = <&tcon_top_mixer0_in_mixer0>; -+ }; -+ }; -+ }; -+ }; -+ }; -+ -+ syscon: syscon@3000000 { -+ compatible = "allwinner,sun50i-h6-system-control", -+ "allwinner,sun50i-a64-system-control"; -+ reg = <0x03000000 0x1000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges; -+ -+ sram_c: sram@28000 { -+ compatible = "mmio-sram"; -+ reg = <0x00028000 0x1e000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges = <0 0x00028000 0x1e000>; -+ -+ de2_sram: sram-section@0 { -+ compatible = "allwinner,sun50i-h6-sram-c", -+ "allwinner,sun50i-a64-sram-c"; -+ reg = <0x0000 0x1e000>; -+ }; -+ }; -+ -+ sram_c1: sram@1a00000 { -+ compatible = "mmio-sram"; -+ reg = <0x01a00000 0x200000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges = <0 0x01a00000 0x200000>; -+ -+ ve_sram: sram-section@0 { -+ compatible = "allwinner,sun50i-h6-sram-c1", -+ "allwinner,sun4i-a10-sram-c1"; -+ reg = <0x000000 0x200000>; -+ }; -+ }; -+ }; -+ - ccu: clock@3001000 { - compatible = "allwinner,sun50i-h6-ccu"; - reg = <0x03001000 0x1000>; -@@ -101,17 +192,6 @@ - #reset-cells = <1>; - }; - -- gic: interrupt-controller@3021000 { -- compatible = "arm,gic-400"; -- reg = <0x03021000 0x1000>, -- <0x03022000 0x2000>, -- <0x03024000 0x2000>, -- <0x03026000 0x2000>; -- interrupts = ; -- interrupt-controller; -- #interrupt-cells = <3>; -- }; -- - pio: pinctrl@300b000 { - compatible = "allwinner,sun50i-h6-pinctrl"; - reg = <0x0300b000 0x400>; -@@ -126,6 +206,19 @@ - interrupt-controller; - #interrupt-cells = <3>; - -+ ext_rgmii_pins: rgmii_pins { -+ pins = "PD0", "PD1", "PD2", "PD3", "PD4", -+ "PD5", "PD7", "PD8", "PD9", "PD10", -+ "PD11", "PD12", "PD13", "PD19", "PD20"; -+ function = "emac"; -+ drive-strength = <40>; -+ }; -+ -+ hdmi_pins: hdmi-pins { -+ pins = "PH8", "PH9", "PH10"; -+ function = "hdmi"; -+ }; -+ - mmc0_pins: mmc0-pins { - pins = "PF0", "PF1", "PF2", "PF3", - "PF4", "PF5"; -@@ -149,6 +242,17 @@ - }; - }; - -+ gic: interrupt-controller@3021000 { -+ compatible = "arm,gic-400"; -+ reg = <0x03021000 0x1000>, -+ <0x03022000 0x2000>, -+ <0x03024000 0x2000>, -+ <0x03026000 0x2000>; -+ interrupts = ; -+ interrupt-controller; -+ #interrupt-cells = <3>; -+ }; -+ - mmc0: mmc@4020000 { - compatible = "allwinner,sun50i-h6-mmc", - "allwinner,sun50i-a64-mmc"; -@@ -235,6 +339,250 @@ - status = "disabled"; - }; - -+ emac: ethernet@5020000 { -+ compatible = "allwinner,sun50i-h6-emac", -+ "allwinner,sun50i-a64-emac"; -+ syscon = <&syscon>; -+ reg = <0x05020000 0x10000>; -+ interrupts = ; -+ interrupt-names = "macirq"; -+ resets = <&ccu RST_BUS_EMAC>; -+ reset-names = "stmmaceth"; -+ clocks = <&ccu CLK_BUS_EMAC>; -+ clock-names = "stmmaceth"; -+ status = "disabled"; -+ -+ mdio: mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; -+ }; -+ -+ usb2otg: usb@5100000 { -+ compatible = "allwinner,sun50i-h6-musb", -+ "allwinner,sun8i-a33-musb"; -+ reg = <0x05100000 0x0400>; -+ clocks = <&ccu CLK_BUS_OTG>; -+ resets = <&ccu RST_BUS_OTG>; -+ interrupts = ; -+ interrupt-names = "mc"; -+ phys = <&usb2phy 0>; -+ phy-names = "usb"; -+ extcon = <&usb2phy 0>; -+ status = "disabled"; -+ }; -+ -+ usb2phy: phy@5100400 { -+ compatible = "allwinner,sun50i-h6-usb-phy"; -+ reg = <0x05100400 0x24>, -+ <0x05101800 0x4>, -+ <0x05311800 0x4>; -+ reg-names = "phy_ctrl", -+ "pmu0", -+ "pmu3"; -+ clocks = <&ccu CLK_USB_PHY0>, -+ <&ccu CLK_USB_PHY3>; -+ clock-names = "usb0_phy", -+ "usb3_phy"; -+ resets = <&ccu RST_USB_PHY0>, -+ <&ccu RST_USB_PHY3>; -+ reset-names = "usb0_reset", -+ "usb3_reset"; -+ status = "disabled"; -+ #phy-cells = <1>; -+ }; -+ -+ ehci0: usb@5101000 { -+ compatible = "allwinner,sun50i-h6-ehci", "generic-ehci"; -+ reg = <0x05101000 0x100>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_OHCI0>, -+ <&ccu CLK_BUS_EHCI0>, -+ <&ccu CLK_USB_OHCI0>; -+ resets = <&ccu RST_BUS_OHCI0>, -+ <&ccu RST_BUS_EHCI0>; -+ status = "disabled"; -+ }; -+ -+ ohci0: usb@5101400 { -+ compatible = "allwinner,sun50i-h6-ohci", "generic-ohci"; -+ reg = <0x05101400 0x100>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_OHCI0>, -+ <&ccu CLK_USB_OHCI0>; -+ resets = <&ccu RST_BUS_OHCI0>; -+ status = "disabled"; -+ }; -+ -+ ehci3: usb@5311000 { -+ compatible = "allwinner,sun50i-h6-ehci", "generic-ehci"; -+ reg = <0x05311000 0x100>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_OHCI3>, -+ <&ccu CLK_BUS_EHCI3>, -+ <&ccu CLK_USB_OHCI3>; -+ resets = <&ccu RST_BUS_OHCI3>, -+ <&ccu RST_BUS_EHCI3>; -+ phys = <&usb2phy 3>; -+ phy-names = "usb"; -+ status = "disabled"; -+ }; -+ -+ ohci3: usb@5311400 { -+ compatible = "allwinner,sun50i-h6-ohci", "generic-ohci"; -+ reg = <0x05311400 0x100>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_OHCI3>, -+ <&ccu CLK_USB_OHCI3>; -+ resets = <&ccu RST_BUS_OHCI3>; -+ phys = <&usb2phy 3>; -+ phy-names = "usb"; -+ status = "disabled"; -+ }; -+ -+ hdmi: hdmi@6000000 { -+ compatible = "allwinner,sun50i-h6-dw-hdmi"; -+ reg = <0x06000000 0x10000>; -+ reg-io-width = <1>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>, -+ <&ccu CLK_HDMI>, <&ccu CLK_HDMI_CEC>, -+ <&ccu CLK_HDCP>, <&ccu CLK_BUS_HDCP>; -+ clock-names = "iahb", "isfr", "tmds", "cec", "hdcp", -+ "hdcp-bus"; -+ resets = <&ccu RST_BUS_HDMI_SUB>, <&ccu RST_BUS_HDCP>; -+ reset-names = "ctrl", "hdcp"; -+ phys = <&hdmi_phy>; -+ phy-names = "hdmi-phy"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&hdmi_pins>; -+ status = "disabled"; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ hdmi_in: port@0 { -+ reg = <0>; -+ -+ hdmi_in_tcon_top: endpoint { -+ remote-endpoint = <&tcon_top_hdmi_out_hdmi>; -+ }; -+ }; -+ -+ hdmi_out: port@1 { -+ reg = <1>; -+ }; -+ }; -+ }; -+ -+ hdmi_phy: hdmi-phy@6010000 { -+ compatible = "allwinner,sun50i-h6-hdmi-phy"; -+ reg = <0x06010000 0x10000>; -+ clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>; -+ clock-names = "bus", "mod"; -+ resets = <&ccu RST_BUS_HDMI>; -+ reset-names = "phy"; -+ #phy-cells = <0>; -+ }; -+ -+ tcon_top: tcon-top@6510000 { -+ compatible = "allwinner,sun50i-h6-tcon-top"; -+ reg = <0x06510000 0x1000>; -+ clocks = <&ccu CLK_BUS_TCON_TOP>, -+ <&ccu CLK_TCON_TV0>; -+ clock-names = "bus", -+ "tcon-tv0"; -+ clock-output-names = "tcon-top-tv0"; -+ resets = <&ccu RST_BUS_TCON_TOP>; -+ reset-names = "rst"; -+ #clock-cells = <1>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ tcon_top_mixer0_in: port@0 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0>; -+ -+ tcon_top_mixer0_in_mixer0: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&mixer0_out_tcon_top_mixer0>; -+ }; -+ }; -+ -+ tcon_top_mixer0_out: port@1 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <1>; -+ -+ tcon_top_mixer0_out_tcon_tv: endpoint@2 { -+ reg = <2>; -+ remote-endpoint = <&tcon_tv_in_tcon_top_mixer0>; -+ }; -+ }; -+ -+ tcon_top_hdmi_in: port@4 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <4>; -+ -+ tcon_top_hdmi_in_tcon_tv: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&tcon_tv_out_tcon_top>; -+ }; -+ }; -+ -+ tcon_top_hdmi_out: port@5 { -+ reg = <5>; -+ -+ tcon_top_hdmi_out_hdmi: endpoint { -+ remote-endpoint = <&hdmi_in_tcon_top>; -+ }; -+ }; -+ }; -+ }; -+ -+ tcon_tv: lcd-controller@6515000 { -+ compatible = "allwinner,sun50i-h6-tcon-tv", -+ "allwinner,sun8i-r40-tcon-tv"; -+ reg = <0x06515000 0x1000>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_TCON_TV0>, -+ <&tcon_top CLK_TCON_TOP_TV0>; -+ clock-names = "ahb", -+ "tcon-ch1"; -+ resets = <&ccu RST_BUS_TCON_TV0>; -+ reset-names = "lcd"; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ tcon_tv_in: port@0 { -+ reg = <0>; -+ -+ tcon_tv_in_tcon_top_mixer0: endpoint { -+ remote-endpoint = <&tcon_top_mixer0_out_tcon_tv>; -+ }; -+ }; -+ -+ tcon_tv_out: port@1 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <1>; -+ -+ tcon_tv_out_tcon_top: endpoint@1 { -+ reg = <1>; -+ remote-endpoint = <&tcon_top_hdmi_in_tcon_tv>; -+ }; -+ }; -+ }; -+ }; -+ - r_ccu: clock@7010000 { - compatible = "allwinner,sun50i-h6-r-ccu"; - reg = <0x07010000 0x400>; -diff --git a/include/dt-bindings/clock/sun8i-tcon-top.h b/include/dt-bindings/clock/sun8i-tcon-top.h -new file mode 100644 -index 0000000000..25164d7678 ---- /dev/null -+++ b/include/dt-bindings/clock/sun8i-tcon-top.h -@@ -0,0 +1,11 @@ -+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ -+/* Copyright (C) 2018 Jernej Skrabec */ -+ -+#ifndef _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ -+#define _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ -+ -+#define CLK_TCON_TOP_TV0 0 -+#define CLK_TCON_TOP_TV1 1 -+#define CLK_TCON_TOP_DSI 2 -+ -+#endif /* _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ */ diff --git a/projects/Allwinner/devices/H6/patches/u-boot/002-orange-pi-3-support.patch b/projects/Allwinner/devices/H6/patches/u-boot/002-orange-pi-3-support.patch index a4dc9af824..2e9eb9518d 100644 --- a/projects/Allwinner/devices/H6/patches/u-boot/002-orange-pi-3-support.patch +++ b/projects/Allwinner/devices/H6/patches/u-boot/002-orange-pi-3-support.patch @@ -7,6 +7,7 @@ index 0e2ffdb87f..ad60ae0179 100644 sun50i-h5-orangepi-zero-plus2.dtb dtb-$(CONFIG_MACH_SUN50I_H6) += \ + sun50i-h6-orangepi-3.dtb \ + sun50i-h6-beelink-gs1.dtb \ sun50i-h6-orangepi-lite2.dtb \ sun50i-h6-orangepi-one-plus.dtb \ sun50i-h6-pine-h64.dtb @@ -357,6 +358,7 @@ index 0000000000..9a9cd28142 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL_TEXT_BASE=0x20060 +# CONFIG_CMD_FLASH is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set