configs/beeelink_gs1: bump to ATF v2.2
PATCH 1/4 configs/beeelink_gs1: bump to ATF v2.2
The WDT workaround patch has been upstreamed.
Bump to the new ATF version and drop the patch.
--- ...er-common-use-r_wdog-instead-of-wdog.patch | 39 ------------------- configs/beelink_gs1_defconfig | 2 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch
board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <[email protected]> -Date: Tue, 9 Apr 2019 00:15:06 +0200 -Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some Allwinner H6 has a broken watchdog that doesn't -make the soc reboot. - -Use the R_WATCHDOG instead. - -Signed-off-by: Cl?ment P?ron <[email protected]> -Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba ---- - plat/allwinner/common/sunxi_pm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c -index 1d2dc938..13e13532 100644 ---- a/plat/allwinner/common/sunxi_pm.c -+++ b/plat/allwinner/common/sunxi_pm.c -@@ -20,9 +20,9 @@ - #include <sunxi_mmap.h> - #include <sunxi_private.h> - --#define SUNXI_WDOG0_CTRL_REG (SUNXI_WDOG_BASE + 0x0010) --#define SUNXI_WDOG0_CFG_REG (SUNXI_WDOG_BASE + 0x0014) --#define SUNXI_WDOG0_MODE_REG (SUNXI_WDOG_BASE + 0x0018) -+#define SUNXI_WDOG0_CTRL_REG (SUNXI_R_WDOG_BASE + 0x0010) -+#define SUNXI_WDOG0_CFG_REG (SUNXI_R_WDOG_BASE + 0x0014) -+#define SUNXI_WDOG0_MODE_REG (SUNXI_R_WDOG_BASE + 0x0018) - - #define mpidr_is_valid(mpidr) ( \ - MPIDR_AFFLVL3_VAL(mpidr) == 0 && \ --- -2.20.1 -
configs/beelink_gs1_defconfig +1 -1
@@ -25,7 +25,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader
Signature · 1 line
2.20.1
PATCH 1/4 configs/beeelink_gs1: bump to ATF v2.2
Hi,
Are these patches ok?
Thanks,
Clement
Quoted 73 lines · Cl?ment P?ron
The WDT workaround patch has been upstreamed.
Bump to the new ATF version and drop the patch.
Signed-off-by Cl?ment P?ron <[email protected]>--- ...er-common-use-r_wdog-instead-of-wdog.patch | 39 ------------------- configs/beelink_gs1_defconfig | 2 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patchboard/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch deleted +0
-39@@ -1,39 +0,0 @@ -From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <[email protected]> -Date: Tue, 9 Apr 2019 00:15:06 +0200 -Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some Allwinner H6 has a broken watchdog that doesn't -make the soc reboot. - -Use the R_WATCHDOG instead. - -Signed-off-by: Cl?ment P?ron <[email protected]> -Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba ---- - plat/allwinner/common/sunxi_pm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c -index 1d2dc938..13e13532 100644 ---- a/plat/allwinner/common/sunxi_pm.c -+++ b/plat/allwinner/common/sunxi_pm.c -@@ -20,9 +20,9 @@ - #include <sunxi_mmap.h> - #include <sunxi_private.h> - --#define SUNXI_WDOG0_CTRL_REG (SUNXI_WDOG_BASE + 0x0010) --#define SUNXI_WDOG0_CFG_REG (SUNXI_WDOG_BASE + 0x0014) --#define SUNXI_WDOG0_MODE_REG (SUNXI_WDOG_BASE + 0x0018) -+#define SUNXI_WDOG0_CTRL_REG (SUNXI_R_WDOG_BASE + 0x0010) -+#define SUNXI_WDOG0_CFG_REG (SUNXI_R_WDOG_BASE + 0x0014) -+#define SUNXI_WDOG0_MODE_REG (SUNXI_R_WDOG_BASE + 0x0018) - - #define mpidr_is_valid(mpidr) ( \ - MPIDR_AFFLVL3_VAL(mpidr) == 0 && \ --- -2.20.1 -configs/beelink_gs1_defconfig +1
-2@@ -25,7 +25,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader --2.20.1
PATCH 2/4 configs/beeelink_gs1: bump to U-boot 2020.01
In reply to Clément PéronThe U-boot patch has been upstreamed.
Bump U-boot version and drop the patch.
--- ...01-arm-dts-sync-dts-for-Allwinner-H6.patch | 279 ------------------ configs/beelink_gs1_defconfig | 3 +- 2 files changed, 1 insertion(+), 281 deletions(-) delete mode 100644 board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch
board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch deleted +0 -279
@@ -1,279 +0,0 @@ -From 99cade8743158889b3e8db93c003b3318ebd4bda Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <[email protected]> -Date: Sun, 11 Aug 2019 22:38:57 +0200 -Subject: [PATCH] arm: dts: sync dts for Allwinner H6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Sync Kernel DTS for Allwinner H6 boards. - -Drop /omit-if-no-ref/ keyword as it's not supported by U-boot. - -commit <d45331b00ddb> Linux 5.3-rc4 - -Signed-off-by: Cl?ment P?ron <[email protected]> ---- - arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++ - arch/arm/dts/sun50i-h6-pine-h64.dts | 12 ++++ - arch/arm/dts/sun50i-h6.dtsi | 46 +++++++++++++++- - 3 files changed, 131 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts -index 54b0882bed..0dc33c90dd 100644 ---- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts -+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts -@@ -14,6 +14,7 @@ - compatible = "azw,beelink-gs1", "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"; - -@@ -41,6 +53,40 @@ - }; - }; - -+&de { -+ status = "okay"; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ext_rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ phy-supply = <®_aldo2>; -+ status = "okay"; -+}; -+ -+&hdmi { -+ status = "okay"; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ -+&mdio { -+ ext_rgmii_phy: ethernet-phy at 1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ - &mmc0 { - vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; -@@ -57,6 +103,15 @@ - status = "okay"; - }; - -+&ohci0 { -+ status = "okay"; -+}; -+ -+&pio { -+ vcc-pd-supply = <®_cldo1>; -+ vcc-pg-supply = <®_aldo1>; -+}; -+ - &r_i2c { - status = "okay"; - -@@ -177,8 +232,29 @@ - }; - }; - -+&r_pio { -+ /* -+ * PL0 and PL1 are used for PMIC I2C -+ * don't enable the pl-supply else -+ * it will fail at boot -+ * -+ * vcc-pl-supply = <®_aldo1>; -+ */ -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_ph_pins>; - status = "okay"; - }; -+ -+&usb2otg { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb2phy { -+ usb0_vbus-supply = <®_vcc5v>; -+ status = "okay"; -+}; -diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts -index 4802902e12..1898345183 100644 ---- a/arch/arm/dts/sun50i-h6-pine-h64.dts -+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts -@@ -127,6 +127,12 @@ - status = "okay"; - }; - -+&pio { -+ vcc-pc-supply = <®_bldo2>; -+ vcc-pd-supply = <®_cldo1>; -+ vcc-pg-supply = <®_aldo1>; -+}; -+ - &r_i2c { - status = "okay"; - -@@ -243,10 +249,16 @@ - pcf8563: rtc at 51 { - compatible = "nxp,pcf8563"; - reg = <0x51>; -+ interrupt-parent = <&r_intc>; -+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - #clock-cells = <0>; - }; - }; - -+&r_pio { -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_ph_pins>; -diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi -index e0dc4a05c1..a117f479ae 100644 ---- a/arch/arm/dts/sun50i-h6.dtsi -+++ b/arch/arm/dts/sun50i-h6.dtsi -@@ -101,7 +101,7 @@ - #size-cells = <1>; - ranges; - -- display-engine at 1000000 { -+ bus at 1000000 { - compatible = "allwinner,sun50i-h6-de3", - "allwinner,sun50i-a64-de2"; - reg = <0x1000000 0x400000>; -@@ -203,11 +203,32 @@ - #reset-cells = <1>; - }; - -+ dma: dma-controller at 3002000 { -+ compatible = "allwinner,sun50i-h6-dma"; -+ reg = <0x03002000 0x1000>; -+ interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; -+ clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; -+ clock-names = "bus", "mbus"; -+ dma-channels = <16>; -+ dma-requests = <46>; -+ resets = <&ccu RST_BUS_DMA>; -+ #dma-cells = <1>; -+ }; -+ - sid: sid at 3006000 { - compatible = "allwinner,sun50i-h6-sid"; - reg = <0x03006000 0x400>; - }; - -+ watchdog: watchdog at 30090a0 { -+ compatible = "allwinner,sun50i-h6-wdt", -+ "allwinner,sun6i-a31-wdt"; -+ reg = <0x030090a0 0x20>; -+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; -+ /* Broken on some H6 boards */ -+ status = "disabled"; -+ }; -+ - pio: pinctrl at 300b000 { - compatible = "allwinner,sun50i-h6-pinctrl"; - reg = <0x0300b000 0x400>; -@@ -243,6 +264,18 @@ - bias-pull-up; - }; - -+ /* -+ * /omit-if-no-ref/ isn't supported by U-boot -+ * keep this comment to avoid bad sync with Linux -+ */ -+ mmc1_pins: mmc1-pins { -+ pins = "PG0", "PG1", "PG2", "PG3", -+ "PG4", "PG5"; -+ function = "mmc1"; -+ drive-strength = <30>; -+ bias-pull-up; -+ }; -+ - mmc2_pins: mmc2-pins { - pins = "PC1", "PC4", "PC5", "PC6", - "PC7", "PC8", "PC9", "PC10", -@@ -294,6 +327,8 @@ - resets = <&ccu RST_BUS_MMC1>; - reset-names = "ahb"; - interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; -@@ -445,7 +480,6 @@ - resets = <&ccu RST_BUS_OHCI3>, - <&ccu RST_BUS_EHCI3>; - phys = <&usb2phy 3>; -- phy-names = "usb"; - status = "disabled"; - }; - -@@ -457,7 +491,6 @@ - <&ccu CLK_USB_OHCI3>; - resets = <&ccu RST_BUS_OHCI3>; - phys = <&usb2phy 3>; -- phy-names = "usb"; - status = "disabled"; - }; - -@@ -613,6 +646,13 @@ - #reset-cells = <1>; - }; - -+ r_watchdog: watchdog at 7020400 { -+ compatible = "allwinner,sun50i-h6-wdt", -+ "allwinner,sun6i-a31-wdt"; -+ reg = <0x07020400 0x20>; -+ interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; -+ }; -+ - r_intc: interrupt-controller at 7021000 { - compatible = "allwinner,sun50i-h6-r-intc", - "allwinner,sun6i-a31-r-intc"; --- -2.20.1 -
configs/beelink_gs1_defconfig +1 -2
@@ -8,7 +8,6 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -BR2_GLOBAL_PATCH_DIR="board/beelink/gs1/patches/" # Kernel Linux headers same as kernel, a 5.3 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
@@ -32,7 +31,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
Signature · 1 line
2.20.1
PATCH 3/4 configs/beelink_gs1: bump to kernel 5.5
In reply to Clément PéronBumping to kernel 5.5 add many new features compare to the actual 5.3 used on Beelink GS1.
Which are crypto, USB3, GPU, IR, S/PDIF and RTC.
--- configs/beelink_gs1_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
configs/beelink_gs1_defconfig +3 -3
@@ -9,11 +9,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -# Kernel Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Kernel Linux headers same as kernel, a 5.5 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1"
Signature · 1 line
2.20.1
PATCH 4/4 boards/beelink_gs1: autossh with trivial root password
In reply to Clément Péron--- configs/beelink_gs1_defconfig | 3 +++ 1 file changed, 3 insertions(+)
configs/beelink_gs1_defconfig +3 -0
@@ -4,6 +4,7 @@ BR2_ARM_FPU_VFPV4=y BR2_TARGET_GENERIC_ISSUE="Welcome to Beelink GS1" # MDEV is required to autoload the ethernet driver module BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_ROOT_PASSWD="admin" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
@@ -18,6 +19,8 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_AUTOSSH=y +BR2_PACKAGE_DROPBEAR=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y
Signature · 1 line
2.20.1
PATCH 1/4 configs/beeelink_gs1: bump to ATF v2.2
In reply to Clément PéronQuoted 10 lines · On Sun, 16 Feb 2020 22:19:34 +0100 Cl?ment P?ron <[email protected]> wrote:
The WDT workaround patch has been upstreamed.
Bump to the new ATF version and drop the patch.
Signed-off-by Cl?ment P?ron <[email protected]>--- ...er-common-use-r_wdog-instead-of-wdog.patch | 39 ------------------- configs/beelink_gs1_defconfig | 2 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch
I've applied patches 1-3. Patch 4 was not merged, indeed.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com