8 files changed, 20 insertions, 21 deletions
diff --git a/arch/arm/mach-uniphier/init/Makefile b/arch/arm/mach-uniphier/init/Makefile
index ef80953623..34b15e3427 100644
--- a/arch/arm/mach-uniphier/init/Makefile
+++ b/arch/arm/mach-uniphier/init/Makefile
@@ -4,10 +4,10 @@
 
 obj-y					+= init.o
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= init-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= init-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= init-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= init-ph1-sld8.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= init-ph1-pro5.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= init-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= init-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= init-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= init-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= init-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= init-sld8.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= init-pro5.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= init-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= init-pxs2.o
diff --git a/arch/arm/mach-uniphier/init/init-ph1-ld4.c b/arch/arm/mach-uniphier/init/init-ld4.c
index a9c6d72e0b..a9c6d72e0b 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-ld4.c
+++ b/arch/arm/mach-uniphier/init/init-ld4.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-pro4.c b/arch/arm/mach-uniphier/init/init-pro4.c
index 6fcd8b6c85..6fcd8b6c85 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-pro4.c
+++ b/arch/arm/mach-uniphier/init/init-pro4.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-pro5.c b/arch/arm/mach-uniphier/init/init-pro5.c
index 45c65cf49a..45c65cf49a 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-pro5.c
+++ b/arch/arm/mach-uniphier/init/init-pro5.c
diff --git a/arch/arm/mach-uniphier/init/init-proxstream2.c b/arch/arm/mach-uniphier/init/init-pxs2.c
index 029c544997..029c544997 100644
--- a/arch/arm/mach-uniphier/init/init-proxstream2.c
+++ b/arch/arm/mach-uniphier/init/init-pxs2.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-sld3.c b/arch/arm/mach-uniphier/init/init-sld3.c
index 7827ec0bdc..7827ec0bdc 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-sld3.c
+++ b/arch/arm/mach-uniphier/init/init-sld3.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-sld8.c b/arch/arm/mach-uniphier/init/init-sld8.c
index 6c96aede2a..6c96aede2a 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-sld8.c
+++ b/arch/arm/mach-uniphier/init/init-sld8.c
diff --git a/arch/arm/mach-uniphier/init/init.c b/arch/arm/mach-uniphier/init/init.c
index b30f3bd9d6..d5d1018dd7 100644
--- a/arch/arm/mach-uniphier/init/init.c
+++ b/arch/arm/mach-uniphier/init/init.c
@@ -19,35 +19,34 @@ void spl_board_init(void)
 		hang();
 
 	switch (uniphier_get_soc_type()) {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-	case SOC_UNIPHIER_PH1_SLD3:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+	case SOC_UNIPHIER_SLD3:
 		ph1_sld3_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
-	case SOC_UNIPHIER_PH1_LD4:
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
+	case SOC_UNIPHIER_LD4:
 		ph1_ld4_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
-	case SOC_UNIPHIER_PH1_PRO4:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
+	case SOC_UNIPHIER_PRO4:
 		ph1_pro4_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-	case SOC_UNIPHIER_PH1_SLD8:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
+	case SOC_UNIPHIER_SLD8:
 		ph1_sld8_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-	case SOC_UNIPHIER_PH1_PRO5:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+	case SOC_UNIPHIER_PRO5:
 		ph1_pro5_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-	case SOC_UNIPHIER_PROXSTREAM2:
-	case SOC_UNIPHIER_PH1_LD6B:
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
+	case SOC_UNIPHIER_PXS2:
+	case SOC_UNIPHIER_LD6B:
 		proxstream2_init(param);
 		break;
 #endif