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.
2025-12-02 15:25:14 -06:00
parent d35a98834d 6ec94acd15
commit d4a8124805
3 changed files with 1 additions and 3 deletions
--- 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>;
--- a/configs/r8a779g3_sparrowhawk_defconfig
+++ b/configs/r8a779g3_sparrowhawk_defconfig
@@ -6,6 +6,7 @@ CONFIG_RCAR_GEN4=y
 CONFIG_ARM_SMCCC=y
 CONFIG_ARMV8_PSCI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_OFFSET=0x3f80000
 CONFIG_ENV_OFFSET_REDUND=0x3fc0000
 CONFIG_ENV_SECT_SIZE=0x40000
--- a/configs/renesas_rcar.config
+++ b/configs/renesas_rcar.config
@@ -17,7 +17,6 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SPI=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_FIT=y
 CONFIG_HUSH_PARSER=y