kernel: Move boot_banner under lib

Moves the boot banner functionality from the kernel directory to the lib directory Signed-off-by: Jamie McCrae <[email protected]>
adsz-nordic · Jun 11, 2024 · 9a691aa · 9a691aa
1 parent cd6aa49
commit 9a691aa
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,4 +35,3 @@ add_subdirectory(subsys)
 add_subdirectory(modules)
 add_subdirectory(drivers)
 add_subdirectory(tests)
-add_subdirectory(kernel)
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -104,8 +104,8 @@ Kconfig*                                  @tejlmand
 /include/nfc/                             @anangl @grochu
 /include/sdfw/                            @anhmolt @hakonfam @jonathannilsen
 /include/shell/                           @nordic-krch
-/kernel/                                  @nordicjm
 /lib/bin/                                 @rlubos @lemrey
+/lib/boot_banner/                         @nordicjm
 /lib/adp536x/                             @nrfconnect/ncs-cia
 /lib/at_cmd_parser/                       @rlubos
 /lib/at_cmd_custom/                       @eivindj-nordic

diff --git a/Kconfig.nrf b/Kconfig.nrf
@@ -109,7 +109,6 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 config GETOPT
 	default n
 
-rsource "kernel/Kconfig"
 rsource "samples/Kconfig"
 rsource "subsys/Kconfig"
 rsource "modules/Kconfig"

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -48,3 +48,4 @@ add_subdirectory_ifdef(CONFIG_PSCM pcm_stream_channel_modifier)
 add_subdirectory_ifdef(CONFIG_DATA_FIFO data_fifo)
 add_subdirectory_ifdef(CONFIG_FEM_AL_LIB fem_al)
 add_subdirectory_ifdef(CONFIG_SAMPLE_RATE_CONVERTER sample_rate_converter)
+add_subdirectory_ifdef(CONFIG_NCS_BOOT_BANNER boot_banner)
diff --git a/lib/Kconfig b/lib/Kconfig
@@ -49,5 +49,6 @@ rsource "pcm_stream_channel_modifier/Kconfig"
 rsource "data_fifo/Kconfig"
 rsource "fem_al/Kconfig"
 rsource "sample_rate_converter/Kconfig"
+rsource "boot_banner/Kconfig"
 
 endmenu
diff --git a/kernel/CMakeLists.txt → lib/boot_banner/CMakeLists.txt b/kernel/CMakeLists.txt → lib/boot_banner/CMakeLists.txt
@@ -4,6 +4,4 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-if(CONFIG_NCS_BOOT_BANNER)
-  zephyr_sources(banner.c)
-endif()
+zephyr_sources(banner.c)
diff --git a/kernel/Kconfig → lib/boot_banner/Kconfig b/kernel/Kconfig → lib/boot_banner/Kconfig
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menu "General Kernel Options"
-
 menuconfig NCS_BOOT_BANNER
 	bool "NCS boot banner"
 	default y
@@ -32,5 +30,3 @@ config NCS_ZEPHYR_BOOT_BANNER_STRING
 	default "Zephyr OS"
 
 endif # NCS_BOOT_BANNER
-
-endmenu
diff --git a/kernel/banner.c → lib/boot_banner/banner.c b/kernel/banner.c → lib/boot_banner/banner.c