Skip to contentSkip to conversation

boards: amlogic: add BananaPi/Radxa/WeTek boards

PATCH In review Christian Hewitt 2 participants 21 messages Mar 23, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover boards: amlogic: add BananaPi/Radxa/WeTek boards

This series adds support for the following boards which are tested and booting fine with 2023.04-rc4:

- BananaPi M2-Pro (S905X3)
- BananaPi M2S (A311D or S922X)
- Radxa Zero2 (A311D)
- WeTek Hub (S905)
- WeTek Play2 (S905)

I also spotted that bananapi-m5 wasn't referrences in the u200 maintainer file so there's a patch to correct that too.

Changes since v1:
- Add reviews on M2-Pro/M2S/Zero2 dts/config patches
- Add a patch to correct a missing blank line in recently updated docs
- Fix commit message for Hub/Play2 config patch

Christian Hewitt (14):
docs: boards: amlogic: add bananapi-m5 to u200 maintainer file
docs: boards: amlogic: fix blank-line typo in recently updated docs
ARM: dts: add support for BananaPi M2-Pro
boards: add BananaPi M2-Pro defconfig
docs: boards: amlogic: add documentation for BananaPi M2-Pro
ARM: dts: add support for BananaPi M2S
boards: add BananaPi M2S defconfig
docs: boards: amlogic: add documentation for BananaPi M2S
ARM: dts: add support for Radxa Zero2
boards: amlogic: add Radxa Zero2 defconfig
doc: boards: amlogic: add documentation for Radxa Zero2
ARM: dts: add support for WeTek Hub and WeTek Play2
boards: amlogic: add WeTek Hub and WeTek Play2 defconfig
doc: boards: amlogic: add documentation for WeTek Hub and WeTek Play2

 arch/arm/dts/Makefile                         |   9 +-
 .../arm/dts/meson-g12b-a311d-bananapi-m2s.dts |  33 ++
 arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi  |   7 +
 arch/arm/dts/meson-g12b-bananapi.dtsi         | 521 ++++++++++++++++++
 .../dts/meson-g12b-radxa-zero2-u-boot.dtsi    |   7 +
 arch/arm/dts/meson-g12b-radxa-zero2.dts       | 489 ++++++++++++++++
 .../arm/dts/meson-g12b-s922x-bananapi-m2s.dts |  14 +
 arch/arm/dts/meson-gxbb-wetek-hub.dts         |  58 ++
 arch/arm/dts/meson-gxbb-wetek-play2.dts       | 119 ++++
 arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi     |  13 +
 arch/arm/dts/meson-gxbb-wetek.dtsi            | 292 ++++++++++
 .../dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi |  14 +
 arch/arm/dts/meson-sm1-bananapi-m2-pro.dts    |  97 ++++
 arch/arm/dts/meson-sm1-bananapi-m5.dts        | 427 +-------------
 arch/arm/dts/meson-sm1-bananapi.dtsi          | 435 +++++++++++++++
 board/amlogic/p200/MAINTAINERS                |   4 +
 board/amlogic/u200/MAINTAINERS                |   3 +
 board/amlogic/w400/MAINTAINERS                |   4 +
 configs/bananapi-m2-pro_defconfig             |  76 +++
 configs/bananapi-m2s_defconfig                |  82 +++
 configs/radxa-zero2_defconfig                 |  77 +++
 configs/wetek-hub_defconfig                   |  70 +++
 configs/wetek-play2_defconfig                 |  70 +++
 doc/board/amlogic/bananapi-cm4io.rst          |   1 +
 doc/board/amlogic/bananapi-m2pro.rst          | 143 +++++
 doc/board/amlogic/bananapi-m2s.rst            | 153 +++++
 doc/board/amlogic/bananapi-m5.rst             |   1 +
 doc/board/amlogic/beelink-gskingx.rst         |   1 +
 doc/board/amlogic/beelink-gtking.rst          |   1 +
 doc/board/amlogic/beelink-gtkingpro.rst       |   1 +
 doc/board/amlogic/index.rst                   |   5 +
 doc/board/amlogic/jethub-j100.rst             |   1 +
 doc/board/amlogic/jethub-j80.rst              |   1 +
 doc/board/amlogic/khadas-vim.rst              |   1 +
 doc/board/amlogic/khadas-vim2.rst             |   1 +
 doc/board/amlogic/khadas-vim3.rst             |   1 +
 doc/board/amlogic/khadas-vim3l.rst            |   1 +
 doc/board/amlogic/libretech-ac.rst            |   1 +
 doc/board/amlogic/libretech-cc.rst            |   1 +
 doc/board/amlogic/nanopi-k2.rst               |   1 +
 doc/board/amlogic/odroid-c2.rst               |   1 +
 doc/board/amlogic/odroid-c4.rst               |   1 +
 doc/board/amlogic/odroid-go-ultra.rst         |   1 +
 doc/board/amlogic/odroid-hc4.rst              |   1 +
 doc/board/amlogic/odroid-n2.rst               |   1 +
 doc/board/amlogic/odroid-n2l.rst              |   1 +
 doc/board/amlogic/p200.rst                    |   1 +
 doc/board/amlogic/p201.rst                    |   1 +
 doc/board/amlogic/q200.rst                    |   1 +
 doc/board/amlogic/radxa-zero.rst              |   1 +
 doc/board/amlogic/radxa-zero2.rst             |  80 +++
 doc/board/amlogic/s400.rst                    |   1 +
 doc/board/amlogic/sei510.rst                  |   1 +
 doc/board/amlogic/sei610.rst                  |   1 +
 doc/board/amlogic/u200.rst                    |   1 +
 doc/board/amlogic/w400.rst                    |   1 +
 doc/board/amlogic/wetek-core2.rst             |   1 +
 doc/board/amlogic/wetek-hub.rst               | 110 ++++
 doc/board/amlogic/wetek-play2.rst             | 115 ++++
 59 files changed, 3129 insertions(+), 428 deletions(-)
 create mode 100644 arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts
 create mode 100644 arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-g12b-bananapi.dtsi
 create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2.dts
 create mode 100644 arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts
 create mode 100644 arch/arm/dts/meson-gxbb-wetek-hub.dts
 create mode 100644 arch/arm/dts/meson-gxbb-wetek-play2.dts
 create mode 100644 arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-gxbb-wetek.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro.dts
 create mode 100644 arch/arm/dts/meson-sm1-bananapi.dtsi
 create mode 100644 configs/bananapi-m2-pro_defconfig
 create mode 100644 configs/bananapi-m2s_defconfig
 create mode 100644 configs/radxa-zero2_defconfig
 create mode 100644 configs/wetek-hub_defconfig
 create mode 100644 configs/wetek-play2_defconfig
 create mode 100644 doc/board/amlogic/bananapi-m2pro.rst
 create mode 100644 doc/board/amlogic/bananapi-m2s.rst
 create mode 100644 doc/board/amlogic/radxa-zero2.rst
 create mode 100644 doc/board/amlogic/wetek-hub.rst
 create mode 100644 doc/board/amlogic/wetek-play2.rst
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/14 docs: boards: amlogic: add bananapi-m5 to u200 maintainer file

The bananapi-m5 docs are missing from the file, so add them.

---
 board/amlogic/u200/MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
board/amlogic/u200/MAINTAINERS +1 -0
index 47cec234a1..919e349922 100644
@@ -7,4 +7,5 @@ F:	configs/u200_defconfig
 F:	configs/bananapi-m5_defconfig
 F:	configs/radxa-zero_defconfig
 F:	doc/board/amlogic/u200.rst
+F:	doc/board/amlogic/bananapi-m5.rst
 F:	doc/board/amlogic/radxa-zero.rst
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/14 docs: boards: amlogic: fix blank-line typo in recently updated docs

In reply to Christian Hewitt

There needs to be a blank line between the start of the code block and the first line of content. Fix for all recently updated docs.

