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-g12a.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-g12a.c')
| -rw-r--r-- | arch/arm/mach-meson/board-g12a.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index 546b9f60392..24786df6cdd 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -9,6 +9,7 @@ #include <asm/arch/eth.h> #include <asm/arch/g12a.h> #include <asm/arch/mem.h> +#include <asm/arch/meson-vpu.h> #include <asm/io.h> #include <asm/armv8/mmu.h> #include <linux/sizes.h> @@ -57,6 +58,10 @@ void meson_init_reserved_memory(void *fdt) /* Add BL32 reserved zone */ if (bl32_start && bl32_size) meson_board_add_reserved_memory(fdt, bl32_start, bl32_size); + +#if defined(CONFIG_VIDEO_MESON) + meson_vpu_rsv_fb(fdt); +#endif } phys_size_t get_effective_memsize(void) |