Merge pull request #7096 from chewitt/amlogic-upstream

u-boot: update Amlogic patches for 2022.10 (again)
This commit is contained in:
Frank Hartung 2022-11-08 12:51:50 +01:00 committed by GitHub
commit e53f071f26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 62 additions and 90 deletions

View File

@ -1,7 +1,7 @@
From 95ed57b0ca24cde1d7547878101c62f552cb1160 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 13 Nov 2020 02:09:36 +0000
Subject: [PATCH 01/16] LOCAL: configs: meson64: prevent stdout/stderr on
Subject: [PATCH 01/15] LOCAL: configs: meson64: prevent stdout/stderr on
videoconsole
Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr

View File

@ -1,7 +1,7 @@
From d16384b766e1704470f678589e01d288fbb94960 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 22 Apr 2021 06:52:50 +0000
Subject: [PATCH 02/16] LOCAL: configs: meson64: remove /amlogic so fdtdir
Subject: [PATCH 02/15] LOCAL: configs: meson64: remove /amlogic so fdtdir
finds LE boot files
---

View File

@ -1,7 +1,7 @@
From a9fc1d56916fbcf4e00a1dd7543c9f53d697477a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 3 Aug 2021 18:42:55 +0000
Subject: [PATCH 03/16] LOCAL: board: amlogic: odroid-n2: remove /amlogic/
Subject: [PATCH 03/15] LOCAL: board: amlogic: odroid-n2: remove /amlogic/
prefix for dtb path
Remove the /amlogic/ prefix to align with current LE dtb locations.

View File

@ -1,7 +1,7 @@
From 7d8355053316d3f760a5ac14156e77e27aa5f6d5 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 25 Oct 2022 14:24:21 +0000
Subject: [PATCH 04/16] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset
Subject: [PATCH 04/15] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset
properties
The sync of device-tree/bindings in 11a48a5a18c6 ("Linux 5.6-rc2") causes

View File

@ -1,7 +1,7 @@
From f72090a5d057a18fa8bceec0400c212012f56126 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 20 Apr 2021 05:19:43 +0000
Subject: [PATCH 05/16] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux
Subject: [PATCH 05/15] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux
5.19
Import the WeTek common dtsi and Hub/Play2 device-trees.

View File

@ -1,7 +1,7 @@
From 4df4197e1eb7e257d0c4dda60a7ff427fbd47c6f Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 20 Apr 2021 05:29:19 +0000
Subject: [PATCH 06/16] WIP: ARM: dts: use snps,reset on WeTek devices to fix
Subject: [PATCH 06/15] WIP: ARM: dts: use snps,reset on WeTek devices to fix
Ethernet
The sync of the device tree and dt-bindings from Linux v5.6-rc2

View File

@ -1,7 +1,7 @@
From cec8965a83baea925ac82ca0be5dac3cc1823915 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 22 Apr 2021 05:45:29 +0000
Subject: [PATCH 07/16] WIP: boards: amlogic: add board files for wetek-gxbb
Subject: [PATCH 07/15] WIP: boards: amlogic: add board files for wetek-gxbb
devices
These support the WeTek Hub and Play2 devices.

View File

@ -1,20 +1,20 @@
From 2c34fb2dd9aabc081f3fd502e5ef90581bf5a34e Mon Sep 17 00:00:00 2001
From 8b7dfec310b69a5b7cafacbe11a3ca36b497c78c Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 27 Feb 2021 06:03:00 +0000
Subject: [PATCH 08/16] WIP: boards: amlogic: add WeTek Hub defconfig
Subject: [PATCH 08/15] WIP: boards: amlogic: add WeTek Hub defconfig
Signed-of-by: Christian Hewitt <christianshewitt@gmail.com>
---
configs/wetek-hub_defconfig | 69 +++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
configs/wetek-hub_defconfig | 71 +++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 configs/wetek-hub_defconfig
diff --git a/configs/wetek-hub_defconfig b/configs/wetek-hub_defconfig
new file mode 100644
index 0000000000..73fd7c4211
index 0000000000..9ad263ca2c
--- /dev/null
+++ b/configs/wetek-hub_defconfig
@@ -0,0 +1,69 @@
@@ -0,0 +1,71 @@
+CONFIG_ARM=y
+CONFIG_SYS_BOARD="wetek-gxbb"
+CONFIG_ARCH_MESON=y
@ -28,6 +28,8 @@ index 0000000000..73fd7c4211
+CONFIG_IDENT_STRING=" wetek-hub"
+CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-hub"
+CONFIG_DEBUG_UART=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
+CONFIG_OF_BOARD_SETUP=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_MISC_INIT_R=y
@ -71,15 +73,15 @@ index 0000000000..73fd7c4211
+CONFIG_DM_USB=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_KEYBOARD=y
+# CONFIG_DM_VIDEO is not set
+CONFIG_DM_VIDEO=y
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP16 is not set
+# CONFIG_SYS_WHITE_ON_BLACK is not set
+# CONFIG_VIDEO_MESON is not set
+# CONFIG_VIDEO_DT_SIMPLEFB is not set
+# CONFIG_SPLASH_SCREEN is not set
+# CONFIG_SPLASH_SCREEN_ALIGN is not set
+# CONFIG_VIDEO_BMP_RLE8 is not set
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_VIDEO_MESON=y
+CONFIG_VIDEO_DT_SIMPLEFB=y
+CONFIG_SPLASH_SCREEN=y
+CONFIG_SPLASH_SCREEN_ALIGN=y
+CONFIG_VIDEO_BMP_RLE8=y
+CONFIG_BMP_16BPP=y
+CONFIG_BMP_24BPP=y
+CONFIG_BMP_32BPP=y