---
 doc/board/amlogic/bananapi-cm4io.rst    | 1 +
 doc/board/amlogic/bananapi-m5.rst       | 1 +
 doc/board/amlogic/beelink-gskingx.rst   | 1 +
 doc/board/amlogic/beelink-gtking.rst    | 1 +
 doc/board/amlogic/beelink-gtkingpro.rst | 1 +
 doc/board/amlogic/jethub-j100.rst       | 1 +
 doc/board/amlogic/jethub-j80.rst        | 1 +
 doc/board/amlogic/khadas-vim.rst        | 1 +
 doc/board/amlogic/khadas-vim2.rst       | 1 +
 doc/board/amlogic/khadas-vim3.rst       | 1 +
 doc/board/amlogic/khadas-vim3l.rst      | 1 +
 doc/board/amlogic/libretech-ac.rst      | 1 +
 doc/board/amlogic/libretech-cc.rst      | 1 +
 doc/board/amlogic/nanopi-k2.rst         | 1 +
 doc/board/amlogic/odroid-c2.rst         | 1 +
 doc/board/amlogic/odroid-c4.rst         | 1 +
 doc/board/amlogic/odroid-go-ultra.rst   | 1 +
 doc/board/amlogic/odroid-hc4.rst        | 1 +
 doc/board/amlogic/odroid-n2.rst         | 1 +
 doc/board/amlogic/odroid-n2l.rst        | 1 +
 doc/board/amlogic/p200.rst              | 1 +
 doc/board/amlogic/p201.rst              | 1 +
 doc/board/amlogic/q200.rst              | 1 +
 doc/board/amlogic/radxa-zero.rst        | 1 +
 doc/board/amlogic/s400.rst              | 1 +
 doc/board/amlogic/sei510.rst            | 1 +
 doc/board/amlogic/sei610.rst            | 1 +
 doc/board/amlogic/u200.rst              | 1 +
 doc/board/amlogic/w400.rst              | 1 +
 doc/board/amlogic/wetek-core2.rst       | 1 +
 30 files changed, 30 insertions(+)
doc/board/amlogic/bananapi-cm4io.rst +1 -0
index aabe2ef197..672cbee7d8 100644
@@ -44,6 +44,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/bananapi-m5.rst +1 -0
index ddc14b4eef..009ea0ba94 100644
@@ -33,6 +33,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/beelink-gskingx.rst +1 -0
index 987d358c77..8a8296e863 100644
@@ -38,6 +38,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/beelink-gtking.rst +1 -0
index 342887d584..8171b698c7 100644
@@ -34,6 +34,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/beelink-gtkingpro.rst +1 -0
index 541938b103..eb0b7d4fd1 100644
@@ -35,6 +35,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/jethub-j100.rst +1 -0
index 0d63976789..86acdafa06 100644
@@ -42,6 +42,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/jethub-j80.rst +1 -0
index d20fbad4c5..9195df6905 100644
@@ -34,6 +34,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/khadas-vim.rst +1 -0
index f1fbe1a8a6..20370ed49a 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/khadas-vim2.rst +1 -0
index 78d47f93fe..58f18701f7 100644
@@ -32,6 +32,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/khadas-vim3.rst +1 -0
index 88f2e0ebbe..4959590b8b 100644
@@ -53,6 +53,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/khadas-vim3l.rst +1 -0
index 935f43c725..cd21466f70 100644
@@ -53,6 +53,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/libretech-ac.rst +1 -0
index 6ebb7f646d..fa151c0d00 100644
@@ -32,6 +32,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/libretech-cc.rst +1 -0
index d1d3ce49f6..08a84a41c0 100644
@@ -41,6 +41,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/nanopi-k2.rst +1 -0
index 2316dae0ec..53a0a41c88 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/odroid-c2.rst +1 -0
index 82eea3820e..922ab0c0b4 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/odroid-c4.rst +1 -0
index 89198cda91..6994b958cf 100644
@@ -32,6 +32,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/odroid-go-ultra.rst +1 -0
index 50d91394d4..c5bce32333 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/odroid-hc4.rst +1 -0
index 94c3312022..1d37be2d80 100644
@@ -33,6 +33,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/odroid-n2.rst +1 -0
index 8ca1f89699..883720f8fb 100644
@@ -34,6 +34,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/odroid-n2l.rst +1 -0
index b264ace7f5..6d58175974 100644
@@ -30,6 +30,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/p200.rst +1 -0
index b5c6ad096e..e223897a19 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/p201.rst +1 -0
index b3dce4204e..28aae98d99 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/q200.rst +1 -0
index c304980579..32ea4722e4 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/radxa-zero.rst +1 -0
index e8a8d87320..14ce3cfd49 100644
@@ -32,6 +32,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/s400.rst +1 -0
index b00fe64e1b..59dda82375 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/sei510.rst +1 -0
index 09b0f53e16..87cb701a08 100644
@@ -27,6 +27,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/sei610.rst +1 -0
index 84aaeff4ed..64f62575e2 100644
@@ -29,6 +29,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/u200.rst +1 -0
index 6d1d66b4ea..8254d4dfdb 100644
@@ -32,6 +32,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/w400.rst +1 -0
index 634fe1298d..d2a8107b58 100644
@@ -32,6 +32,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
doc/board/amlogic/wetek-core2.rst +1 -0
index 5eba566af4..137262ec30 100644
@@ -31,6 +31,7 @@ U-Boot Signing with Pre-Built FIP repo
 --------------------------------------
 
 .. code-block:: bash
+
     $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
     $ cd amlogic-boot-fip
     $ mkdir my-output-dir
Signature · 1 line
2.34.1
#3 lore raw

PATCH v2 3/14 ARM: dts: add support for BananaPi M2-Pro

In reply to Christian Hewitt

Import the board dts from the linux-amlogic/for-next (6.4-rc1) branch. This involves spliting the BPI-M5 dts into a dtsi and then reusing this for the M2-Pro.

---
 arch/arm/dts/Makefile                         |   5 +-
 .../dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi |  14 +
 arch/arm/dts/meson-sm1-bananapi-m2-pro.dts    |  97 ++++
 arch/arm/dts/meson-sm1-bananapi-m5.dts        | 427 +----------------
 arch/arm/dts/meson-sm1-bananapi.dtsi          | 435 ++++++++++++++++++
 5 files changed, 550 insertions(+), 428 deletions(-)
 create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro.dts
 create mode 100644 arch/arm/dts/meson-sm1-bananapi.dtsi
arch/arm/dts/Makefile +3 -2
index 0c149b636a..d6139429e5 100644
@@ -205,14 +205,15 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-g12a-sei510.dtb \
 	meson-g12a-u200.dtb \
 	meson-g12b-a311d-khadas-vim3.dtb \
+	meson-g12b-bananapi-cm4-cm4io.dtb \
+	meson-g12b-gsking-x.dtb \
 	meson-g12b-gtking.dtb \
 	meson-g12b-gtking-pro.dtb \
-	meson-g12b-gsking-x.dtb \
 	meson-g12b-odroid-go-ultra.dtb \
 	meson-g12b-odroid-n2.dtb \
 	meson-g12b-odroid-n2l.dtb \
 	meson-g12b-odroid-n2-plus.dtb \
-	meson-g12b-bananapi-cm4-cm4io.dtb \
+	meson-sm1-bananapi-m2-pro.dtb \
 	meson-sm1-bananapi-m5.dtb \
 	meson-sm1-khadas-vim3l.dtb \
 	meson-sm1-odroid-c4.dtb \
arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi new file +14 -0
new file mode 100644
index 0000000000..4a1aeda565
@@ -0,0 +1,14 @@
+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2021 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-sm1-u-boot.dtsi"
+
+&ethmac {
+	snps,reset-gpio = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+	snps,reset-delays-us = <0 10000 1000000>;
+	snps,reset-active-low;
+};
arch/arm/dts/meson-sm1-bananapi-m2-pro.dts new file +97 -0

97 lines not on this page · raw message

arch/arm/dts/meson-sm1-bananapi-m5.dts +1 -426

477 lines not on this page · raw message

arch/arm/dts/meson-sm1-bananapi.dtsi new file +435 -0

435 lines not on this page · raw message

Signature · 1 line
2.34.1
#4 lore raw

PATCH v2 4/14 boards: add BananaPi M2-Pro defconfig

In reply to Christian Hewitt

Add configuration for the BananaPi M2-Pro board.

---
 configs/bananapi-m2-pro_defconfig | 76 +++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 configs/bananapi-m2-pro_defconfig
