| Message ID | 20170405221918.6244-1-heiko@sntech.de |
|---|---|
| State | Accepted |
| Commit | 6499b1976cb90734a76fdf979f530741251e4978 |
| Delegated to: | Simon Glass |
| Headers | show |
On 5 April 2017 at 16:19, Heiko Stuebner <heiko@sntech.de> wrote: > Somehow 43b5c78d8d91 ("rockchip: cosmetic: Sort RK3288 boards") moved > the rock board in between some rk3288 board, probably as a result of > rebasing. > > So move it back to its original position above all rk3288 boards. > > Fixes: 43b5c78d8d91 ("rockchip: cosmetic: Sort RK3288 boards") > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/dts/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Simon Glass <sjg@chromium.org>
On 9 April 2017 at 13:27, Simon Glass <sjg@chromium.org> wrote: > On 5 April 2017 at 16:19, Heiko Stuebner <heiko@sntech.de> wrote: >> Somehow 43b5c78d8d91 ("rockchip: cosmetic: Sort RK3288 boards") moved >> the rock board in between some rk3288 board, probably as a result of >> rebasing. >> >> So move it back to its original position above all rk3288 boards. >> >> Fixes: 43b5c78d8d91 ("rockchip: cosmetic: Sort RK3288 boards") >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> --- >> arch/arm/dts/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index bc4dc2ce79..da4c940f07 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -29,12 +29,12 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3036-sdk.dtb \ + rk3188-radxarock.dtb \ rk3288-evb.dtb \ rk3288-fennec.dtb \ rk3288-firefly.dtb \ rk3288-miqi.dtb \ rk3288-popmetal.dtb \ - rk3188-radxarock.dtb \ rk3288-rock2-square.dtb \ rk3288-tinker.dtb \ rk3288-veyron-jerry.dtb \
Somehow 43b5c78d8d91 ("rockchip: cosmetic: Sort RK3288 boards") moved the rock board in between some rk3288 board, probably as a result of rebasing. So move it back to its original position above all rk3288 boards. Fixes: 43b5c78d8d91 ("rockchip: cosmetic: Sort RK3288 boards") Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)