[U-Boot] [PATCH 02/18] ARM: uniphier: remove unused uniphier_ld11_boot_device_fixup()

Masahiro Yamada yamada.masahiro at socionext.com
Tue Jul 2 08:32:12 UTC 2019


The .boot_device_fixup() is only called by SPL.

Now that 64-bit SoCs of this SoC family no longer support SPL,
debug-uart-ld20.c is never compiled.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 arch/arm/mach-uniphier/boot-device/boot-device-ld11.c | 8 --------
 arch/arm/mach-uniphier/boot-device/boot-device.c      | 2 --
 arch/arm/mach-uniphier/boot-device/boot-device.h      | 1 -
 3 files changed, 11 deletions(-)

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
index 10093be0e43a..11e70a926fc8 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
@@ -58,11 +58,3 @@ int uniphier_ld20_boot_device_is_usb(u32 pinmon)
 {
 	return !!(~pinmon & 0x00000780);
 }
-
-unsigned int uniphier_ld11_boot_device_fixup(unsigned int mode)
-{
-	if (mode == BOOT_DEVICE_MMC1 || mode == BOOT_DEVICE_USB)
-		mode = BOOT_DEVICE_BOARD;
-
-	return mode;
-}
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 23be8cfcf00d..3c7643302d9e 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -91,7 +91,6 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
 		.boot_device_table = uniphier_ld11_boot_device_table,
 		.boot_device_count = &uniphier_ld11_boot_device_count,
 		.boot_device_is_usb = uniphier_ld11_boot_device_is_usb,
-		.boot_device_fixup = uniphier_ld11_boot_device_fixup,
 		.have_internal_stm = 1,
 	},
 #endif
@@ -102,7 +101,6 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
 		.boot_device_table = uniphier_ld11_boot_device_table,
 		.boot_device_count = &uniphier_ld11_boot_device_count,
 		.boot_device_is_usb = uniphier_ld20_boot_device_is_usb,
-		.boot_device_fixup = uniphier_ld11_boot_device_fixup,
 		.have_internal_stm = 1,
 	},
 #endif
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.h b/arch/arm/mach-uniphier/boot-device/boot-device.h
index 44579f17d3e4..bbb634316b3a 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.h
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.h
@@ -30,6 +30,5 @@ int uniphier_ld20_boot_device_is_usb(u32 pinmon);
 int uniphier_pxs3_boot_device_is_usb(u32 pinmon);
 
 unsigned int uniphier_pxs2_boot_device_fixup(unsigned int mode);
-unsigned int uniphier_ld11_boot_device_fixup(unsigned int mode);
 
 #endif /* _UNIPHIER_BOOT_DEVICE_H_ */
-- 
2.17.1



More information about the U-Boot mailing list