configs/bananapi-m2-pro_defconfig new file +76 -0
new file mode 100644
index 0000000000..28b603fe20
@@ -0,0 +1,76 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_TEXT_BASE=0x01000000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-bananapi-m2-pro"
+CONFIG_MESON_G12A=y
+CONFIG_DEBUG_UART_BASE=0xff803000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_IDENT_STRING="bpi-m2-pro"
+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
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ADC=y
+CONFIG_SARADC_MESON=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_REALTEK=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+CONFIG_ETH_DESIGNWARE_MESON8B=y
+CONFIG_MDIO_MUX_MESON_G12A=y
+CONFIG_MESON_G12A_USB_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_RESET=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_MESON_G12A=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_VIDEO=y
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP16 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
+CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.34.1
#5 lore raw

PATCH v2 5/14 docs: boards: amlogic: add documentation for BananaPi M2-Pro

In reply to Christian Hewitt

Add build docs for the BPI-M2-PRO board.

---
 board/amlogic/u200/MAINTAINERS       |   2 +
 doc/board/amlogic/bananapi-m2pro.rst | 143 +++++++++++++++++++++++++++
 doc/board/amlogic/index.rst          |   1 +
 3 files changed, 146 insertions(+)
 create mode 100644 doc/board/amlogic/bananapi-m2pro.rst
board/amlogic/u200/MAINTAINERS +2 -0
index 919e349922..f429c212ba 100644
@@ -4,8 +4,10 @@ S:	Maintained
 L:	[email protected]
 F:	board/amlogic/u200/
 F:	configs/u200_defconfig
+F:	configs/bananapi-m2pro_defconfig
 F:	configs/bananapi-m5_defconfig
 F:	configs/radxa-zero_defconfig
 F:	doc/board/amlogic/u200.rst
+F:	doc/board/amlogic/bananapi-m2pro.rst
 F:	doc/board/amlogic/bananapi-m5.rst
 F:	doc/board/amlogic/radxa-zero.rst
doc/board/amlogic/bananapi-m2pro.rst new file +143 -0

143 lines not on this page · raw message

doc/board/amlogic/index.rst +1 -0
index 9b76bca427..8388acdd11 100644
@@ -86,6 +86,7 @@ Board Documentation
    :maxdepth: 1
 
    bananapi-cm4io
+   bananapi-m2pro
    bananapi-m5
    beelink-gskingx
    beelink-gtking
Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 5/14
#6 lore raw

Re: [PATCH v2 05/14] docs: boards: amlogic: add documentation for BananaPi M2-Pro

Quoted 179 lines · Christian Hewitt

Add build docs for the BPI-M2-PRO board.

---
  board/amlogic/u200/MAINTAINERS       |   2 +
  doc/board/amlogic/bananapi-m2pro.rst | 143 +++++++++++++++++++++++++++
  doc/board/amlogic/index.rst          |   1 +
  3 files changed, 146 insertions(+)

create mode 100644 doc/board/amlogic/bananapi-m2pro.rst

board/amlogic/u200/MAINTAINERS +2 -0
index 919e349922..f429c212ba 100644
@@ -4,8 +4,10 @@ S:	Maintained
  L:	[email protected]
  F:	board/amlogic/u200/
  F:	configs/u200_defconfig
+F:	configs/bananapi-m2pro_defconfig
  F:	configs/bananapi-m5_defconfig
  F:	configs/radxa-zero_defconfig
  F:	doc/board/amlogic/u200.rst
+F:	doc/board/amlogic/bananapi-m2pro.rst
  F:	doc/board/amlogic/bananapi-m5.rst
  F:	doc/board/amlogic/radxa-zero.rst
doc/board/amlogic/bananapi-m2pro.rst new file +143 -0
new file mode 100644
index 0000000000..6c35943bac
@@ -0,0 +1,143 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+U-Boot for BananaPi BPI-M2-PRO (S905X3)
+=======================================
+
+BananaPi BPI-M2-PRO is a Single Board Computer manufactured by Sinovoip with the
+following specification:
+
+ - Amlogic S905X3 Arm Cortex-A55 quad-core SoC
+ - 2GB DDR4 SDRAM
+ - 16GB eMMC
+ - Gigabit Ethernet
+ - RTL8821CU USB WiFi (a/b/g/n/ac) + BT 5.0
+ - HDMI 2.1 display
+ - 40-pin GPIO header
+ - 2x USB 3.0 Host
+ - 1x DC Jack (power)
+ - microSD
+ - UART serial
+ - Infrared receiver
+
+Schematics are available from the manufacturer: https://wiki.banana-pi.org/Banana_Pi_BPI-M2_Pro
+
+U-Boot Compilation
+------------------
+
+.. code-block:: bash
+
+    $ export CROSS_COMPILE=aarch64-none-elf-
+    $ make bananapi-m2pro_defconfig
+    $ make
+
+U-Boot Signing with Pre-Built FIP repo
+--------------------------------------
+
+.. code-block:: bash
+
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip
+    $ mkdir my-output-dir
+    $ ./build-fip.sh bananapi-m2pro /path/to/u-boot/u-boot.bin my-output-dir
+
+U-Boot Manual Signing
+---------------------
+
+Amlogic does not provide sources for the firmware and tools needed to create a bootloader
+image so it is necessary to obtain binaries from sources published by the board vendor:
+
+.. code-block:: bash
+
+    $ wget https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
+    $ wget https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-arm-none-eabi-4.8-2013.11_linux.tar.xz
+    $ tar xvfJ gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
+    $ tar xvfJ gcc-linaro-arm-none-eabi-4.8-2013.11_linux.tar.xz
+    $ export PATH=$PWD/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux/bin:$PWD/gcc-linaro-arm-none-eabi-4.8-2013.11_linux/bin:$PATH
+
+    $ DIR=bananapi-m2pro
+    $ git clone --depth 1 https://github.com/Dangku/amlogic-u-boot.git -b odroidg12-v2015.01-c4-m5 $DIR
+
+    $ cd $DIR
+    $ make bananapi_m2pro_defconfig
+    $ make
+    $ export UBOOTDIR=$PWD
+
+Go back to the mainline U-Boot source tree then:
+
+.. code-block:: bash
+
+    $ mkdir fip
+
+    $ wget https://github.com/BayLibre/u-boot/releases/download/v2017.11-libretech-cc/blx_fix_g12a.sh -O fip/blx_fix.sh
+    $ cp $UBOOTDIR/build/scp_task/bl301.bin fip/
+    $ cp $UBOOTDIR/build/board/bananapi/bananpi_m5/firmware/acs.bin fip/
+    $ cp $UBOOTDIR/fip/g12a/bl2.bin fip/
+    $ cp $UBOOTDIR/fip/g12a/bl30.bin fip/
+    $ cp $UBOOTDIR/fip/g12a/bl31.img fip/
+    $ cp $UBOOTDIR/fip/g12a/ddr3_1d.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/ddr4_1d.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/ddr4_2d.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/diag_lpddr4.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/lpddr3_1d.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/lpddr4_1d.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/lpddr4_2d.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/piei.fw fip/
+    $ cp $UBOOTDIR/fip/g12a/aml_ddr.fw 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
+
+    $ sh fip/blx_fix.sh \
+         fip/bl2.bin \
+         fip/zero_tmp \
+         fip/bl2_zero.bin \
+         fip/acs.bin \
+         fip/bl21_zero.bin \
+         fip/bl2_new.bin \
+         bl2
+
+    $ $UBOOTDIR/fip/g12a/aml_encrypt_g12a --bl30sig --input fip/bl30_new.bin \
+                                          --output fip/bl30_new.bin.g12a.enc \
+                                          --level v3
+    $ $UBOOTDIR/fip/g12a/aml_encrypt_g12a --bl3sig --input fip/bl30_new.bin.g12a.enc \
+                                          --output fip/bl30_new.bin.enc \
+                                          --level v3 --type bl30
+    $ $UBOOTDIR/fip/g12a/aml_encrypt_g12a --bl3sig --input fip/bl31.img \
+                                          --output fip/bl31.img.enc \
+                                          --level v3 --type bl31
+    $ $UBOOTDIR/fip/g12a/aml_encrypt_g12a --bl3sig --input fip/bl33.bin --compress lz4 \
+                                          --output fip/bl33.bin.enc \
+                                          --level v3 --type bl33 --compress lz4
+    $ $UBOOTDIR/fip/g12a/aml_encrypt_g12a --bl2sig --input fip/bl2_new.bin \
+                                          --output fip/bl2.n.bin.sig
+    $ $UBOOTDIR/fip/g12a/aml_encrypt_g12a --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 \
+                                          --ddrfw1 fip/ddr4_1d.fw \
+                                          --ddrfw2 fip/ddr4_2d.fw \
+                                          --ddrfw3 fip/ddr3_1d.fw \
+                                          --ddrfw4 fip/piei.fw \
+                                          --ddrfw5 fip/lpddr4_1d.fw \
+                                          --ddrfw6 fip/lpddr4_2d.fw \
+                                          --ddrfw7 fip/diag_lpddr4.fw \
+                                          --ddrfw8 fip/aml_ddr.fw \
+                                          --ddrfw9 fip/lpddr3_1d.fw \
+                                          --level v3
+
+Then write the image to SD or eMMC with:
+
+.. code-block:: bash
+
+    $ DEV=/dev/boot_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
doc/board/amlogic/index.rst +0 -0
index 9b76bca427..8388acdd11 100644

