Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 23:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'u-boot-amlogic-20201105' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic

Browse source 
- meson64_android: don't show logo on ROM USB boot
- doc: update support matrix and fix vim3/l build instructions
- meson64: relocate config_distro_bootcmmd header
This commit is contained in:
Tom Rini 2020-11-06 08:42:11 -05:00
commit 896cc5aa4a
5 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/board/amlogic/index.rst
View file

@ -26,7 +26,7 @@ This matrix concerns the actual source code version.
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| Clock Control | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | | Clock Control | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| PWM | No | No | No | No | No | No | No | | PWM | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| Reset Control | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | | Reset Control | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
@ -44,9 +44,9 @@ This matrix concerns the actual source code version.
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| I2C | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | | I2C | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| USB | **Yes** | **Yes** | **Yes** | No | **Yes** | **Yes** | **Yes** | | USB | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| USB OTG | No | **Yes** | **Yes** | No | **Yes** | **Yes** | **Yes** | | USB OTG | No | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| eMMC | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | | eMMC | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
@ -66,6 +66,8 @@ This matrix concerns the actual source code version.
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| LCD/LVDS Output | No | *N/A* | No | No | No | No | No | | LCD/LVDS Output | No | *N/A* | No | No | No | No | No |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| MIPI DSI Output | *N/A* | *N/A* | *N/A* | No | No | No | No |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| SoC (version) information | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | | SoC (version) information | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+ +-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+

9
doc/board/amlogic/khadas-vim3.rst
View file

@ -76,15 +76,16 @@ the git tree published by the board vendor:
$ cd vim3-u-boot $ cd vim3-u-boot
$ make kvim3_defconfig $ make kvim3_defconfig
$ make $ make CROSS_COMPILE=aarch64-none-elf-
$ export UBOOTDIR=$PWD $ export UBOOTDIR=$PWD
Go back to mainline U-Boot source tree then : Go back to mainline U-Boot source tree then :
.. code-block:: bash .. code-block:: bash
$ mkdir fip $ 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/scp_task/bl301.bin fip/
$ cp $UBOOTDIR/build/board/khadas/kvim3/firmware/acs.bin fip/ $ cp $UBOOTDIR/build/board/khadas/kvim3/firmware/acs.bin fip/
$ cp $UBOOTDIR/fip/g12b/bl2.bin fip/ $ cp $UBOOTDIR/fip/g12b/bl2.bin fip/
@ -101,7 +102,7 @@ the git tree published by the board vendor:
$ cp $UBOOTDIR/fip/g12b/aml_ddr.fw fip/ $ cp $UBOOTDIR/fip/g12b/aml_ddr.fw fip/
$ cp u-boot.bin fip/bl33.bin $ cp u-boot.bin fip/bl33.bin
$ sh fip/blx_fix.sh \ $ bash fip/blx_fix.sh \
fip/bl30.bin \ fip/bl30.bin \
fip/zero_tmp \ fip/zero_tmp \
fip/bl30_zero.bin \ fip/bl30_zero.bin \
@ -110,7 +111,7 @@ the git tree published by the board vendor:
fip/bl30_new.bin \ fip/bl30_new.bin \
bl30 bl30
$ sh fip/blx_fix.sh \ $ bash fip/blx_fix.sh \
fip/bl2.bin \ fip/bl2.bin \
fip/zero_tmp \ fip/zero_tmp \
fip/bl2_zero.bin \ fip/bl2_zero.bin \

11
doc/board/amlogic/khadas-vim3l.rst
View file

@ -48,6 +48,8 @@ Then power-cycle the board.
U-Boot compilation U-Boot compilation
------------------ ------------------
.. code-block:: bash
$ export CROSS_COMPILE=aarch64-none-elf- $ export CROSS_COMPILE=aarch64-none-elf-
$ make khadas-vim3l_defconfig $ make khadas-vim3l_defconfig
$ make $ make
@ -74,15 +76,16 @@ the git tree published by the board vendor:
$ cd vim3l-u-boot $ cd vim3l-u-boot
$ make kvim3l_defconfig $ make kvim3l_defconfig
$ make $ make CROSS_COMPILE=aarch64-none-elf-
$ export UBOOTDIR=$PWD $ export UBOOTDIR=$PWD
Go back to mainline U-Boot source tree then : Go back to mainline U-Boot source tree then :
.. code-block:: bash .. code-block:: bash
$ mkdir fip $ 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/scp_task/bl301.bin fip/
$ cp $UBOOTDIR/build/board/khadas/kvim3l/firmware/acs.bin fip/ $ cp $UBOOTDIR/build/board/khadas/kvim3l/firmware/acs.bin fip/
$ cp $UBOOTDIR/fip/g12a/bl2.bin fip/ $ cp $UBOOTDIR/fip/g12a/bl2.bin fip/
@ -99,7 +102,7 @@ the git tree published by the board vendor:
$ cp $UBOOTDIR/fip/g12a/aml_ddr.fw fip/ $ cp $UBOOTDIR/fip/g12a/aml_ddr.fw fip/
$ cp u-boot.bin fip/bl33.bin $ cp u-boot.bin fip/bl33.bin
$ sh fip/blx_fix.sh \ $ bash fip/blx_fix.sh \
fip/bl30.bin \ fip/bl30.bin \
fip/zero_tmp \ fip/zero_tmp \
fip/bl30_zero.bin \ fip/bl30_zero.bin \
@ -108,7 +111,7 @@ the git tree published by the board vendor:
fip/bl30_new.bin \ fip/bl30_new.bin \
bl30 bl30
$ sh fip/blx_fix.sh \ $ bash fip/blx_fix.sh \
fip/bl2.bin \ fip/bl2.bin \
fip/zero_tmp \ fip/zero_tmp \
fip/bl2_zero.bin \ fip/bl2_zero.bin \

3
include/configs/meson64.h
View file

@ -69,6 +69,8 @@
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#endif #endif
#include <config_distro_bootcmd.h>
#ifndef CONFIG_EXTRA_ENV_SETTINGS #ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=" STDIN_CFG "\0" \ "stdin=" STDIN_CFG "\0" \
@ -83,6 +85,5 @@
BOOTENV BOOTENV
#endif #endif
#include <config_distro_bootcmd.h>
#endif /* __MESON64_CONFIG_H */ #endif /* __MESON64_CONFIG_H */

11
include/configs/meson64_android.h
View file

@ -98,11 +98,14 @@
func(SYSTEM, system, na) \ func(SYSTEM, system, na) \
#define PREBOOT_LOAD_LOGO \ #define PREBOOT_LOAD_LOGO \
"mmc dev ${mmcdev};" \ "if test \"${boot_source}\" != \"usb\" && " \
"part start mmc ${mmcdev} ${logopart} boot_start;" \ "gpt verify mmc ${mmcdev} ${partitions}; then; " \
"part size mmc ${mmcdev} ${logopart} boot_size;" \ "mmc dev ${mmcdev};" \
"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \ "part start mmc ${mmcdev} ${logopart} boot_start;" \
"part size mmc ${mmcdev} ${logopart} boot_size;" \
"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
"bmp display ${loadaddr} m m;" \ "bmp display ${loadaddr} m m;" \
"fi;" \
"fi;" "fi;"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \