From 2ffa89bb213996c20ef0a191e66a70602664019d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 4 Apr 2023 13:26:14 +0000 Subject: [PATCH] u-boot (Amlogic): documentation only patches dont apply cleanly - drop them --- ...oards-amlogic-update-for-Radxa-Zero2.patch | 123 ------------- ...oards-amlogic-update-for-Beelink-GT1.patch | 165 ------------------ ...s-amlogic-update-for-BananaPi-M2-Pro.patch | 49 ------ ...ards-amlogic-update-for-BananaPi-M2S.patch | 40 ----- 4 files changed, 377 deletions(-) delete mode 100644 projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch delete mode 100644 projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch delete mode 100644 projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch delete mode 100644 projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch diff --git a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch deleted file mode 100644 index e1d7cead98..0000000000 --- a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 2fc65ac09a5698b9e2060890de1cd3310a237658 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sat, 15 Jan 2022 06:35:47 +0000 -Subject: [PATCH 12/22] WIP: doc: boards: amlogic: update for Radxa Zero2 - -Add documentation bits for the Radxa Zero2 - -Signed-off-by: Christian Hewitt ---- - board/amlogic/w400/MAINTAINERS | 1 + - doc/board/amlogic/index.rst | 3 +- - .../{radxa-zero.rst => radxa-zero2.rst} | 29 ++++++++++--------- - 3 files changed, 18 insertions(+), 15 deletions(-) - rename doc/board/amlogic/{radxa-zero.rst => radxa-zero2.rst} (76%) - -diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS -index caad41577d..6e1ef9b8b8 100644 ---- a/board/amlogic/w400/MAINTAINERS -+++ b/board/amlogic/w400/MAINTAINERS -@@ -5,3 +5,4 @@ L: u-boot-amlogic@groups.io - F: board/amlogic/w400/ - F: configs/radxa-zero2_defconfig - F: doc/board/amlogic/w400.rst -+F: doc/board/amlogic/radxa-zero2.rst -diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst -index 4d407f9362..f0b92e4209 100644 ---- a/doc/board/amlogic/index.rst -+++ b/doc/board/amlogic/index.rst -@@ -19,7 +19,7 @@ This matrix concerns the actual source code version. - | | Nanopi-K2 | Khadas-VIM | Libretech-PC | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | - | | P200 | LibreTech-CC v1 | WeTek Core2 | | Radxa Zero | GT-King/Pro | Odroid-C4 | - | | P201 | LibreTech-AC v2 | | | | GSKing-X | Odroid-HC4 | --| | | JetHub J80 | | | | | BananaPi-M5 | -+| | | JetHub J80 | | | | Radxa Zero2 | BananaPi-M5 | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ - | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ -@@ -110,6 +110,7 @@ Board Documentation - p212 - q200 - radxa-zero -+ radxa-zero2 - s400 - sei510 - sei610 -diff --git a/doc/board/amlogic/radxa-zero.rst b/doc/board/amlogic/radxa-zero2.rst -similarity index 76% -rename from doc/board/amlogic/radxa-zero.rst -rename to doc/board/amlogic/radxa-zero2.rst -index f5611f52ec..95a42a05d0 100644 ---- a/doc/board/amlogic/radxa-zero.rst -+++ b/doc/board/amlogic/radxa-zero2.rst -@@ -1,18 +1,17 @@ - .. SPDX-License-Identifier: GPL-2.0+ - --U-Boot for Radxa Zero --===================== -+U-Boot for Radxa Zero2 -+====================== - --Radxa Zero is a small form factor SBC based on the Amlogic S905Y2 --chipset that ships in a number of RAM/eMMC configurations: -+Radxa Zero2 is a small form factor SBC based on the Amlogic A311D -+chipset that ships in a number of eMMC configurations: - --Boards with 512MB/1GB LPDDR4 RAM have no eMMC storage and BCM43436 --wireless (2.4GHz b/g/n) while 2GB/4GB boards have 8/16/32/64/128GB --eMMC storage and BCM4345 wireless (2.4/5GHz a/b/g/n/ac). -- --- Amlogic S905Y2 quad-core Cortex-A53 --- Mali G31-MP2 GPU -+- Amlogic A311D (Quad A73 + Dual A53) CPU -+- 4GB LPDDR4 RAM -+- 32/64/128GB eMMC -+- Mali G52-MP4 GPU - - HDMI 2.1 output (micro) -+- BCM4345 WiFi (2.4/5GHz a/b/g/n/ac) and BT 5.0 - - 1x USB 2.0 port - Type C (OTG) - - 1x USB 3.0 port - Type C (Host) - - 1x micro SD Card slot -@@ -20,6 +19,7 @@ eMMC storage and BCM4345 wireless (2.4/5GHz a/b/g/n/ac). - - Schematics are available on the manufacturer website: - -+** TO-DO ** (provide updated URL) - https://dl.radxa.com/zero/docs/hw/RADAX_ZERO_V13_SCH_20210309.pdf - - U-Boot compilation -@@ -28,7 +28,7 @@ U-Boot compilation - .. code-block:: bash - - $ export CROSS_COMPILE=aarch64-none-elf- -- $ make radxa-zero_defconfig -+ $ make radxa-zero2_defconfig - $ make - - Image creation -@@ -42,6 +42,7 @@ git trees published by the board vendor: - - .. code-block:: bash - -+ ** TO-DO ** UPDATE URLs - $ git clone -b radxa-zero-v2021.07 https://github.com/radxa/u-boot.git - $ git clone https://github.com/radxa/fip.git - -@@ -54,11 +55,11 @@ git trees published by the board vendor: - $ export CROSS_COMPILE=/opt/gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf/bin/aarch64-none-elf- - $ export ARCH=arm - $ cd u-boot -- $ make radxa-zero_defconfig -+ $ make radxa-zero2_defconfig - $ make - -- $ cp u-boot.bin ../fip/radxa-zero/bl33.bin -- $ cd ../fip/radxa-zero -+ $ cp u-boot.bin ../fip/radxa-zero2/bl33.bin -+ $ cd ../fip/radxa-zero2 - $ make - - This will generate: --- -2.34.1 - diff --git a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch deleted file mode 100644 index 5b3f11a276..0000000000 --- a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 5c21b65a0efdae590e0d0ecd1191078725e4abf4 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 14 Jul 2022 19:38:41 +0000 -Subject: [PATCH 15/22] WIP: doc: boards: amlogic: update for Beelink GT1 - -Add documentation bits for the Beelink GT1 and GT1-Ultimate - -Signed-off-by: Christian Hewitt ---- - board/amlogic/q200/MAINTAINERS | 2 + - doc/board/amlogic/beelink-gt1.rst | 98 +++++++++++++++++++++++++++++++ - doc/board/amlogic/index.rst | 9 +-- - 3 files changed, 105 insertions(+), 4 deletions(-) - create mode 100644 doc/board/amlogic/beelink-gt1.rst - -diff --git a/board/amlogic/q200/MAINTAINERS b/board/amlogic/q200/MAINTAINERS -index 9c84cca27e..46beffe17f 100644 ---- a/board/amlogic/q200/MAINTAINERS -+++ b/board/amlogic/q200/MAINTAINERS -@@ -4,9 +4,11 @@ S: Maintained - L: u-boot-amlogic@groups.io - F: board/amlogic/q200/ - F: include/configs/q200.h -+F: configs/beelink-gt1_defconfig - F: configs/khadas-vim2_defconfig - F: configs/libretech-s905d-pc_defconfig - F: configs/libretech-s912-pc_defconfig - F: configs/wetek-core2_defconfig -+F: doc/board/amlogic/beelink-gt1.rst - F: doc/board/amlogic/khadas-vim2.rst - F: doc/board/amlogic/wetek-core2.rst -diff --git a/doc/board/amlogic/beelink-gt1.rst b/doc/board/amlogic/beelink-gt1.rst -new file mode 100644 -index 0000000000..28a7c4366f ---- /dev/null -+++ b/doc/board/amlogic/beelink-gt1.rst -@@ -0,0 +1,98 @@ -+.. SPDX-License-Identifier: GPL-2.0+ -+ -+U-Boot for Beelink GT1/GT1-Ultimate -+=================================== -+ -+The Shenzen AZW (Beelink) GT1 and GT1-Ultimate are based on the Amlogic -+Q200 reference board with an S912 chip. -+ -+- 2GB or 3GB DDR3 RAM -+- 32GB eMMC -+- HDMI 2.1 video -+- S/PDIF optical output -+- 10/100/1000 Ethernet -+- AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.2) -+- 3x USB 2.0 ports -+- IR receiver -+- 1x micro SD card slot -+- 1x Power LED (white) -+- 1x Reset button (internal) -+ -+Beelink do not provide public schematics, but have been willing -+to share them with known distro developers on request. -+ -+U-Boot compilation -+------------------ -+ -+.. code-block:: bash -+ -+ $ export CROSS_COMPILE=aarch64-none-elf- -+ $ make beelink-gt1_defconfig -+ $ make -+ -+Image creation -+-------------- -+ -+Amlogic does not provide sources for the firmware and for tools needed -+to create the bootloader image. Beelink have provided the Amlogic SDK -+u-boot sources to known distro developers on-request, allowing FIPs to -+be generated. The GT1 (2GB) and GT1-Ultimate (3GB) models differ in -+RAM size and original Beelink devices use the same spec RAM chips and -+can share the same boot FIPs: -+ -+https://github.com/LibreELEC/amlogic-boot-fip/tree/master/beelink-gt1 -+ -+For simplified usage, pleaser refer to :doc:`pre-generated-fip` with codename `beelink-gt1` -+ -+.. code-block:: bash -+ -+ $ wget https://github.com/LibreELEC/amlogic-boot-fip/archive/master.zip -+ $ unzip master.zip -+ $ export FIPDIR=$PWD/amlogic-boot-fip/beelink-gt1 -+ -+Go back to the mainline U-Boot source tree then: -+ -+.. code-block:: bash -+ -+ $ mkdir fip -+ $ cp $FIPDIR/* fip/ -+ $ cp u-boot.bin fip/bl33.bin -+ -+ $ sh fip/blx_fix.sh \ -+ fip/bl30.bin \ -+ fip/zero_tmp \ -+ fip/bl30_zero.bin \ -+ fip/bl301.bin \ -+ fip/bl301_zero.bin \ -+ fip/bl30_new.bin \ -+ bl30 -+ -+ $ python fip/acs_tool.pyc fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0 -+ -+ $ sh fip/blx_fix.sh \ -+ fip/bl2_acs.bin \ -+ fip/zero_tmp \ -+ fip/bl2_zero.bin \ -+ fip/bl21.bin \ -+ fip/bl21_zero.bin \ -+ fip/bl2_new.bin \ -+ bl2 -+ -+ $ fip/gxl/aml_encrypt_gxl --bl3enc --input fip/bl30_new.bin -+ $ fip/gxl/aml_encrypt_gxl --bl3enc --input fip/bl31.img -+ $ fip/gxl/aml_encrypt_gxl --bl3enc --input fip/bl33.bin -+ $ fip/gxl/aml_encrypt_gxl --bl2sig --input fip/bl2_new.bin --output fip/bl2.n.bin.sig -+ $ fip/gxl/aml_encrypt_gxl --bootmk \ -+ --output fip/u-boot.bin \ -+ --bl2 fip/bl2.n.bin.sig \ -+ --bl30 fip/bl30_new.bin.enc \ -+ --bl31 fip/bl31.img.enc \ -+ --bl33 fip/bl33.bin.enc -+ -+And then write the image to SD or eMMC with: -+ -+.. code-block:: bash -+ -+ $ DEV=/dev/your_sd_device -+ $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=512 skip=1 seek=1 -+ $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=1 count=440 -diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst -index f0b92e4209..b8b6f9b98a 100644 ---- a/doc/board/amlogic/index.rst -+++ b/doc/board/amlogic/index.rst -@@ -15,10 +15,10 @@ This matrix concerns the actual source code version. - | | | S805X | S905D | | S905D2 | A311D | S905D3 | - | | | S905W | | | S905Y2 | | | - +===============================+===========+=================+==============+=============+============+=============+==============+ --| Boards | Odroid-C2 | P212 | Khadas VIM2 | S400 | U200 | Odroid-N2 | SEI610 | --| | Nanopi-K2 | Khadas-VIM | Libretech-PC | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | --| | P200 | LibreTech-CC v1 | WeTek Core2 | | Radxa Zero | GT-King/Pro | Odroid-C4 | --| | P201 | LibreTech-AC v2 | | | | GSKing-X | Odroid-HC4 | -+| Boards | Odroid-C2 | P212 | Beelink GT1 | S400 | U200 | Odroid-N2 | SEI610 | -+| | Nanopi-K2 | Khadas-VIM | Khadas VIM2 | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | -+| | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | -+| | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | - | | | JetHub J80 | | | | Radxa Zero2 | BananaPi-M5 | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ - | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | -@@ -93,6 +93,7 @@ Board Documentation - - beelink-gtking - beelink-gtkingpro -+ beelink-gt1 - jethub-j100 - jethub-j80 - khadas-vim2 --- -2.34.1 - diff --git a/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch b/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch deleted file mode 100644 index 03ad4f5c60..0000000000 --- a/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b4870c47202687c6a6880b449c97a2e32ec3d278 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Fri, 17 Feb 2023 05:49:44 +0000 -Subject: [PATCH 19/22] WIP: docs: boards: amlogic: update for BananaPi M2-Pro - -Signed-off-by: Christian Hewitt ---- - board/amlogic/u200/MAINTAINERS | 1 + - doc/board/amlogic/index.rst | 5 +++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS -index 47cec234a1..2a2d9d4c49 100644 ---- a/board/amlogic/u200/MAINTAINERS -+++ b/board/amlogic/u200/MAINTAINERS -@@ -4,6 +4,7 @@ S: Maintained - L: u-boot-amlogic@groups.io - F: board/amlogic/u200/ - F: configs/u200_defconfig -+F: configs/bananapi-m2-pro_defconfig - F: configs/bananapi-m5_defconfig - F: configs/radxa-zero_defconfig - F: doc/board/amlogic/u200.rst -diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst -index b8b6f9b98a..629284fca9 100644 ---- a/doc/board/amlogic/index.rst -+++ b/doc/board/amlogic/index.rst -@@ -19,7 +19,8 @@ This matrix concerns the actual source code version. - | | Nanopi-K2 | Khadas-VIM | Khadas VIM2 | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | - | | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | - | | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | --| | | JetHub J80 | | | | Radxa Zero2 | BananaPi-M5 | -+| | | JetHub J80 | | | | Radxa Zero2 | BPi-M2-Pro | -+| | | | | | | Radxa Zero2 | BPi-M5 | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ - | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ -@@ -37,7 +38,7 @@ This matrix concerns the actual source code version. - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ - | Multi-core | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ --| Fuse access | **Yes** | **Yes** |**Yes** |**Yes** |**Yes** |**Yes** | **Yes** | -+| Fuse access | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ - | SPI (FC) | **Yes** | **Yes** | **Yes** | **Yes** |**Yes** | **Yes** | No | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ --- -2.34.1 - diff --git a/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch b/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch deleted file mode 100644 index 68e1d2aa95..0000000000 --- a/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e1484036ca5e032a9039ed2f361f2b123a8efd64 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sat, 18 Feb 2023 08:08:42 +0000 -Subject: [PATCH 21/22] WIP: docs: boards: amlogic: update for BananaPi M2S - -Signed-off-by: Christian Hewitt ---- - board/amlogic/w400/MAINTAINERS | 2 ++ - doc/board/amlogic/index.rst | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS -index 6e1ef9b8b8..d4b4d4f91d 100644 ---- a/board/amlogic/w400/MAINTAINERS -+++ b/board/amlogic/w400/MAINTAINERS -@@ -3,6 +3,8 @@ M: Neil Armstrong - S: Maintained - L: u-boot-amlogic@groups.io - F: board/amlogic/w400/ -+F: configs/bananapi-m2s_defconfig - F: configs/radxa-zero2_defconfig - F: doc/board/amlogic/w400.rst -+F: doc/board/amlogic/bananapi-m2s.rst - F: doc/board/amlogic/radxa-zero2.rst -diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst -index 629284fca9..fd8d4185f8 100644 ---- a/doc/board/amlogic/index.rst -+++ b/doc/board/amlogic/index.rst -@@ -20,7 +20,7 @@ This matrix concerns the actual source code version. - | | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | - | | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | - | | | JetHub J80 | | | | Radxa Zero2 | BPi-M2-Pro | --| | | | | | | Radxa Zero2 | BPi-M5 | -+| | | | | | | BPI-M2S | BPi-M5 | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ - | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | - +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ --- -2.34.1 -