@@ -7,7 +7,7 @@ ifdef CONFIG_SPL_BUILD
obj-y += lowlevel_init.o
obj-y += init_page_table.o
-obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/ umc/ ddrphy/
+obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/ dram/
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
obj-$(CONFIG_DEBUG_LL) += debug_ll.o
deleted file mode 100644
@@ -1,7 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += ddrphy-training.o ddrphy-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += ddrphy-training.o ddrphy-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += ddrphy-training.o ddrphy-ph1-sld8.o
new file mode 100644
@@ -0,0 +1,10 @@
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += umc-ph1-ld4.o \
+ ddrphy-training.o ddrphy-ph1-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += umc-ph1-pro4.o \
+ ddrphy-training.o ddrphy-ph1-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += umc-ph1-sld8.o \
+ ddrphy-training.o ddrphy-ph1-sld8.o
similarity index 100%
rename from arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-ld4.c
rename to arch/arm/mach-uniphier/dram/ddrphy-ph1-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-pro4.c
rename to arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-sld8.c
rename to arch/arm/mach-uniphier/dram/ddrphy-ph1-sld8.c
similarity index 100%
rename from arch/arm/mach-uniphier/ddrphy/ddrphy-training.c
rename to arch/arm/mach-uniphier/dram/ddrphy-training.c
similarity index 100%
rename from arch/arm/mach-uniphier/umc/umc-ph1-ld4.c
rename to arch/arm/mach-uniphier/dram/umc-ph1-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/umc/umc-ph1-pro4.c
rename to arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/umc/umc-ph1-sld8.c
rename to arch/arm/mach-uniphier/dram/umc-ph1-sld8.c
deleted file mode 100644
@@ -1,7 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += umc-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += umc-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += umc-ph1-sld8.o
The UMC (Universal Memory Controller) and the DDR PHY block are highly related to each other. It is better to have both code in the same directory. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/mach-uniphier/Makefile | 2 +- arch/arm/mach-uniphier/ddrphy/Makefile | 7 ------- arch/arm/mach-uniphier/dram/Makefile | 10 ++++++++++ arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-ld4.c | 0 arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-pro4.c | 0 arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-sld8.c | 0 arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-training.c | 0 arch/arm/mach-uniphier/{umc => dram}/umc-ph1-ld4.c | 0 arch/arm/mach-uniphier/{umc => dram}/umc-ph1-pro4.c | 0 arch/arm/mach-uniphier/{umc => dram}/umc-ph1-sld8.c | 0 arch/arm/mach-uniphier/umc/Makefile | 7 ------- 11 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 arch/arm/mach-uniphier/ddrphy/Makefile create mode 100644 arch/arm/mach-uniphier/dram/Makefile rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-ld4.c (100%) rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-pro4.c (100%) rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-sld8.c (100%) rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-training.c (100%) rename arch/arm/mach-uniphier/{umc => dram}/umc-ph1-ld4.c (100%) rename arch/arm/mach-uniphier/{umc => dram}/umc-ph1-pro4.c (100%) rename arch/arm/mach-uniphier/{umc => dram}/umc-ph1-sld8.c (100%) delete mode 100644 arch/arm/mach-uniphier/umc/Makefile