build: namespace autoconf.h with zephyr/

Namespace the generated `autoconf.h` file with `zephyr/`. Signed-off-by: Yong Cong Sin <[email protected]>
aspeeddylan · May 28, 2024 · 0dac6c1 · 0dac6c1
1 parent 2d912d5
commit 0dac6c1
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/cmake/ide/eclipse_cdt4_generator_amendment.cmake b/cmake/ide/eclipse_cdt4_generator_amendment.cmake
@@ -46,7 +46,7 @@
 #   CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS.
 #
 #3. The amendment function appends the defines from
-#   ${CMAKE_BINARY_DIR}/zephyr/include/generated/autoconf.h to
+#   ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/autoconf.h to
 #   CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS.
 #
 function(eclipse_cdt4_generator_amendment _param_defs)

diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
@@ -9,7 +9,7 @@ include(python)
 # <build>/zephyr/include/generated/autoconf.h.
 # A project may request a custom location by setting AUTOCONF_H explicitly before
 # calling 'find_package(Zephyr)' or loading this module.
-set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/autoconf.h)
+set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/zephyr/autoconf.h)
 # Re-configure (Re-execute all CMakeLists.txt code) when autoconf.h changes
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${AUTOCONF_H})
 

diff --git a/doc/releases/migration-guide-3.7.rst b/doc/releases/migration-guide-3.7.rst
@@ -29,6 +29,7 @@ Build System
 
      * - Affected header files
      * - ``app_version.h``
+     * - ``autoconf.h``
      * - ``cmake_intdef.h``
      * - ``core-isa-dM.h``
      * - ``devicetree_generated.h``

diff --git a/modules/lvgl/lvgl_shell.c b/modules/lvgl/lvgl_shell.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/shell/shell.h>
 #include <lvgl.h>
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 #ifdef CONFIG_LV_Z_MEM_POOL_SYS_HEAP
 #include "lvgl_mem.h"

diff --git a/modules/trusted-firmware-m/nordic/include/RTE_Device.h b/modules/trusted-firmware-m/nordic/include/RTE_Device.h
@@ -7,7 +7,7 @@
 #ifndef __RTE_DEVICE_H
 #define __RTE_DEVICE_H
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 /* ARRAY_SIZE causes a conflict as it is defined both by TF-M and indirectly by devicetree.h */
 #undef ARRAY_SIZE

diff --git a/modules/trusted-firmware-m/nordic/include/device_cfg.h b/modules/trusted-firmware-m/nordic/include/device_cfg.h
@@ -7,7 +7,7 @@
 #ifndef DEVICE_CFG_H__
 #define DEVICE_CFG_H__
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 /* ARRAY_SIZE causes a conflict as it is defined both by TF-M and indirectly by devicetree.h */
 #undef ARRAY_SIZE

diff --git a/scripts/kconfig/kconfiglib.py b/scripts/kconfig/kconfiglib.py
@@ -1419,7 +1419,7 @@ def load_allconfig(self, filename):
     def write_autoconf(self, filename=None, header=None):
         r"""
         Writes out symbol values as a C header file, matching the format used
-        by include/generated/autoconf.h in the kernel.
+        by include/generated/zephyr/autoconf.h in the kernel.
 
         The ordering of the #defines matches the one generated by
         write_config(). The order in the C implementation depends on the hash
@@ -1434,7 +1434,7 @@ def write_autoconf(self, filename=None, header=None):
           Path to write header to.
 
           If None (the default), the path in the environment variable
-          KCONFIG_AUTOHEADER is used if set, and "include/generated/autoconf.h"
+          KCONFIG_AUTOHEADER is used if set, and "include/generated/zephyr/autoconf.h"
           otherwise. This is compatible with the C tools.
 
         header (default: None):
@@ -1453,7 +1453,7 @@ def write_autoconf(self, filename=None, header=None):
         """
         if filename is None:
             filename = os.getenv("KCONFIG_AUTOHEADER",
-                                 "include/generated/autoconf.h")
+                                 "include/generated/zephyr/autoconf.h")
 
         if self._write_if_changed(filename, self._autoconf_contents(header)):
             return "Kconfig header saved to '{}'".format(filename)

diff --git a/scripts/west_commands/sign.py b/scripts/west_commands/sign.py
@@ -456,7 +456,7 @@ def preprocess_toml(self, config_dir, toml_basename, subdir):
 
         preproc_cmd += ['-I', str(self.sof_src_dir / 'src')]
         preproc_cmd += ['-imacros',
-                        str(pathlib.Path('zephyr') / 'include' / 'generated' / 'autoconf.h')]
+                        str(pathlib.Path('zephyr') / 'include' / 'generated' / 'zephyr' / 'autoconf.h')]
         preproc_cmd += ['-o', str(subdir / 'rimage_config.toml')]
         self.command.inf(quote_sh_list(preproc_cmd))
         subprocess.run(preproc_cmd, check=True, cwd=self.build_dir)

diff --git a/soc/nxp/imxrt/imxrt5xx/f1/include/soc/memory.h b/soc/nxp/imxrt/imxrt5xx/f1/include/soc/memory.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 #define IRAM_BASE (CONFIG_RT595_ADSP_TEXT_MEM_ADDR)
 #define IRAM_SIZE (CONFIG_RT595_ADSP_TEXT_MEM_SIZE)