View File

@ -1,20 +1,20 @@
From 5836c75e7ddbc2f3d73cca26679da7a80af5e45b Mon Sep 17 00:00:00 2001
From e45b57304c28592eae3ad386559abb6dd3a7a802 Mon Sep 17 00:00:00 2001
From: chewitt <christianshewitt@gmail.com>
Date: Sat, 27 Feb 2021 06:04:00 +0000
Subject: [PATCH 09/16] WIP: boards: amlogic: add WeTek Play2 defconfig
Subject: [PATCH 09/15] WIP: boards: amlogic: add WeTek Play2 defconfig
Signed-off-by: Christian Hewittt <christianshewitt@gmail.com>
---
configs/wetek-play2_defconfig | 69 +++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
configs/wetek-play2_defconfig | 71 +++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 configs/wetek-play2_defconfig
diff --git a/configs/wetek-play2_defconfig b/configs/wetek-play2_defconfig
new file mode 100644
index 0000000000..f218ba0e0e
index 0000000000..624679f90c
--- /dev/null
+++ b/configs/wetek-play2_defconfig
@@ -0,0 +1,69 @@
@@ -0,0 +1,71 @@
+CONFIG_ARM=y
+CONFIG_SYS_BOARD="wetek-gxbb"
+CONFIG_ARCH_MESON=y
@ -28,6 +28,8 @@ index 0000000000..f218ba0e0e
+CONFIG_IDENT_STRING=" wetek-play2"
+CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-play2"
+CONFIG_DEBUG_UART=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
+CONFIG_OF_BOARD_SETUP=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_MISC_INIT_R=y

View File

@ -1,7 +1,7 @@
From 91edd965aae7112ff260437c9f5154b574d79101 Mon Sep 17 00:00:00 2001
From 7a49690898b3af72646df09784b8cdd9b1b593fd Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 15 Jan 2022 06:17:23 +0000
Subject: [PATCH 11/16] WIP: ARM: dts: add support for Radxa Zero2
Subject: [PATCH 10/15] WIP: ARM: dts: add support for Radxa Zero2
Import the initial dts (WIP) from chewitt/amlogic-5.16.y

View File

@ -1,39 +0,0 @@
From bbe4c8304f9bd6084159d5180acaef0302b1d5bc Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 29 Jul 2022 09:43:33 +0000
Subject: [PATCH 10/16] WIP: boards: amlogic: add video to WeTek Hub
---
configs/wetek-hub_defconfig | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configs/wetek-hub_defconfig b/configs/wetek-hub_defconfig
index 73fd7c4211..07e10c555d 100644
--- a/configs/wetek-hub_defconfig
+++ b/configs/wetek-hub_defconfig
@@ -54,15 +54,15 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_KEYBOARD=y
-# CONFIG_DM_VIDEO is not set
+CONFIG_DM_VIDEO=y
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP16 is not set
-# CONFIG_SYS_WHITE_ON_BLACK is not set
-# CONFIG_VIDEO_MESON is not set
-# CONFIG_VIDEO_DT_SIMPLEFB is not set
-# CONFIG_SPLASH_SCREEN is not set
-# CONFIG_SPLASH_SCREEN_ALIGN is not set
-# CONFIG_VIDEO_BMP_RLE8 is not set
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_VIDEO_MESON=y
+CONFIG_VIDEO_DT_SIMPLEFB=y
+CONFIG_SPLASH_SCREEN=y
+CONFIG_SPLASH_SCREEN_ALIGN=y
+CONFIG_VIDEO_BMP_RLE8=y
CONFIG_BMP_16BPP=y
CONFIG_BMP_24BPP=y
CONFIG_BMP_32BPP=y
--
2.17.1

View File

