diff mbox series

[29/33] doc: boards: amlogic: update documentation for WeTek Core2

Message ID 20230320114609.930145-30-christianshewitt@gmail.com
State New
Delegated to: Neil Armstrong
Headers show
Series doc: board: amlogic: spring clean-up of Amlogic docs | expand

Commit Message

Christian Hewitt March 20, 2023, 11:46 a.m. UTC 
Improve documentation.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 doc/board/amlogic/wetek-core2.rst | 83 +++++++++++++++++--------------
 1 file changed, 47 insertions(+), 36 deletions(-)

Comments

Simon Glass March 20, 2023, 6:40 p.m. UTC | #1 
Hi Christian,

On Tue, 21 Mar 2023 at 06:05, Christian Hewitt
<christianshewitt@gmail.com> wrote:
>
> Improve documentation.
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
>  doc/board/amlogic/wetek-core2.rst | 83 +++++++++++++++++--------------
>  1 file changed, 47 insertions(+), 36 deletions(-)

This should really move to binman. Would you like to take a look?

I sent a patch for this a while ago but it needs something to review
and try out.

https://patchwork.ozlabs.org/project/uboot/patch/20220110031413.1970836-39-sjg@chromium.org/

I am happy to do more on it as needed.

Regards.

Simon
Christian Hewitt March 21, 2023, 5:10 a.m. UTC | #2 
> On 20 Mar 2023, at 10:40 pm, Simon Glass <sjg@chromium.org> wrote:
> 
> Hi Christian,
> 
> On Tue, 21 Mar 2023 at 06:05, Christian Hewitt
> <christianshewitt@gmail.com> wrote:
>> 
>> Improve documentation.
>> 
>> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
>> ---
>> doc/board/amlogic/wetek-core2.rst | 83 +++++++++++++++++--------------
>> 1 file changed, 47 insertions(+), 36 deletions(-)
> 
> This should really move to binman. Would you like to take a look?
> 
> I sent a patch for this a while ago but it needs something to review
> and try out.
> 
> https://patchwork.ozlabs.org/project/uboot/patch/20220110031413.1970836-39-sjg@chromium.org/
> 
> I am happy to do more on it as needed.

Hello Simon,

For now this is just a cleanup but longer-term (won’t be quick) I can
take a look. Do you have that series rebased against current and in a
repo somewhere for easier cherry-picking?

Christian
Simon Glass April 1, 2023, 6:33 a.m. UTC | #3 
Hi Christian,

On Tue, 21 Mar 2023 at 18:11, Christian Hewitt
<christianshewitt@gmail.com> wrote:
>
>
> > On 20 Mar 2023, at 10:40 pm, Simon Glass <sjg@chromium.org> wrote:
> >
> > Hi Christian,
> >
> > On Tue, 21 Mar 2023 at 06:05, Christian Hewitt
> > <christianshewitt@gmail.com> wrote:
> >>
> >> Improve documentation.
> >>
> >> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> >> ---
> >> doc/board/amlogic/wetek-core2.rst | 83 +++++++++++++++++--------------
> >> 1 file changed, 47 insertions(+), 36 deletions(-)
> >
> > This should really move to binman. Would you like to take a look?
> >
> > I sent a patch for this a while ago but it needs something to review
> > and try out.
> >
> > https://patchwork.ozlabs.org/project/uboot/patch/20220110031413.1970836-39-sjg@chromium.org/
> >
> > I am happy to do more on it as needed.
>
> Hello Simon,
>
> For now this is just a cleanup but longer-term (won’t be quick) I can
> take a look. Do you have that series rebased against current and in a
> repo somewhere for easier cherry-picking?
>

OK I sent a v2 patch.

Regards,
Simon
diff mbox series

Patch

diff --git a/doc/board/amlogic/wetek-core2.rst b/doc/board/amlogic/wetek-core2.rst
index 0147d5fbe2..5eba566af4 100644
--- a/doc/board/amlogic/wetek-core2.rst
+++ b/doc/board/amlogic/wetek-core2.rst
@@ -1,23 +1,24 @@ 
 .. SPDX-License-Identifier: GPL-2.0+
 
