Merge https://source.denx.de/u-boot/custodians/u-boot-riscv

[platform/kernel/u-boot.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 1e43473..1787736 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,12 +2,32 @@
 #
 # (C) Copyright 2012 The Chromium Authors
 
-obj-$(CONFIG_UNIT_TEST) += cmd_ut.o
-obj-$(CONFIG_UNIT_TEST) += ut.o
-obj-$(CONFIG_SANDBOX) += command_ut.o
-obj-$(CONFIG_SANDBOX) += compression.o
-obj-$(CONFIG_SANDBOX) += print_ut.o
-obj-$(CONFIG_UT_TIME) += time_ut.o
-obj-$(CONFIG_UT_UNICODE) += unicode_ut.o
-obj-$(CONFIG_$(SPL_)LOG) += log/
+obj-y += test-main.o
+ifdef CONFIG_SPL_LOAD_FIT
+obj-$(CONFIG_SANDBOX) += image/
+endif
+
+ifneq ($(CONFIG_$(SPL_)BLOBLIST),)
+obj-$(CONFIG_$(SPL_)CMDLINE) += bloblist.o
+obj-$(CONFIG_$(SPL_)CMDLINE) += bootm.o
+endif
+obj-$(CONFIG_$(SPL_)CMDLINE) += cmd/
+obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_ut.o
+obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o
+obj-$(CONFIG_$(SPL_)UT_COMPRESSION) += compression.o
+obj-y += dm/
+obj-$(CONFIG_FUZZ) += fuzz/
+ifndef CONFIG_SANDBOX_VPL
 obj-$(CONFIG_UNIT_TEST) += lib/
+endif
+obj-$(CONFIG_$(SPL_)CMDLINE) += print_ut.o
+obj-$(CONFIG_$(SPL_)CMDLINE) += str_ut.o
+obj-$(CONFIG_UT_TIME) += time_ut.o
+obj-y += ut.o
+
+ifeq ($(CONFIG_SPL_BUILD),)
+obj-$(CONFIG_UNIT_TEST) += boot/
+obj-$(CONFIG_UNIT_TEST) += common/
+obj-y += log/
+obj-$(CONFIG_$(SPL_)UT_UNICODE) += unicode_ut.o
+endif