diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-08 15:23:37 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-08 15:23:37 -0500 |
| commit | 9af51fb3a505f895d64bd1f8a5967bfaa510add4 (patch) | |
| tree | f4ae47c5645e9478bde7b3b57f165a1b622a0073 /include | |
| parent | 3e99c183739afe698df8a4ba813940c94379095b (diff) | |
| parent | 262d34363373c10a00279036c1561283c30495c2 (diff) | |
Merge tag 'u-boot-amlogic-20200108' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- Khadas VIM3L based on Amlogic S905D3 support
- Various fixups for amlogic boards
- Unnecessary header includes drop into video/meson
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/meson64.h | 2 | ||||
| -rw-r--r-- | include/video.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 736081277d..50707a3197 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -8,7 +8,7 @@ #define __MESON64_CONFIG_H /* Generic Interrupt Controller Definitions */ -#if defined(CONFIG_MESON_AXG) +#if (defined(CONFIG_MESON_AXG) || defined(CONFIG_MESON_G12A)) #define GICD_BASE 0xffc01000 #define GICC_BASE 0xffc02000 #else /* MESON GXL and GXBB */ diff --git a/include/video.h b/include/video.h index 485071d072..e7c58e86cb 100644 --- a/include/video.h +++ b/include/video.h @@ -17,6 +17,8 @@ #include <stdio_dev.h> +struct udevice; + struct video_uc_platdata { uint align; uint size; |