diff options
| author | Tom Rini <[email protected]> | 2025-12-02 15:25:14 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-02 15:25:14 -0600 |
| commit | d4a8124805e3de3da5c9a005daa791bfba2ed28d (patch) | |
| tree | ceaf15aa66573f55648deae29ff2ebec2f8a2c35 | |
| parent | d35a98834db52de89916fdc0aaa608061cae0e3f (diff) | |
| parent | 6ec94acd15e3a44700287c27ca8cf15488afd424 (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.
| -rw-r--r-- | arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | configs/r8a779g3_sparrowhawk_defconfig | 1 | ||||
| -rw-r--r-- | configs/renesas_rcar.config | 1 |
3 files changed, 1 insertions, 3 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>; diff --git a/configs/r8a779g3_sparrowhawk_defconfig b/configs/r8a779g3_sparrowhawk_defconfig index 2d1abf6f26d..ee8f2711985 100644 --- 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 diff --git a/configs/renesas_rcar.config b/configs/renesas_rcar.config index 45776be62ea..d9a99e1f428 100644 --- 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 |