doc/board/amlogic/index.rst Board Documentation · line 92

Quoted 7 lines
doc/board/amlogic/index.rst +1 -0
@@ -86,6 +86,7 @@ Board Documentation
     :maxdepth: 1
 
     bananapi-cm4io
+   bananapi-m2pro
     bananapi-m5
     beelink-gskingx
     beelink-gtking
#7 lore raw

PATCH v2 6/14 ARM: dts: add support for BananaPi M2S

In reply to Christian Hewitt

Import the device-tree from linux-amlogic/for-next (Linux 6.4-rc1) and omit the NPU node from the A311D board variant dts as this is not supported under U-Boot.

---
 arch/arm/dts/Makefile                         |   1 +
 .../arm/dts/meson-g12b-a311d-bananapi-m2s.dts |  33 ++
 arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi  |   7 +
 arch/arm/dts/meson-g12b-bananapi.dtsi         | 521 ++++++++++++++++++
 .../arm/dts/meson-g12b-s922x-bananapi-m2s.dts |  14 +
 5 files changed, 576 insertions(+)
 create mode 100644 arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts
 create mode 100644 arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-g12b-bananapi.dtsi
 create mode 100644 arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts
arch/arm/dts/Makefile +1 -0
index d6139429e5..eb20524a99 100644
@@ -204,6 +204,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-g12a-radxa-zero.dtb \
 	meson-g12a-sei510.dtb \
 	meson-g12a-u200.dtb \
+	meson-g12b-a311d-bananapi-m2s.dtb \
 	meson-g12b-a311d-khadas-vim3.dtb \
 	meson-g12b-bananapi-cm4-cm4io.dtb \
 	meson-g12b-gsking-x.dtb \
arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts new file +33 -0
new file mode 100644
index 0000000000..31365316b2
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Christian Hewitt <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "meson-g12b-a311d.dtsi"
+#include "meson-g12b-bananapi.dtsi"
+
+/ {
+	compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b";
+	model = "BananaPi M2S";
+
+	aliases {
+		i2c0 = &i2c1;
+		i2c1 = &i2c3;
+	};
+};
+
+/* Camera (CSI) bus */
+&i2c1 {
+	status = "okay";
+	pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;
+	pinctrl-names = "default";
+};
+
+/* Display (DSI) bus */
+&i2c3 {
+	status = "okay";
+	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
+	pinctrl-names = "default";
+};
arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi new file +7 -0
new file mode 100644
index 0000000000..236f2468dc
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"
arch/arm/dts/meson-g12b-bananapi.dtsi new file +521 -0

521 lines not on this page · raw message

arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts new file +14 -0
new file mode 100644
index 0000000000..7f66f263a2
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Christian Hewitt <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "meson-g12b-s922x.dtsi"
+#include "meson-g12b-bananapi.dtsi"
+
+/ {
+	compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b";
+	model = "BananaPi M2S";
+};
Signature · 1 line
2.34.1
#8 lore raw

PATCH v2 7/14 boards: add BananaPi M2S defconfig

In reply to Christian Hewitt

Add configuration for the Bananapi BPI-M2S.

---
 configs/bananapi-m2s_defconfig | 82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 configs/bananapi-m2s_defconfig
configs/bananapi-m2s_defconfig new file +82 -0
new file mode 100644
index 0000000000..3109e0ce48
@@ -0,0 +1,82 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_TEXT_BASE=0x01000000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-bananapi-m2s"
+CONFIG_MESON_G12A=y
+CONFIG_DEBUG_UART_BASE=0xff803000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_IDENT_STRING=" bpi-m2s"
+CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DEBUG_UART=y
+CONFIG_AHCI=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
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ADC=y
+CONFIG_SARADC_MESON=y
+CONFIG_AHCI_PCI=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_REALTEK=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+CONFIG_ETH_DESIGNWARE_MESON8B=y
+CONFIG_MDIO_MUX_MESON_G12A=y
+CONFIG_PCI=y
+CONFIG_PCIE_DW_MESON=y
+CONFIG_MESON_G12A_USB_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RESET=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_MESON_G12A=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_VIDEO=y
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP16 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
+CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.34.1
#9 lore raw

PATCH v2 8/14 docs: boards: amlogic: add documentation for BananaPi M2S

In reply to Christian Hewitt

Add build docs for the BPI-M2S board.

---
 board/amlogic/w400/MAINTAINERS     |   2 +
 doc/board/amlogic/bananapi-m2s.rst | 153 +++++++++++++++++++++++++++++
 doc/board/amlogic/index.rst        |   1 +
 3 files changed, 156 insertions(+)
 create mode 100644 doc/board/amlogic/bananapi-m2s.rst
board/amlogic/w400/MAINTAINERS +2 -0
index 26a4c2c587..042b523056 100644
@@ -4,5 +4,7 @@ S:	Maintained
 L:	[email protected]
 F:	board/amlogic/w400/
 F:	configs/bananapi-cm4-cm4io_defconfig
+F:	configs/bananapi-m2s_defconfig
 F:	doc/board/amlogic/w400.rst
 F:	doc/board/amlogic/bananapi-cm4io.rst
+F:	doc/board/amlogic/bananapi-m2s.rst
doc/board/amlogic/bananapi-m2s.rst new file +153 -0

153 lines not on this page · raw message

doc/board/amlogic/index.rst +1 -0
index 8388acdd11..fa1b362731 100644
@@ -87,6 +87,7 @@ Board Documentation
 
    bananapi-cm4io
    bananapi-m2pro
+   bananapi-m2s
    bananapi-m5
    beelink-gskingx
    beelink-gtking
Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 8/14
#10 lore raw

Re: [PATCH v2 08/14] docs: boards: amlogic: add documentation for BananaPi M2S

Quoted 186 lines · Christian Hewitt

Add build docs for the BPI-M2S board.

---
  board/amlogic/w400/MAINTAINERS     |   2 +
  doc/board/amlogic/bananapi-m2s.rst | 153 +++++++++++++++++++++++++++++
  doc/board/amlogic/index.rst        |   1 +
  3 files changed, 156 insertions(+)

create mode 100644 doc/board/amlogic/bananapi-m2s.rst

board/amlogic/w400/MAINTAINERS +2 -0
index 26a4c2c587..042b523056 100644
@@ -4,5 +4,7 @@ S:	Maintained
  L:	[email protected]
  F:	board/amlogic/w400/
  F:	configs/bananapi-cm4-cm4io_defconfig
+F:	configs/bananapi-m2s_defconfig
  F:	doc/board/amlogic/w400.rst
  F:	doc/board/amlogic/bananapi-cm4io.rst