-U-Boot for WeTek Core2
-======================
+U-Boot for WeTek Core2 (S912)
+=============================
 
-WeTek Core2 is an Android STB based on the Q200 reference design with
-the following specifications:
+WeTek Core2 is an Android STB based on the Q200 reference design with the following
+specifications:
 
  - Amlogic S912 ARM Cortex-A53 octo-core SoC @ 1.5GHz
  - ARM Mali T820 GPU
  - 3GB DDR4 SDRAM
  - 10/100 Realtek RTL8152 Ethernet (internal USB)
  - HDMI 2.0 4K/60Hz display
- - 2x USB 2.0 Host, 1x USB 2.0 OTG (internal)
+ - 2x USB 2.0 Host
+ - 1x USB 2.0 OTG (internal)
  - 32GB eMMC
  - microSD
  - SDIO Wifi Module, Bluetooth
  - Two channel IR receiver
 
-U-Boot compilation
+U-Boot Compilation
 ------------------
 
 .. code-block:: bash
@@ -26,15 +27,21 @@  U-Boot compilation
     $ make wetek-core2_defconfig
     $ make
 
-Image creation
---------------
+U-Boot Signing with Pre-Built FIP repo
+--------------------------------------
 
-For simplified usage, pleaser refer to :doc:`pre-generated-fip` with codename `wetek-core2`
+.. 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-core2 /path/to/u-boot/u-boot.bin my-output-dir
+
+U-Boot Manual Signing
+---------------------
 
-Amlogic does not provide sources for the firmware or the tools needed
-to create the bootloader image, and WeTek has not publicly shared the
-precompiled FIP binaries. However the public Khadas VIM2 sources also
-work with the Core2 box so we can use the Khadas git tree:
+Amlogic does not provide firmware sources or tools needed to create the bootloader image
+and WeTek has not publicly shared the precompiled FIP binaries. However the Khadas VIM2
+sources also work with the Core2 box so we can use the Khadas git tree:
 
 .. code-block:: bash
 
@@ -49,7 +56,7 @@  work with the Core2 box so we can use the Khadas git tree:
     $ make
     $ export FIPDIR=$PWD/fip
 
-Go back to mainline U-Boot source tree then:
+Go back to the mainline U-Boot source tree then:
 
 .. code-block:: bash
 
@@ -61,38 +68,42 @@  Go back to mainline U-Boot source tree then:
     $ cp $FIPDIR/gxl/bl301.bin fip/
     $ cp $FIPDIR/gxl/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
+              fip/bl30.bin \
+              fip/zero_tmp \
+              fip/bl30_zero.bin \
+              fip/bl301.bin \
+              fip/bl301_zero.bin \
+              fip/bl30_new.bin \
+              bl30
+
     $ python $FIPDIR/acs_tool.pyc 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
+              fip/bl2_acs.bin \
+              fip/zero_tmp \
+              fip/bl2_zero.bin \
+              fip/bl21.bin \
+              fip/bl21_zero.bin \
+              fip/bl2_new.bin \
+              bl2
+
     $ $FIPDIR/gxl/aml_encrypt_gxl --bl3enc --input fip/bl30_new.bin
     $ $FIPDIR/gxl/aml_encrypt_gxl --bl3enc --input fip/bl31.img
     $ $FIPDIR/gxl/aml_encrypt_gxl --bl3enc --input fip/bl33.bin
     $ $FIPDIR/gxl/aml_encrypt_gxl --bl2sig --input fip/bl2_new.bin --output fip/bl2.n.bin.sig
     $ $FIPDIR/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
+                                  --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
 
-then write the image to SD with:
+Then write U-Boot to SD or eMMC with:
 
 .. code-block:: bash
 
-    $ DEV=/dev/your_sd_device
+    $ 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=444
+    $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=1 count=440