From ae0eea5c358887ec98c1a9e3a8f4303f5d71b541 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 20 Sep 2022 13:11:43 +0000 Subject: [PATCH] u-boot (Amlogic): update patches to support u-boot 2022.10 --- ...-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch | 8 +++++--- ...008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch | 8 +++++--- ...010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch | 8 +++++--- ...013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch index 19e08fc208..65bce216a1 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch @@ -5,8 +5,8 @@ Subject: [PATCH 07/15] WIP: boards: amlogic: add WeTek Hub defconfig Signed-of-by: Christian Hewitt --- - 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 @@ -14,7 +14,7 @@ new file mode 100644 index 0000000000..73fd7c4211 --- /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 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch index 41f6df8a6b..06b7894bef 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch @@ -5,8 +5,8 @@ Subject: [PATCH 08/15] WIP: boards: amlogic: add WeTek Play2 defconfig Signed-off-by: Christian Hewittt --- - 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 @@ -14,7 +14,7 @@ new file mode 100644 index 0000000000..f218ba0e0e --- /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 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch index 8ef99ea12c..188ea49478 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch @@ -8,8 +8,8 @@ Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip. Signed-off-by: Christian Hewitt --- board/amlogic/w400/MAINTAINERS | 1 + - configs/radxa-zero2_defconfig | 72 ++++++++++++++++++++++++++++++++++ - 2 files changed, 73 insertions(+) + configs/radxa-zero2_defconfig | 74 ++++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+) create mode 100644 configs/radxa-zero2_defconfig diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS @@ -27,7 +27,7 @@ new file mode 100644 index 0000000000..e9bd2a4f13 --- /dev/null +++ b/configs/radxa-zero2_defconfig -@@ -0,0 +1,72 @@ +@@ -0,0 +1,74 @@ +CONFIG_ARM=y +CONFIG_ARCH_MESON=y +CONFIG_SYS_TEXT_BASE=0x01000000 @@ -41,6 +41,8 @@ index 0000000000..e9bd2a4f13 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_IDENT_STRING=" radxa-zero2" +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 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch index 5c013dbc33..6cb091a49f 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch @@ -7,8 +7,8 @@ Add a board config for Beelink GT1 devices Signed-off-by: Christian Hewitt --- - 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 @@ -16,7 +16,7 @@ new file mode 100644 index 0000000000..6f6051b675 --- /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