diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-02 10:28:26 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-02 10:28:26 -0500 |
commit | 28aa6dc29a0f35c5c5d969c83428a50361932f5b (patch) | |
tree | a3b728fa96a8e773791a46b1e9eb17542696f484 /arch/arm/dts/Makefile | |
parent | 13ef116507df73b6e66cc18f04edd00ffdafd595 (diff) | |
parent | c0a474b9d9a1c370f46b3f76ea0707f92d55b0b1 (diff) | |
download | u-boot-28aa6dc29a0f35c5c5d969c83428a50361932f5b.tar.gz |
Merge tag 'u-boot-rockchip-20191231' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Fix latest mainline kernel for rk3308
- Update rk3288-evb config to suport OP-TEE
- Fix for firefly-px30 DEBUG_UART channel and make it standalone
- Script make_fit_atf add python3 support
- Fix rk3328 timer with correct COUNTER_FREQUENCY
- Fix rk3328 ATF support with enable spl-fifo-mode
Diffstat (limited to 'arch/arm/dts/Makefile')
-rw-r--r-- | arch/arm/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 88c750a646..0127a91a82 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -68,7 +68,8 @@ dtb-$(CONFIG_ARCH_OWL) += \ bubblegum_96.dtb dtb-$(CONFIG_ROCKCHIP_PX30) += \ - px30-evb.dtb + px30-evb.dtb \ + px30-firefly.dtb dtb-$(CONFIG_ROCKCHIP_RK3036) += \ rk3036-sdk.dtb |