diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-06 08:14:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-06 08:14:28 -0500 |
| commit | bd7fbd58b757263cec86d9915da168ce347a7e08 (patch) | |
| tree | 4cd8bfce0938f9173b0b2a896ab929b336479a90 /arch | |
| parent | 8d6cbf5e6bc4e10e38b954763fa025caed517cc2 (diff) | |
| parent | 5404dfcc4dbb56a9b255e08b67b46d1181565e6f (diff) | |
Merge branch '2023-01-06-further-regression-fixes'
- Bring in a number of important regression fixes for among others,
uniphier, PXE booting, socrates, imx7d-pico, rockchip video and
rzg2_beacon as well as making the python version warning fix more
portable.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx7d-pico-pi-u-boot.dtsi (renamed from arch/arm/dts/imx7d-pico-u-boot.dtsi) | 0 | ||||
| -rw-r--r-- | arch/arm/dts/rz-g2-beacon-u-boot.dtsi | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi index 7307fbaf687..7307fbaf687 100644 --- a/arch/arm/dts/imx7d-pico-u-boot.dtsi +++ b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi diff --git a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi index 4d178549187..da1c3b0939c 100644 --- a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi +++ b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi @@ -45,7 +45,6 @@ }; &rpc { - compatible = "renesas,rcar-gen3-rpc"; pinctrl-0 = <&qspi_pins>; pinctrl-names = "default"; num-cs = <1>; diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 9d12bf168d9..687c51a8c69 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -72,6 +72,7 @@ choice config TARGET_SOCRATES bool "Support socrates" select ARCH_MPC8544 + select BINMAN config TARGET_P3041DS bool "Support P3041DS" |