From b832a1e264b0f824e6a3c0a964e097649a98088e Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 19 Jan 2019 07:04:48 -0500 Subject: [PATCH] printk: move into lib/os Last file under misc/. Put it alongside other support functions in lib/os. Signed-off-by: Anas Nashif --- CMakeLists.txt | 1 - lib/os/CMakeLists.txt | 2 ++ {misc => lib/os}/printk.c | 0 misc/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename {misc => lib/os}/printk.c (100%) delete mode 100644 misc/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index a17e43ba302..30094e2cc58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -489,7 +489,6 @@ endfunction() # e.g. subsys/. add_subdirectory(arch) add_subdirectory(lib) -add_subdirectory(misc) # We use include instead of add_subdirectory to avoid creating a new directory scope. # This is because source file properties are directory scoped, including the GENERATED # property which is set implicitly for custom command outputs diff --git a/lib/os/CMakeLists.txt b/lib/os/CMakeLists.txt index bd820968d84..7ef36095cf7 100644 --- a/lib/os/CMakeLists.txt +++ b/lib/os/CMakeLists.txt @@ -14,4 +14,6 @@ zephyr_sources( zephyr_sources_ifdef(CONFIG_JSON_LIBRARY json.c) +zephyr_sources_if_kconfig(printk.c) + zephyr_sources_if_kconfig(ring_buffer.c) diff --git a/misc/printk.c b/lib/os/printk.c similarity index 100% rename from misc/printk.c rename to lib/os/printk.c diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt deleted file mode 100644 index fceffd48083..00000000000 --- a/misc/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -zephyr_sources_if_kconfig(printk.c)