+F:	doc/board/amlogic/bananapi-m2s.rst
doc/board/amlogic/bananapi-m2s.rst new file +153 -0
new file mode 100644
index 0000000000..4a1be47b35
@@ -0,0 +1,153 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+U-Boot for BananaPi M2S (A311D & S922X)
+=======================================
+
+BananaPi BPI-M2S ships is a Single Board Computer manufactured by Sinovoip that ships in
+two variants with Amlogic S922X or A311D SoC and the following common specification:
+
+- 16GB eMMC
+- HDMI 2.1a video
+- 2x 10/100/1000 Base-T Ethernet (1x RTL8211F, 1x RTL811H)
+- 2x USB 2.0 ports
+- 2x Status LED's (green/blue)
+- 1x Power/Reset button
+- 1x micro SD card slot
+- 40-pin GPIO header
+- PWM fan header
+- UART header
+
+The S992X variant has:
+- 2GB LPDDR4 RAM
+
+The A311D variant has:
+
+- 4GB LPDDR4 RAM
+- NPU (5.0 TOPS)
+- MIPI DSI header
+- MIPI CSI header
+
+An optional RTL8822CS SDIO WiFi/BT mezzanine is available for both board variants.
+
+Schematics are available from the manufacturer: https://wiki.banana-pi.org/Banana_Pi_BPI-M2S
+
+U-Boot Compilation
+------------------
+
+.. code-block:: bash
+
+    $ export CROSS_COMPILE=aarch64-none-elf-
+    $ make bananapi-m2s_defconfig
+    $ make
+
+U-Boot Signing with Pre-Built FIP repo
+--------------------------------------
+
+.. code-block:: bash
+
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip
+    $ mkdir my-output-dir
+    $ ./build-fip.sh bananapi-m2s /path/to/u-boot/u-boot.bin my-output-dir
+
+U-Boot Manual Signing
+---------------------
+
+Amlogic does not provide sources for the firmware and tools needed to create a bootloader
+image so it is necessary to obtain binaries from sources published by the board vendor:
+
+.. code-block:: bash
+
+    $ wget https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
+    $ wget https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-arm-none-eabi-4.8-2013.11_linux.tar.xz
+    $ tar xvfJ gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
+    $ tar xvfJ gcc-linaro-arm-none-eabi-4.8-2013.11_linux.tar.xz
+    $ export PATH=$PWD/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux/bin:$PWD/gcc-linaro-arm-none-eabi-4.8-2013.11_linux/bin:$PATH
+
+    $ DIR=bananapi-m2s
+    $ git clone --depth 1 https://github.com/Dangku/amlogic-u-boot.git -b khadas-g12b-v2015.01-m2s $DIR
+
+    $ cd $DIR
+    $ make bananapi_m2s_defconfig
+    $ make
+    $ export UBDIR=$PWD
+
+Go back to the mainline U-Boot source tree then:
+
+.. code-block:: bash
+
+    $ mkdir fip
+
+    $ wget https://github.com/BayLibre/u-boot/releases/download/v2017.11-libretech-cc/blx_fix_g12a.sh -O fip/blx_fix.sh
+    $ cp $UBDIR/build/scp_task/bl301.bin fip/
+    $ cp $UBDIR/build/board/bananapi/bananpi_m2s/firmware/acs.bin fip/
+    $ cp $UBDIR/fip/g12a/bl2.bin fip/
+    $ cp $UBDIR/fip/g12a/bl30.bin fip/
+    $ cp $UBDIR/fip/g12a/bl31.img fip/
+    $ cp $UBDIR/fip/g12a/ddr3_1d.fw fip/
+    $ cp $UBDIR/fip/g12a/ddr4_1d.fw fip/
+    $ cp $UBDIR/fip/g12a/ddr4_2d.fw fip/
+    $ cp $UBDIR/fip/g12a/diag_lpddr4.fw fip/
+    $ cp $UBDIR/fip/g12a/lpddr3_1d.fw fip/
+    $ cp $UBDIR/fip/g12a/lpddr4_1d.fw fip/
+    $ cp $UBDIR/fip/g12a/lpddr4_2d.fw fip/
+    $ cp $UBDIR/fip/g12a/piei.fw fip/
+    $ cp $UBDIR/fip/g12a/aml_ddr.fw 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
+
+    $ sh fip/blx_fix.sh \
+         fip/bl2.bin \
+         fip/zero_tmp \
+         fip/bl2_zero.bin \
+         fip/acs.bin \
+         fip/bl21_zero.bin \
+         fip/bl2_new.bin \
+         bl2
+
+    $ $UBDIR/fip/g12b/aml_encrypt_g12b --bl30sig --input fip/bl30_new.bin \
+                                       --output fip/bl30_new.bin.g12a.enc \
+                                       --level v3
+    $ $UBDIR/fip/g12b/aml_encrypt_g12b --bl3sig --input fip/bl30_new.bin.g12a.enc \
+                                       --output fip/bl30_new.bin.enc \
+                                       --level v3 --type bl30
+    $ $UBDIR/fip/g12b/aml_encrypt_g12b --bl3sig --input fip/bl31.img \
+                                       --output fip/bl31.img.enc \
+                                       --level v3 --type bl31
+    $ $UBDIR/fip/g12b/aml_encrypt_g12b --bl3sig --input fip/bl33.bin --compress lz4 \
+                                       --output fip/bl33.bin.enc \
+                                       --level v3 --type bl33 --compress lz4
+    $ $UBDIR/fip/g12b/aml_encrypt_g12b --bl2sig --input fip/bl2_new.bin \
+                                       --output fip/bl2.n.bin.sig
+    $ $UBDIR/fip/g12b/aml_encrypt_g12b --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 \
+                                       --ddrfw1 fip/ddr4_1d.fw \
+                                       --ddrfw2 fip/ddr4_2d.fw \
+                                       --ddrfw3 fip/ddr3_1d.fw \
+                                       --ddrfw4 fip/piei.fw \
+                                       --ddrfw5 fip/lpddr4_1d.fw \
+                                       --ddrfw6 fip/lpddr4_2d.fw \
+                                       --ddrfw7 fip/diag_lpddr4.fw \
+                                       --ddrfw8 fip/aml_ddr.fw \
+                                       --ddrfw9 fip/lpddr3_1d.fw \
+                                       --level v3
+
+Then write the image to SD or eMMC with:
+
+.. code-block:: bash
+
+    $ DEV=/dev/boot_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
doc/board/amlogic/index.rst +0 -0
index 8388acdd11..fa1b362731 100644

doc/board/amlogic/index.rst Board Documentation · line 93

Quoted 7 lines
doc/board/amlogic/index.rst +1 -0
@@ -87,6 +87,7 @@ Board Documentation
 
     bananapi-cm4io
     bananapi-m2pro
+   bananapi-m2s
     bananapi-m5
     beelink-gskingx
     beelink-gtking
#11 lore raw

PATCH v2 9/14 ARM: dts: add support for Radxa Zero2

In reply to Christian Hewitt

Import the device-tree from linux-amlogic/for-next (Linux 6.4-rc1) to support the Radxa-Zero2 board.

---
 arch/arm/dts/Makefile                         |   1 +
 .../dts/meson-g12b-radxa-zero2-u-boot.dtsi    |   7 +
 arch/arm/dts/meson-g12b-radxa-zero2.dts       | 489 ++++++++++++++++++
 3 files changed, 497 insertions(+)
 create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2.dts
arch/arm/dts/Makefile +1 -0
index eb20524a99..42da335bb5 100644
@@ -214,6 +214,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-g12b-odroid-n2.dtb \
 	meson-g12b-odroid-n2l.dtb \
 	meson-g12b-odroid-n2-plus.dtb \
+	meson-g12b-radxa-zero2.dtb \
 	meson-sm1-bananapi-m2-pro.dtb \
 	meson-sm1-bananapi-m5.dtb \
 	meson-sm1-khadas-vim3l.dtb \
arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi new file +7 -0
new file mode 100644
index 0000000000..236f2468dc
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"
arch/arm/dts/meson-g12b-radxa-zero2.dts new file +489 -0

489 lines not on this page · raw message

Signature · 1 line
2.34.1
#12 lore raw

PATCH v2 10/14 boards: amlogic: add Radxa Zero2 defconfig

In reply to Christian Hewitt

Add board configuration for the Radxa Zero2.

---
 configs/radxa-zero2_defconfig | 77 +++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 configs/radxa-zero2_defconfig
configs/radxa-zero2_defconfig new file +77 -0
new file mode 100644
index 0000000000..2218b0db7d
@@ -0,0 +1,77 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_TEXT_BASE=0x01000000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-radxa-zero2"
+CONFIG_MESON_G12A=y
+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
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+# CONFIG_PHY_REALTEK is not set
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+# CONFIG_ETH_DESIGNWARE_MESON8B is not set
+CONFIG_MDIO_MUX_MESON_G12A=y
+CONFIG_MESON_G12A_USB_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_RESET=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_MESON_G12A=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_VIDEO=y
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP16 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
+CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.34.1
#13 lore raw

PATCH v2 11/14 doc: boards: amlogic: add documentation for Radxa Zero2

In reply to Christian Hewitt

Add build docs for the Radxa Zero2 board.

---
 board/amlogic/w400/MAINTAINERS    |  2 +
 doc/board/amlogic/index.rst       |  1 +
 doc/board/amlogic/radxa-zero2.rst | 80 +++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 doc/board/amlogic/radxa-zero2.rst
