Hi Heiko, On 2020/6/4 下午6:09, Heiko Stuebner wrote:
index 0000000000..f23ec02783 --- /dev/null +++ b/arch/arm/dts/rk3399-puma-haikou.dts @@ -0,0 +1,272 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH + */ + +/dts-v1/; +#include "rk3399-puma.dtsi" +#include "rk3399-puma-u-boot.dtsi"
There will be a "rk3399-puma-haikou-u-boot.dtsi " auto detect and include in the dts,
so "rk3399-puma-u-boot.dtsi " should be rename or included to "rk3399-puma-haikou-u-boot.dtsi ".
After this update, the "rk3399-puma-haikou.dts" can sync from kernel without any modify.
Thanks, - Kever