diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-12 15:46:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-13 07:32:02 -0500 |
| commit | 795f8fd0b591eef7cf3f8c6fcf9788280029cc4a (patch) | |
| tree | 71c2e050efcf18e76ce81f804f55f236df98cf68 /arch/arm/include/asm | |
| parent | ee6726be4f0dccb612f0193c62ca149164c8a5af (diff) | |
| parent | 6bfa331a6e22507ae839fb8474ce1b3fd58808df (diff) | |
Merge tag 'u-boot-amlogic-20210112' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- sync amlogic GX & AXG DT to Linux 5.10
- Add new MESON_EE driver support for GXBB & AXG
- Add support for Libretech-CC v2, Wetek Core2, Beelink GT-King/Pro boards
- add driver for TDO tl070wsh30 panel driver
- meson: isolate loading of socinfo
- Add soc_rev to environment
- Enable G12A support for saradc
- Add correct mmcdev on VIM3(L) & Odroid-N2(C4)
- Read MAC from fuses for VIM3 & VIM3L boards
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-meson/boot.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-meson/boot.h b/arch/arm/include/asm/arch-meson/boot.h index a90fe55081c..c67d12d06c9 100644 --- a/arch/arm/include/asm/arch-meson/boot.h +++ b/arch/arm/include/asm/arch-meson/boot.h @@ -7,6 +7,8 @@ #ifndef __MESON_BOOT_H__ #define __MESON_BOOT_H__ +#include <linux/types.h> + /* Boot device */ #define BOOT_DEVICE_RESERVED 0 #define BOOT_DEVICE_EMMC 1 @@ -17,4 +19,6 @@ int meson_get_boot_device(void); +int meson_get_soc_rev(char *buff, size_t buff_len); + #endif /* __MESON_BOOT_H__ */ |