board/amlogic/w400/MAINTAINERS +2 -0
index 042b523056..117f79ea04 100644
@@ -5,6 +5,8 @@ L:	[email protected]
 F:	board/amlogic/w400/
 F:	configs/bananapi-cm4-cm4io_defconfig
 F:	configs/bananapi-m2s_defconfig
+F:	configs/radxa-zero2_defconfig
 F:	doc/board/amlogic/w400.rst
 F:	doc/board/amlogic/bananapi-cm4io.rst
 F:	doc/board/amlogic/bananapi-m2s.rst
+F:	doc/board/amlogic/radxa-zero2.rst
doc/board/amlogic/index.rst +1 -0
index fa1b362731..71b7e1f3ed 100644
@@ -112,6 +112,7 @@ Board Documentation
    p212
    q200
    radxa-zero
+   radxa-zero2
    sei510
    sei610
    s400
doc/board/amlogic/radxa-zero2.rst new file +80 -0

80 lines not on this page · raw message

Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 11/14
#14 lore raw

Re: [PATCH v2 11/14] doc: boards: amlogic: add documentation for Radxa Zero2

Quoted 111 lines · Christian Hewitt

Add build docs for the Radxa Zero2 board.

---
  board/amlogic/w400/MAINTAINERS    |  2 +
  doc/board/amlogic/index.rst       |  1 +
  doc/board/amlogic/radxa-zero2.rst | 80 +++++++++++++++++++++++++++++++
  3 files changed, 83 insertions(+)

create mode 100644 doc/board/amlogic/radxa-zero2.rst

board/amlogic/w400/MAINTAINERS +2 -0
index 042b523056..117f79ea04 100644
@@ -5,6 +5,8 @@ L:	[email protected]
  F:	board/amlogic/w400/
  F:	configs/bananapi-cm4-cm4io_defconfig
  F:	configs/bananapi-m2s_defconfig
+F:	configs/radxa-zero2_defconfig
  F:	doc/board/amlogic/w400.rst
  F:	doc/board/amlogic/bananapi-cm4io.rst
  F:	doc/board/amlogic/bananapi-m2s.rst
+F:	doc/board/amlogic/radxa-zero2.rst
doc/board/amlogic/index.rst +1 -0
index fa1b362731..71b7e1f3ed 100644
@@ -112,6 +112,7 @@ Board Documentation
     p212
     q200
     radxa-zero
+   radxa-zero2
     sei510
     sei610
     s400
doc/board/amlogic/radxa-zero2.rst new file +70 -0
new file mode 100644
index 0000000000..dccf592459
@@ -0,0 +1,80 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+U-Boot for Radxa Zero2 (A311D)
+==============================
+
+Radxa Zero2 is a small form factor SBC based on the Amlogic A311D chipset with the
+following specification:
+
+- 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
+- 40 Pin GPIO header
+
+Schematics are available on request from Radxa.
+
+U-Boot Compilation
+------------------
+
+.. code-block:: bash
+
+    $ export CROSS_COMPILE=aarch64-none-elf-
+    $ make radxa-zero2_defconfig
+    $ make
+
+U-Boot Signing with Pre-Built FIP repo
+--------------------------------------
+
+.. code-block:: bash
+
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip
+    $ mkdir my-output-dir
+    $ ./build-fip.sh radxa-zero2 /path/to/u-boot/u-boot.bin my-output-dir
+
+U-Boot Manual Signing
+---------------------
+
+Amlogic does not provide sources for the firmware and tools needed to create a bootloader
+image so it is necessary to obtain binaries from sources published by the board vendor:
+
+.. code-block:: bash
+
+    $ git clone -b radxa-zero-v2021.07 https://github.com/radxa/u-boot.git
+    $ git clone https://github.com/radxa/fip.git
+
+    $ sudo apt-get install -y gcc-aarch64-linux-gnu device-tree-compiler libncurses5 libncurses5-dev
+    $ sudo apt-get install -y bc python dosfstools flex build-essential libssl-dev mtools
+
+    $ wget https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+    $ sudo tar xvf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz -C /opt
+
+    $ 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-zero2_defconfig
+    $ make
+
+    $ cp u-boot.bin ../fip/radxa-zero2/bl33.bin
+    $ cd ../fip/radxa-zero2
+    $ make
+
+This will generate the signed U-Boot binaries:
+
+.. code-block:: bash

doc/board/amlogic/radxa-zero2.rst line 80

Quoted 10 lines
doc/board/amlogic/radxa-zero2.rst new file +10 -0
+
+    $ u-boot.bin u-boot.bin.sd.bin u-boot.bin.usb.bl2 u-boot.bin.usb.tpl
+
+Then write U-Boot to SD or eMMC with:
+
+.. code-block:: bash
+
+    $ DEV=/dev/boot_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
#15 lore raw

PATCH v2 12/14 ARM: dts: add support for WeTek Hub and WeTek Play2

In reply to Christian Hewitt

Import the dts files from linux-amlogic/for-next (Linux 6.4-rc1) and add the old PHY reset bindings for dwmac to the u-boot.dtsi until we support the new bindings in the PHY node. Without this the PHY is not functional in u-boot or Linux.

---
 arch/arm/dts/Makefile                     |   2 +
 arch/arm/dts/meson-gxbb-wetek-hub.dts     |  58 +++++
 arch/arm/dts/meson-gxbb-wetek-play2.dts   | 119 +++++++++
 arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi |  13 +
 arch/arm/dts/meson-gxbb-wetek.dtsi        | 292 ++++++++++++++++++++++
 5 files changed, 484 insertions(+)
 create mode 100644 arch/arm/dts/meson-gxbb-wetek-hub.dts
 create mode 100644 arch/arm/dts/meson-gxbb-wetek-play2.dts
 create mode 100644 arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-gxbb-wetek.dtsi
arch/arm/dts/Makefile +2 -0
index 42da335bb5..1c843882d1 100644
@@ -191,6 +191,8 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-gxbb-nanopi-k2.dtb \
 	meson-gxbb-p200.dtb \
 	meson-gxbb-p201.dtb \
+	meson-gxbb-wetek-hub.dtb \
+	meson-gxbb-wetek-play2.dtb \
 	meson-gxl-s805x-libretech-ac.dtb \
 	meson-gxl-s905d-libretech-pc.dtb \
 	meson-gxl-s905w-jethome-jethub-j80.dtb \
arch/arm/dts/meson-gxbb-wetek-hub.dts new file +58 -0

58 lines not on this page · raw message

arch/arm/dts/meson-gxbb-wetek-play2.dts new file +119 -0

119 lines not on this page · raw message

arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi new file +13 -0
new file mode 100644
index 0000000000..3743053eb9
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-gx-u-boot.dtsi"
+
+&ethmac {
+	snps,reset-gpio = <&gpio GPIOZ_14 0>;
+	snps,reset-delays-us = <0 10000 1000000>;
+	snps,reset-active-low;
+};
arch/arm/dts/meson-gxbb-wetek.dtsi new file +292 -0

292 lines not on this page · raw message

Signature · 1 line
2.34.1
#16 lore raw

PATCH v2 13/14 boards: amlogic: add WeTek Hub and WeTek Play2 defconfig

In reply to Christian Hewitt

Add configurations for the WeTek Hub and WeTek Play2 boards.

---
 board/amlogic/p200/MAINTAINERS |  2 +
 configs/wetek-hub_defconfig    | 70 ++++++++++++++++++++++++++++++++++
 configs/wetek-play2_defconfig  | 70 ++++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+)
 create mode 100644 configs/wetek-hub_defconfig
 create mode 100644 configs/wetek-play2_defconfig
board/amlogic/p200/MAINTAINERS +2 -0
index 33ca3df5c6..264218e3be 100644
@@ -7,6 +7,8 @@ F:	board/amlogic/p200/
 F:	configs/nanopi-k2_defconfig
 F:	configs/odroid-c2_defconfig
 F:	configs/p200_defconfig
+F:	configs/wetek-hub_defconfig
+F:	configs/wetek-play2_defconfig
 F:	doc/board/amlogic/p200.rst
 F:	doc/board/amlogic/nanopi-k2.rst
 F:	doc/board/amlogic/odroid-c2.rst
configs/wetek-hub_defconfig new file +70 -0

70 lines not on this page · raw message

configs/wetek-play2_defconfig new file +70 -0

