diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-20 13:44:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-20 13:44:27 -0400 |
| commit | e4837da7828293ea49abc579f939c0f5c4b127c3 (patch) | |
| tree | 421407ac920910e309e3d704e10b45b8fc93396c /arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi | |
| parent | 62c59545bad51936580012ee1cd2a728f1ca99fd (diff) | |
| parent | 699a33b9388607446452ed3457921cfd61fc094e (diff) | |
Merge tag 'u-boot-amlogic-20200420' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- enable DM_RNG on meson boards
- fix SMBIOS info on Odroid-C2
- Fix video output on GXBB/GXL/GXM boards
- add USB gadget support for GXL/GXM boards
Diffstat (limited to 'arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi')
| -rw-r--r-- | arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi index c35158d7e9..39270ea71c 100644 --- a/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi @@ -4,4 +4,4 @@ * Author: Neil Armstrong <narmstrong@baylibre.com> */ -#include "meson-gx-u-boot.dtsi" +#include "meson-gxl-u-boot.dtsi" |