diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-18 16:36:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-18 16:36:44 -0400 |
| commit | 3b985bdeabd1b05abf28fe7dc6530c203750f9fc (patch) | |
| tree | 7b32aa816256961ee485be87ba0bffdce2d6c969 /arch/arm/mach-meson/board-info.c | |
| parent | cce99479af3f3d0cdb41a4da078000031b16e9e5 (diff) | |
| parent | be2ffa1656509cc974910224a87443868d7037d9 (diff) | |
Merge tag 'u-boot-amlogic-20191018' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- document alternative libretech-cc installation methods, including upstream TF-A and opensource tools
- add HDMI/CVBS display support for Amlogic G12A SoCs and SEI510 board
- add support for Amlogic A311D based Khadas VIM3
- add support for Amlogic S905X3 based SEI610 board, targeting Android support like SEI510
Diffstat (limited to 'arch/arm/mach-meson/board-info.c')
| -rw-r--r-- | arch/arm/mach-meson/board-info.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index ba248e8ff6f..0d3b40a2491 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -34,6 +34,7 @@ static const struct meson_gx_soc_id { { "TXHD", 0x27 }, { "G12A", 0x28 }, { "G12B", 0x29 }, + { "SM1", 0x2b }, }; static const struct meson_gx_package_id { @@ -59,7 +60,9 @@ static const struct meson_gx_package_id { { "A113D", 0x25, 0x22, 0xff }, { "S905D2", 0x28, 0x10, 0xf0 }, { "S905X2", 0x28, 0x40, 0xf0 }, + { "A311D", 0x29, 0x10, 0xf0 }, { "S922X", 0x29, 0x40, 0xf0 }, + { "S905X3", 0x2b, 0x5, 0xf }, }; DECLARE_GLOBAL_DATA_PTR; @@ -154,7 +157,7 @@ int show_board_info(void) /* print board information */ print_board_model(); - printf("Soc: Amlogic Meson %s (%s) Revision %x:%x (%x:%x)\n", + printf("SoC: Amlogic Meson %s (%s) Revision %x:%x (%x:%x)\n", socinfo_to_soc_id(socinfo), socinfo_to_package_id(socinfo), socinfo_to_major(socinfo), |