70 lines not on this page · raw message

Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 13/14
#17 lore raw

Re: [PATCH v2 13/14] boards: amlogic: add WeTek Hub and WeTek Play2 defconfig

Quoted 166 lines · Christian Hewitt

Add configurations for the WeTek Hub and WeTek Play2 boards.

---
  board/amlogic/p200/MAINTAINERS |  2 +
  configs/wetek-hub_defconfig    | 70 ++++++++++++++++++++++++++++++++++
  configs/wetek-play2_defconfig  | 70 ++++++++++++++++++++++++++++++++++
  3 files changed, 142 insertions(+)

create mode 100644 configs/wetek-hub_defconfig create mode 100644 configs/wetek-play2_defconfig

board/amlogic/p200/MAINTAINERS +2 -0
index 33ca3df5c6..264218e3be 100644
@@ -7,6 +7,8 @@ F:	board/amlogic/p200/
  F:	configs/nanopi-k2_defconfig
  F:	configs/odroid-c2_defconfig
  F:	configs/p200_defconfig
+F:	configs/wetek-hub_defconfig
+F:	configs/wetek-play2_defconfig
  F:	doc/board/amlogic/p200.rst
  F:	doc/board/amlogic/nanopi-k2.rst
  F:	doc/board/amlogic/odroid-c2.rst
configs/wetek-hub_defconfig new file +70 -0
new file mode 100644
index 0000000000..634833f7fe
@@ -0,0 +1,70 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_TEXT_BASE=0x01000000
+CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEBUG_UART_BASE=0xc81004c0
+CONFIG_DEBUG_UART_CLOCK=24000000
+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
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+CONFIG_CMD_ADC=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SARADC_MESON=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MESON=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_REALTEK=y
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE_MESON8B=y
+CONFIG_PHY=y
+CONFIG_MESON_GXBB_USB_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RESET=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_VIDEO=y
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP16 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
+CONFIG_OF_LIBFDT_OVERLAY=y
configs/wetek-play2_defconfig new file +60 -0
new file mode 100644
index 0000000000..6d33b09a94
@@ -0,0 +1,70 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_TEXT_BASE=0x01000000
+CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEBUG_UART_BASE=0xc81004c0
+CONFIG_DEBUG_UART_CLOCK=24000000
+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
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+CONFIG_CMD_ADC=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SARADC_MESON=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MESON=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_REALTEK=y
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE_MESON8B=y
+CONFIG_PHY=y
+CONFIG_MESON_GXBB_USB_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RESET=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_VIDEO=y
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP16 is not set

configs/wetek-play2_defconfig line 70

Quoted 10 lines
configs/wetek-play2_defconfig new file +10 -0
+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
+CONFIG_OF_LIBFDT_OVERLAY=y
#18 lore raw

PATCH v2 14/14 doc: boards: amlogic: add documentation for WeTek Hub and WeTek Play2

In reply to Christian Hewitt

Add build instructions for the WeTek Hub and WeTek Play2 boards.

---
 board/amlogic/p200/MAINTAINERS    |   2 +
 doc/board/amlogic/index.rst       |   2 +
 doc/board/amlogic/wetek-hub.rst   | 110 ++++++++++++++++++++++++++++
 doc/board/amlogic/wetek-play2.rst | 115 ++++++++++++++++++++++++++++++
 4 files changed, 229 insertions(+)
 create mode 100644 doc/board/amlogic/wetek-hub.rst
 create mode 100644 doc/board/amlogic/wetek-play2.rst
board/amlogic/p200/MAINTAINERS +2 -0
index 264218e3be..fe451dd7db 100644
@@ -12,3 +12,5 @@ F:	configs/wetek-play2_defconfig
 F:	doc/board/amlogic/p200.rst
 F:	doc/board/amlogic/nanopi-k2.rst
 F:	doc/board/amlogic/odroid-c2.rst
+F:      doc/board/amlogic/wetek-hub.rst
+F:      doc/board/amlogic/wetek-play2.rst
doc/board/amlogic/index.rst +2 -0
index 71b7e1f3ed..deb7976436 100644
@@ -118,4 +118,6 @@ Board Documentation
    s400
    u200
    wetek-core2
+   wetek-hub
+   wetek-play2
    w400
doc/board/amlogic/wetek-hub.rst new file +110 -0

110 lines not on this page · raw message

doc/board/amlogic/wetek-play2.rst new file +115 -0

115 lines not on this page · raw message

Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 14/14
#19 lore raw

Re: [PATCH v2 14/14] doc: boards: amlogic: add documentation for WeTek Hub and WeTek Play2

Quoted 260 lines · Christian Hewitt

Add build instructions for the WeTek Hub and WeTek Play2 boards.

---
  board/amlogic/p200/MAINTAINERS    |   2 +
  doc/board/amlogic/index.rst       |   2 +
  doc/board/amlogic/wetek-hub.rst   | 110 ++++++++++++++++++++++++++++
  doc/board/amlogic/wetek-play2.rst | 115 ++++++++++++++++++++++++++++++
  4 files changed, 229 insertions(+)

create mode 100644 doc/board/amlogic/wetek-hub.rst create mode 100644 doc/board/amlogic/wetek-play2.rst

board/amlogic/p200/MAINTAINERS +2 -0
index 264218e3be..fe451dd7db 100644
@@ -12,3 +12,5 @@ F:	configs/wetek-play2_defconfig
  F:	doc/board/amlogic/p200.rst
  F:	doc/board/amlogic/nanopi-k2.rst
  F:	doc/board/amlogic/odroid-c2.rst
+F:      doc/board/amlogic/wetek-hub.rst
+F:      doc/board/amlogic/wetek-play2.rst
doc/board/amlogic/index.rst +2 -0
index 71b7e1f3ed..deb7976436 100644
@@ -118,4 +118,6 @@ Board Documentation
     s400
     u200
     wetek-core2
+   wetek-hub
+   wetek-play2
     w400
