From: Andre Przywara Date: Fri, 16 Dec 2022 23:55:17 +0000 (+0000) Subject: sunxi: f1c100s: Drop no-MMC hack X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=3baa0fbe6b196f93e0528b94be8d5ccee5cfc9ff;p=u-boot.git sunxi: f1c100s: Drop no-MMC hack When support for the Allwinner F1C100s SoC was originally introduced, its DT lacked any MMC nodes, which upset our sunxi-u-boot.dtsi overlay, when it tried to add an alias to the SD card. To quickly fix this back then, we guarded that alias with a preprocessor macro. Now the F1C100s family has gained MMC nodes, so we don't need the special treatment anymore. Just remove this guard. Signed-off-by: Andre Przywara Reviewed-by: Samuel Holland --- diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 2028d5b6a9..e959eb2a40 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -12,9 +12,7 @@ / { aliases { -#ifndef CONFIG_MACH_SUNIV mmc0 = &mmc0; -#endif #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endif