diff options
| author | Tom Rini <trini@konsulko.com> | 2024-08-23 15:59:44 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-08-23 15:59:44 -0600 |
| commit | 7670200d4b7bbb572290d0fb2ed9cd0fb1f989cc (patch) | |
| tree | f0a4e3b850c8355297a9d2a61b70af51784668c8 | |
| parent | 5948fd0ae7a86af6e2b6a5227005b92ad2ab67d8 (diff) | |
| parent | 2191c117338849639a7c0519d4908fce43783c0e (diff) | |
Merge patch series "test/overlay: Make this depend on SANDBOX"
Tom Rini <trini@konsulko.com> says:
Update a few things so that CONFIG_UNIT_TEST will compile for more
hardware platforms.
| -rw-r--r-- | test/boot/Makefile | 5 | ||||
| -rw-r--r-- | test/cmd/Makefile | 2 | ||||
| -rw-r--r-- | test/overlay/Kconfig | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/boot/Makefile b/test/boot/Makefile index 8ec5daa7bfe..d8eded20d4f 100644 --- a/test/boot/Makefile +++ b/test/boot/Makefile @@ -2,12 +2,15 @@ # # Copyright 2021 Google LLC +ifdef CONFIG_UT_BOOTSTD obj-$(CONFIG_BOOTSTD) += bootdev.o bootstd_common.o bootflow.o bootmeth.o obj-$(CONFIG_FIT) += image.o -obj-$(CONFIG_MEASURED_BOOT) += measurement.o obj-$(CONFIG_EXPO) += expo.o obj-$(CONFIG_CEDIT) += cedit.o +endif + +obj-$(CONFIG_MEASURED_BOOT) += measurement.o ifdef CONFIG_OF_LIVE obj-$(CONFIG_BOOTMETH_VBE_SIMPLE) += vbe_simple.o diff --git a/test/cmd/Makefile b/test/cmd/Makefile index 478ef4c6f05..8f2134998ad 100644 --- a/test/cmd/Makefile +++ b/test/cmd/Makefile @@ -30,7 +30,7 @@ ifdef CONFIG_SANDBOX obj-$(CONFIG_CMD_MBR) += mbr.o obj-$(CONFIG_CMD_READ) += rw.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o +obj-$(CONFIG_CMD_WGET) += wget.o obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o endif obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o -obj-$(CONFIG_CMD_WGET) += wget.o diff --git a/test/overlay/Kconfig b/test/overlay/Kconfig index a4f154415db..881848968bb 100644 --- a/test/overlay/Kconfig +++ b/test/overlay/Kconfig @@ -1,6 +1,6 @@ config UT_OVERLAY bool "Enable Device Tree Overlays Unit Tests" - depends on UNIT_TEST && OF_CONTROL + depends on UNIT_TEST && OF_CONTROL && SANDBOX default y select OF_LIBFDT_OVERLAY help |