doc/board/amlogic/wetek-hub.rst new file +110 -0
new file mode 100644
index 0000000000..378c6a6497
@@ -0,0 +1,110 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+U-Boot for WeTek Hub (S905)
+===========================
+
+WeTek Hub is a small form-factor Android STB manufactured by WeTek with the following
+specification:
+
+ - Amlogic S905 ARM Cortex-A53 quad-core SoC @ 1.5GHz
+ - ARM Mali 450 GPU
+ - 1GB DDR3 SDRAM
+ - 8GB eMMC
+ - Gigabit Ethernet
+ - HDMI 2.0 4K/60Hz display
+ - 1x USB otg
+ - microSD
+ - UART jack
+ - Infrared receiver
+
+Schematics are not publicly available but have been shared privately to maintainers.
+
+U-Boot Compilation
+------------------
+
+.. code-block:: bash
+
+    $ export CROSS_COMPILE=aarch64-none-elf-
+    $ make wetek-hub_defconfig
+    $ make
+
+U-Boot Signing with Pre-Built FIP repo
+--------------------------------------
+
+.. code-block:: bash
+
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip
+    $ mkdir my-output-dir
+    $ ./build-fip.sh wetek-hub /path/to/u-boot/u-boot.bin my-output-dir
+
+U-Boot Manual Signing
+---------------------
+
+Amlogic does not provide sources for the firmware and tools needed to create a bootloader
+image and WeTek has not publicly shared the U-Boot sources needed to build FIP binaries
+for signing. However you can download them from the amlogic-fip-repo.
+
+.. code-block:: bash
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip/wetek-hub
+    $ export FIPDIR=$PWD
+
+Go back to the mainline U-Boot source tree then:
+
+.. code-block:: bash
+
+    $ mkdir fip
+
+    $ cp $FIPDIR/bl2.bin fip/
+    $ cp $FIPDIR/acs.bin fip/
+    $ cp $FIPDIR/bl21.bin fip/
+    $ cp $FIPDIR/bl30.bin fip/
+    $ cp $FIPDIR/bl301.bin fip/
+    $ cp $FIPDIR/bl31.img fip/
+    $ cp u-boot.bin fip/bl33.bin
+
+    $ $FIPDIR/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
+
+    $ $FIPDIR/fip_create --bl30 fip/bl30_new.bin \
+                         --bl31 fip/bl31.img \
+                         --bl33 fip/bl33.bin \
+                         fip/fip.bin
+
+    $ sed -i 's/\x73\x02\x08\x91/\x1F\x20\x03\xD5/' fip/bl2.bin
+    $ python3 $FIPDIR/acs_tool.py fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0
+
+    $ $FIPDIR/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
+
+    $ cat fip/bl2_new.bin fip/fip.bin > fip/boot_new.bin
+
+    $ $FIPDIR/aml_encrypt_gxb --bootsig \
+                              --input fip/boot_new.bin
+                              --output fip/u-boot.bin
+
+Then write U-Boot to SD or eMMC with:
+
+.. code-block:: bash
+
+    $ DEV=/dev/boot_device
+    $ dd if=fip/u-boot.bin of=fip/u-boot.bin.gxbb bs=512 conv=fsync
+    $ dd if=fip/u-boot.bin of=fip/u-boot.bin.gxbb bs=512 seek=9 skip=8 count=87 conv=fsync,notrunc
+    $ dd if=/dev/zero of=fip/u-boot.bin.gxbb bs=512 seek=8 count=1 conv=fsync,notrunc
+    $ dd if=bl1.bin.hardkernel of=fip/u-boot.bin.gxbb bs=512 seek=2 skip=2 count=1 conv=fsync,notrunc
+    $ ./aml_chksum fip/u-boot.bin.gxbb
+    $ dd if=fip/u-boot.gxbb of=$DEV conv=fsync,notrunc bs=512 skip=1 seek=1
+    $ dd if=fip/u-boot.gxbb of=$DEV conv=fsync,notrunc bs=1 count=440
doc/board/amlogic/wetek-play2.rst new file +105 -0
new file mode 100644
index 0000000000..cd7759f7f4
@@ -0,0 +1,115 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+U-Boot for WeTek Play2 (S905)
+=============================
+
+WeTek Play2 is an Android STB manufactured by WeTek with the following specification:
+
+ - Amlogic S905 ARM Cortex-A53 quad-core SoC @ 1.5GHz
+ - ARM Mali 450 GPU
+ - 2GB DDR3 SDRAM
+ - 8GB eMMC
+ - Gigabit Ethernet
+ - AP6335 (v1) or AP6255 (v2) WiFi (b/g/n) and BT 4.0
+ - HDMI 2.0 4K/60Hz display
+ - 2x USB 2.0 host
+ - 1x USB 2.0 otg
+ - microSD
+ - UART jack
+ - Infrared receiver
+ - Power LED (blue)
+ - Power button (case, front)
+ - Reset button (underside)
+ - DVB Card: DVB-S or DVB-T/C or ATSC
+
+Schematics are not publicly available but have been shared privately to maintainers.
+
+U-Boot Compilation
+------------------
+
+.. code-block:: bash
+
+    $ export CROSS_COMPILE=aarch64-none-elf-
+    $ make wetek-play2_defconfig
+    $ make
+
+U-Boot Signing with Pre-Built FIP repo
+--------------------------------------
+
+.. code-block:: bash
+
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip
+    $ mkdir my-output-dir
+    $ ./build-fip.sh wetek-play2 /path/to/u-boot/u-boot.bin my-output-dir
+
+U-Boot Manual Signing
+---------------------
+
+Amlogic does not provide sources for the firmware and tools needed to create a bootloader
+image and WeTek has not publicly shared the U-Boot sources needed to build FIP binaries
+for signing. However you can download them from the amlogic-fip-repo.
+
+.. code-block:: bash
+    $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1
+    $ cd amlogic-boot-fip/wetek-play2
+    $ export FIPDIR=$PWD
+
+Go back to the mainline U-Boot source tree then:
+
+.. code-block:: bash
+
+    $ mkdir fip
+
+    $ cp $FIPDIR/bl2.bin fip/
+    $ cp $FIPDIR/acs.bin fip/
+    $ cp $FIPDIR/bl21.bin fip/
+    $ cp $FIPDIR/bl30.bin fip/
+    $ cp $FIPDIR/bl301.bin fip/
+    $ cp $FIPDIR/bl31.img fip/
+    $ cp u-boot.bin fip/bl33.bin
+
+    $ $FIPDIR/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
+
+    $ $FIPDIR/fip_create --bl30 fip/bl30_new.bin \
+                         --bl31 fip/bl31.img \
+                         --bl33 fip/bl33.bin \
+                         fip/fip.bin
+
+    $ sed -i 's/\x73\x02\x08\x91/\x1F\x20\x03\xD5/' fip/bl2.bin
+    $ python3 $FIPDIR/acs_tool.py fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0
+
+    $ $FIPDIR/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
+
+    $ cat fip/bl2_new.bin fip/fip.bin > fip/boot_new.bin
+
+    $ $FIPDIR/aml_encrypt_gxb --bootsig \
+                              --input fip/boot_new.bin
+                              --output fip/u-boot.bin
+
+Then write U-Boot to SD or eMMC with:
+

doc/board/amlogic/wetek-play2.rst line 115

Quoted 10 lines
doc/board/amlogic/wetek-play2.rst new file +10 -0
+.. code-block:: bash
+
+    $ DEV=/dev/boot_device
+    $ dd if=fip/u-boot.bin of=fip/u-boot.bin.gxbb bs=512 conv=fsync
+    $ dd if=fip/u-boot.bin of=fip/u-boot.bin.gxbb bs=512 seek=9 skip=8 count=87 conv=fsync,notrunc
+    $ dd if=/dev/zero of=fip/u-boot.bin.gxbb bs=512 seek=8 count=1 conv=fsync,notrunc
+    $ dd if=bl1.bin.hardkernel of=fip/u-boot.bin.gxbb bs=512 seek=2 skip=2 count=1 conv=fsync,notrunc
+    $ ./aml_chksum fip/u-boot.bin.gxbb
+    $ dd if=fip/u-boot.gxbb of=$DEV conv=fsync,notrunc bs=512 skip=1 seek=1
+    $ dd if=fip/u-boot.gxbb of=$DEV conv=fsync,notrunc bs=1 count=440
maintainer
#20 lore raw

Re: (subset) [PATCH v2 00/14] boards: amlogic: add BananaPi/Radxa/WeTek boards

In reply to Christian Hewitt

Hi,

Quoted 10 lines · Christian Hewitt

This series adds support for the following boards which are tested and booting fine with 2023.04-rc4:

- BananaPi M2-Pro (S905X3)
- BananaPi M2S (A311D or S922X)
- Radxa Zero2 (A311D)
- WeTek Hub (S905)
- WeTek Play2 (S905)

[...]

Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-amlogic (u-boot-amlogic-test)

[01/14] docs: boards: amlogic: add bananapi-m5 to u200 maintainer file

        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/86e59bdd4d55c46fbe7bd856fa16e27c970f407f
[03/14] ARM: dts: add support for BananaPi M2-Pro
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/4170731c4a9dfb5583d45453f323be7975521c18
[04/14] boards: add BananaPi M2-Pro defconfig
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/d33260a5054b716baa5336f2c788e0e07ae46417
[05/14] docs: boards: amlogic: add documentation for BananaPi M2-Pro
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/b2fc35e5f138c6e7449c925324891dbbb70bb400
[06/14] ARM: dts: add support for BananaPi M2S
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/56a92bd4f443634ea6a50bb4b7269e1c04c9e00b
[07/14] boards: add BananaPi M2S defconfig
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/43c67ddf59ff7a4dc62fc0d4c49fe3d54463bc66
[08/14] docs: boards: amlogic: add documentation for BananaPi M2S
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/40f1eea84e2845deda5ce5fbf6c4f8fb1bb85463
[09/14] ARM: dts: add support for Radxa Zero2
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/3016f6fb9e4c506ce751b36215cc1ac44aca31b0
[10/14] boards: amlogic: add Radxa Zero2 defconfig
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/2c57d114d2716e75fa0b4e8f0149215437f603a8
[11/14] doc: boards: amlogic: add documentation for Radxa Zero2
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/37eda34cb5afb230df00b7ebc74c8164b89cbc4c
[12/14] ARM: dts: add support for WeTek Hub and WeTek Play2
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/b07e8fb073aa1b847e9ceb563b76808c88be2af9
[13/14] boards: amlogic: add WeTek Hub and WeTek Play2 defconfig
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/fcb0fb2bd6d9e4042bed21685da893f5765305eb
[14/14] doc: boards: amlogic: add documentation for WeTek Hub and WeTek Play2
        https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/f097eedf0c04fc6307e22b4b707aa3b47c921b4c
Signature · 1 line
Neil