aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/board/amlogic/index.rst8
-rw-r--r--doc/board/amlogic/khadas-vim3.rst9
-rw-r--r--doc/board/amlogic/khadas-vim3l.rst11
-rw-r--r--include/configs/meson64.h3
-rw-r--r--include/configs/meson64_android.h11
5 files changed, 26 insertions, 16 deletions
diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst
index 0e2f8c9aad..9e780ba47c 100644
--- a/doc/board/amlogic/index.rst
+++ b/doc/board/amlogic/index.rst
@@ -26,7 +26,7 @@ This matrix concerns the actual source code version.
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| 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** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
@@ -44,9 +44,9 @@ This matrix concerns the actual source code version.
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| 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** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
@@ -66,6 +66,8 @@ This matrix concerns the actual source code version.
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
| 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** |
+-------------------------------+-----------+--------------+--------------+------------+------------+-------------+--------------+
diff --git a/doc/board/amlogic/khadas-vim3.rst b/doc/board/amlogic/khadas-vim3.rst
index d6a9642ad6..8b7196d988 100644
--- a/doc/board/amlogic/khadas-vim3.rst
+++ b/doc/board/amlogic/khadas-vim3.rst
@@ -76,15 +76,16 @@ the git tree published by the board vendor:
$ cd vim3-u-boot
$ make kvim3_defconfig
- $ make
+ $ make CROSS_COMPILE=aarch64-none-elf-
$ export UBOOTDIR=$PWD
- Go back to mainline U-Boot source tree then :
+Go back to 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/khadas/kvim3/firmware/acs.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 u-boot.bin fip/bl33.bin
- $ sh fip/blx_fix.sh \
+ $ bash fip/blx_fix.sh \
fip/bl30.bin \
fip/zero_tmp \
fip/bl30_zero.bin \
@@ -110,7 +111,7 @@ the git tree published by the board vendor:
fip/bl30_new.bin \
bl30
- $ sh fip/blx_fix.sh \
+ $ bash fip/blx_fix.sh \
fip/bl2.bin \
fip/zero_tmp \
fip/bl2_zero.bin \
diff --git a/doc/board/amlogic/khadas-vim3l.rst b/doc/board/amlogic/khadas-vim3l.rst
index 3c0a415a87..aed8955391 100644
--- a/doc/board/amlogic/khadas-vim3l.rst
+++ b/doc/board/amlogic/khadas-vim3l.rst
@@ -48,6 +48,8 @@ Then power-cycle the board.
U-Boot compilation
------------------
+.. code-block:: bash
+
$ export CROSS_COMPILE=aarch64-none-elf-
$ make khadas-vim3l_defconfig
$ make
@@ -74,15 +76,16 @@ the git tree published by the board vendor:
$ cd vim3l-u-boot
$ make kvim3l_defconfig
- $ make
+ $ make CROSS_COMPILE=aarch64-none-elf-
$ export UBOOTDIR=$PWD
- Go back to mainline U-Boot source tree then :
+Go back to 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/khadas/kvim3l/firmware/acs.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 u-boot.bin fip/bl33.bin
- $ sh fip/blx_fix.sh \
+ $ bash fip/blx_fix.sh \
fip/bl30.bin \
fip/zero_tmp \
fip/bl30_zero.bin \
@@ -108,7 +111,7 @@ the git tree published by the board vendor:
fip/bl30_new.bin \
bl30
- $ sh fip/blx_fix.sh \
+ $ bash fip/blx_fix.sh \
fip/bl2.bin \
fip/zero_tmp \
fip/bl2_zero.bin \
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index cee6900680..52cc01f73d 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -69,6 +69,8 @@
func(DHCP, dhcp, na)
#endif
+#include <config_distro_bootcmd.h>
+
#ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=" STDIN_CFG "\0" \
@@ -83,6 +85,5 @@
BOOTENV
#endif
-#include <config_distro_bootcmd.h>
#endif /* __MESON64_CONFIG_H */
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 8fff915b50..c47d51c853 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -98,11 +98,14 @@
func(SYSTEM, system, na) \
#define PREBOOT_LOAD_LOGO \
- "mmc dev ${mmcdev};" \
- "part start mmc ${mmcdev} ${logopart} boot_start;" \
- "part size mmc ${mmcdev} ${logopart} boot_size;" \
- "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
+ "if test \"${boot_source}\" != \"usb\" && " \
+ "gpt verify mmc ${mmcdev} ${partitions}; then; " \
+ "mmc dev ${mmcdev};" \
+ "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;" \
+ "fi;" \
"fi;"
#define CONFIG_EXTRA_ENV_SETTINGS \
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-20 22:29:11 +0000