ifdef CONFIG_SPL_BUILD
-obj-y += lowlevel_init.o
-obj-y += init_page_table.o
-obj-y += spl.o
-obj-y += memconf.o
-obj-y += ddrphy_training.o
-
-obj-$(CONFIG_DEBUG_LL) += debug_ll.o
+obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/
+obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
else
-obj-y += late_lowlevel_init.o
obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
obj-$(CONFIG_MISC_INIT_F) += print_misc_info.o
obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-y += reset.o
-obj-y += cache_uniphier.o
-obj-$(CONFIG_CMD_PINMON) += cmd_pinmon.o
-obj-$(CONFIG_CMD_DDRPHY_DUMP) += cmd_ddrphy.o
+
+obj-y += pinctrl/ clk/
endif
-obj-y += timer.o
+obj-y += boards.o
+obj-y += soc_info.o
+obj-y += boot-mode/
+obj-y += dram/
obj-$(CONFIG_MICRO_SUPPORT_CARD) += micro-support-card.o
+obj-$(CONFIG_DEBUG_UART_UNIPHIER) += debug-uart/
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += ph1-sld3/
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += ph1-ld4/
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += ph1-pro4/
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += ph1-sld8/
+obj-$(CONFIG_CPU_V7) += arm32/