summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-12-02 15:25:14 -0600
committerTom Rini <[email protected]>2025-12-02 15:25:14 -0600
commitd4a8124805e3de3da5c9a005daa791bfba2ed28d (patch)
treeceaf15aa66573f55648deae29ff2ebec2f8a2c35 /arch
parentd35a98834db52de89916fdc0aaa608061cae0e3f (diff)
parent6ec94acd15e3a44700287c27ca8cf15488afd424 (diff)
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
Two fixes for R-Car Gen4 and CONFIG_ENV_OVERWRITE=n to always expect "setenv -f" to be used when overwriting ethernet MAC on all R-Car.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
index 8e4307ff87d..85e32208b29 100644
--- a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
+++ b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
@@ -23,8 +23,6 @@
&rpc {
bootph-all;
- status = "disabled";
-
flash@0 {
bootph-all;
spi-tx-bus-width = <1>;