| Message ID | 20240430153053.308788-16-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | cc87730e404c7e65ecf19af89a8b80063494a296 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC | expand |
On 2024/4/30 23:30, Jonas Karlman wrote: > rk3399-puma is the only supported board that use uart0 for serial > console, other RK3399 boards typically use uart2 for serial console > and may use uart0 for bluetooth. > > Move setting bootph prop to board u-boot.dtsi to only include the uart0 > node in TPL/SPL control FDT for the rk3399-puma target. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: New patch split from "Fix loading FIT from SD-card" patch > --- > arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 4 ++++ > arch/arm/dts/rk3399-u-boot.dtsi | 4 ---- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi > index 2b3ea6da88db..390cf24152a6 100644 > --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi > @@ -110,3 +110,7 @@ > &sdmmc_cmd { > bootph-all; > }; > + > +&uart0 { > + bootph-all; > +}; > diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi > index 496f25d9fbf6..9815dc53e8ed 100644 > --- a/arch/arm/dts/rk3399-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-u-boot.dtsi > @@ -134,10 +134,6 @@ > bootph-all; > }; > > -&uart0 { > - bootph-all; > -}; > - > &uart2 { > bootph-all; > };
diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi index 2b3ea6da88db..390cf24152a6 100644 --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi @@ -110,3 +110,7 @@ &sdmmc_cmd { bootph-all; }; + +&uart0 { + bootph-all; +}; diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 496f25d9fbf6..9815dc53e8ed 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -134,10 +134,6 @@ bootph-all; }; -&uart0 { - bootph-all; -}; - &uart2 { bootph-all; };
rk3399-puma is the only supported board that use uart0 for serial console, other RK3399 boards typically use uart2 for serial console and may use uart0 for bluetooth. Move setting bootph prop to board u-boot.dtsi to only include the uart0 node in TPL/SPL control FDT for the rk3399-puma target. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: New patch split from "Fix loading FIT from SD-card" patch --- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 4 ++++ arch/arm/dts/rk3399-u-boot.dtsi | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)