@ -1,15 +1,15 @@
From 9b4e8cd6063a2dca9b59796ae282540537ddfeec Mon Sep 17 00:00:00 2001
From e7babbfd6c66c20e81e9d728a6a4384a9a5885dd Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 15 Jan 2022 06:23:29 +0000
Subject: [PATCH 12/16] WIP: boards: amlogic: add Radxa Zero2 defconfig
Subject: [PATCH 11/15] WIP: boards: amlogic: add Radxa Zero2 defconfig
Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
board/amlogic/w400/MAINTAINERS | 1 +
configs/radxa-zero2_defconfig | 72 ++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
configs/radxa-zero2_defconfig | 77 ++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+)
create mode 100644 configs/radxa-zero2_defconfig
diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS
@ -24,14 +24,13 @@ index 96ccda2001..caad41577d 100644
F: doc/board/amlogic/w400.rst
diff --git a/configs/radxa-zero2_defconfig b/configs/radxa-zero2_defconfig
new file mode 100644
index 0000000000..e9bd2a4f13
index 0000000000..3ef3c9c143
--- /dev/null
+++ b/configs/radxa-zero2_defconfig
@@ -0,0 +1,72 @@
@@ -0,0 +1,77 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
@ -40,10 +39,15 @@ index 0000000000..e9bd2a4f13
+CONFIG_DEBUG_UART_BASE=0xff803000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_IDENT_STRING=" radxa-zero2"
+CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DEBUG_UART=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
+CONFIG_REMAKE_ELF=y
+CONFIG_OF_BOARD_SETUP=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_MISC_INIT_R=y
+CONFIG_SYS_MAXARGS=32
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+CONFIG_CMD_GPIO=y
@ -55,13 +59,11 @@ index 0000000000..e9bd2a4f13
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_NET_RANDOM_ETHADDR is not set
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_DM_ETH=y
+# CONFIG_PHY_REALTEK is not set
+# CONFIG_DM_ETH is not set
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+# CONFIG_ETH_DESIGNWARE_MESON8B is not set
@ -78,7 +80,6 @@ index 0000000000..e9bd2a4f13
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
@ -99,6 +100,10 @@ index 0000000000..e9bd2a4f13
+CONFIG_VIDEO_DT_SIMPLEFB=y
+CONFIG_SPLASH_SCREEN=y
+CONFIG_SPLASH_SCREEN_ALIGN=y
+CONFIG_VIDEO_BMP_RLE8=y
+CONFIG_BMP_16BPP=y
+CONFIG_BMP_24BPP=y
+CONFIG_BMP_32BPP=y
+CONFIG_OF_LIBFDT_OVERLAY=y
--
2.17.1

View File

@ -1,7 +1,7 @@
From 86d32fb1182ab7cc29e2673329a696d8e27011de Mon Sep 17 00:00:00 2001
From 2fc65ac09a5698b9e2060890de1cd3310a237658 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 15 Jan 2022 06:35:47 +0000
Subject: [PATCH 13/16] WIP: doc: boards: amlogic: update for Radxa Zero2
Subject: [PATCH 12/15] WIP: doc: boards: amlogic: update for Radxa Zero2
Add documentation bits for the Radxa Zero2

View File

@ -1,7 +1,7 @@
From fe7e99bec813f7537b6a2c8ceda76896bea99546 Mon Sep 17 00:00:00 2001
From 7ce3779954032f9ac2591a02df06282115032cb3 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 7 Jul 2022 10:24:03 +0000
Subject: [PATCH 14/16] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21
Subject: [PATCH 13/15] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21
Import the Beelink GT1 device-tree.

View File

@ -1,22 +1,22 @@
From b2bed8e14c8ad035c2d4089e38437e9dbf699e22 Mon Sep 17 00:00:00 2001
From 7416bc16b956d7b9b2761ac5511c6b51ac8b4ca1 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 7 Jul 2022 10:27:01 +0000
Subject: [PATCH 15/16] WIP: boards: amlogic: add Beelink GT1 defconfig
Subject: [PATCH 14/15] WIP: boards: amlogic: add Beelink GT1 defconfig
Add a board config for Beelink GT1 devices
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
configs/beelink-gt1_defconfig | 69 +++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
configs/beelink-gt1_defconfig | 71 +++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 configs/beelink-gt1_defconfig
diff --git a/configs/beelink-gt1_defconfig b/configs/beelink-gt1_defconfig
new file mode 100644
index 0000000000..6f6051b675
index 0000000000..77ffc9aa49
--- /dev/null
+++ b/configs/beelink-gt1_defconfig
@@ -0,0 +1,69 @@
@@ -0,0 +1,71 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_SYS_TEXT_BASE=0x01000000
@ -30,6 +30,8 @@ index 0000000000..6f6051b675
+CONFIG_IDENT_STRING=" beelink-gt1"
+CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DEBUG_UART=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
+CONFIG_REMAKE_ELF=y
+CONFIG_OF_BOARD_SETUP=y
+# CONFIG_DISPLAY_CPUINFO is not set

View File

@ -1,7 +1,7 @@
From ce948b928e80dfb3e73eceb060a4ba08f5462a36 Mon Sep 17 00:00:00 2001
From 5c21b65a0efdae590e0d0ecd1191078725e4abf4 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 14 Jul 2022 19:38:41 +0000
Subject: [PATCH 16/16] WIP: doc: boards: amlogic: update for Beelink GT1
Subject: [PATCH 15/15] WIP: doc: boards: amlogic: update for Beelink GT1
Add documentation bits for the Beelink GT1 and GT1-Ultimate