diff options
| author | Simon Glass <[email protected]> | 2021-05-08 13:46:53 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-06-08 11:39:09 -0400 |
| commit | 8d9bb98f8649222777193c6c161361e1ebd5e3fa (patch) | |
| tree | dc2cf22474f2001685389a84941ebd67c33bc717 | |
| parent | 58b4b7133aba6fbb2409a975478157f9277c2e91 (diff) | |
sandbox: log: Avoid build error with !CONFIG_LOG
The pr_cont_test.c test requires CONFIG_LOG since it directly accesses
fields in global_data that require it. Move the test into the CONFIG_LOG
condition to avoid build errors.
Enable CONFIG_LOG on sandbox (not sandbox_spl, etc.) so that we still run
this test. This requires resyncing of the configs.
Signed-off-by: Simon Glass <[email protected]>
| -rw-r--r-- | configs/sandbox_defconfig | 1 | ||||
| -rw-r--r-- | test/log/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index bdbf714e2bd..60cdad10848 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -21,6 +21,7 @@ CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_CONSOLE_RECORD=y CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_F=y CONFIG_STACKPROTECTOR=y diff --git a/test/log/Makefile b/test/log/Makefile index a3dedace043..09f8689d070 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -17,6 +17,7 @@ endif ifdef CONFIG_LOG obj-y += pr_cont_test.o obj-$(CONFIG_CONSOLE_RECORD) += cont_test.o +obj-y += pr_cont_test.o else obj-$(CONFIG_CONSOLE_RECORD) += nolog_test.o endif |