From 6e1a335447e8a85015697ac85501b2625f3a8485 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 11 Jul 2022 10:46:17 -0400 Subject: [PATCH] scripts: move gen_app_partitions.py to scripts/build Move scripts needed by the build system and not designed to be run individually or standalone into the build subfolder. Signed-off-by: Anas Nashif --- CMakeLists.txt | 4 ++-- CODEOWNERS | 2 +- MAINTAINERS.yml | 2 +- doc/build/cmake/build-build-phase-2.svg | 2 +- doc/build/cmake/build-postprocess-1.svg | 2 +- doc/build/cmake/index.rst | 4 ++-- doc/kernel/usermode/memory_domain.rst | 2 +- scripts/{ => build}/gen_app_partitions.py | 0 8 files changed, 9 insertions(+), 9 deletions(-) rename scripts/{ => build}/gen_app_partitions.py (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffb255bb840..a96a14757a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -951,7 +951,7 @@ if(CONFIG_USERSPACE) add_custom_command( OUTPUT ${APP_SMEM_UNALIGNED_LD} ${APP_SMEM_PINNED_UNALIGNED_LD} COMMAND ${PYTHON_EXECUTABLE} - ${ZEPHYR_BASE}/scripts/gen_app_partitions.py + ${ZEPHYR_BASE}/scripts/build/gen_app_partitions.py -f ${CMAKE_BINARY_DIR}/compile_commands.json -o ${APP_SMEM_UNALIGNED_LD} $<$:--pinoutput=${APP_SMEM_PINNED_UNALIGNED_LD}> @@ -989,7 +989,7 @@ if (CONFIG_USERSPACE) add_custom_command( OUTPUT ${APP_SMEM_ALIGNED_LD} ${APP_SMEM_PINNED_ALIGNED_LD} COMMAND ${PYTHON_EXECUTABLE} - ${ZEPHYR_BASE}/scripts/gen_app_partitions.py + ${ZEPHYR_BASE}/scripts/build/gen_app_partitions.py -e $ -o ${APP_SMEM_ALIGNED_LD} $<$:--pinoutput=${APP_SMEM_PINNED_ALIGNED_LD}> diff --git a/CODEOWNERS b/CODEOWNERS index dd0e4fcfe6b..6c8dba67af9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -693,7 +693,7 @@ /scripts/logging/dictionary/ @dcpleung /scripts/pylib/twister/expr_parser.py @nashif /scripts/schemas/twister/ @nashif -/scripts/gen_app_partitions.py @dcpleung @nashif +/scripts/build/gen_app_partitions.py @dcpleung @nashif scripts/gen_image_info.py @tejlmand /scripts/get_maintainer.py @nashif /scripts/dts/ @mbolivar-nordic @galak diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index aeef6f66a5a..443c53d274c 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -1971,7 +1971,7 @@ Userspace: - samples/userspace/ - include/zephyr/syscall.h - kernel/userspace* - - scripts/gen_app_partitions.py + - scripts/build/gen_app_partitions.py - scripts/gen_kobject_list.py - scripts/gen_syscalls.py - scripts/process_gperf.py diff --git a/doc/build/cmake/build-build-phase-2.svg b/doc/build/cmake/build-build-phase-2.svg index e24e031a8a2..c1a21a4d3ad 100644 --- a/doc/build/cmake/build-build-phase-2.svg +++ b/doc/build/cmake/build-build-phase-2.svg @@ -1,4 +1,4 @@ -
kernel/*.c
kernel/*.c
arch/x86/*.c
arch/x86/*.S
arch/x86/*.c...

Makefile
(various)

Makefile...
Build Stage II - Generation and Compilation 
Build Stage II - Generation and Compilation 
Other sources
Other sources

Headers (*.h)
Includes outputs from Configuration Phase and Build Stage I (e.g., autoconf.h, syscall_list.h)

Headers (*.h)...
kernel/*.c.obj
kernel/*.c.obj
arch/x86/*.c.obj
arch/x86/*.S.obj
arch/x86/*.c.obj...
Other *.obj files
Other *.obj files
libkernel.a
libkernel.a
arch__x86__core.a
arch__x86__core.a
Other archives
Other archives
GNU ar
GNU ranlib
GNU ar...
GNU ar
GNU ranlib
GNU ar...
GNU ar
GNU ranlib
GNU ar...
GNU cc
(cpp, cc1, as)
GNU cc...
GNU cc
(cpp, cc1, as)
GNU cc...
GNU cc
(cpp, cc1, as)
GNU cc...
*.h
*.h
*.h
*.h
scripts/gen_app_partitions.py
scripts/gen_app_partitions.py
app_smem_unaligned
linker files
app_smem_unaligned...Viewer does not support full SVG 1.1 \ No newline at end of file +
kernel/*.c
kernel/*.c
arch/x86/*.c
arch/x86/*.S
arch/x86/*.c...

Makefile
(various)

Makefile...
Build Stage II - Generation and Compilation 
Build Stage II - Generation and Compilation 
Other sources
Other sources

Headers (*.h)
Includes outputs from Configuration Phase and Build Stage I (e.g., autoconf.h, syscall_list.h)

Headers (*.h)...
kernel/*.c.obj
kernel/*.c.obj
arch/x86/*.c.obj
arch/x86/*.S.obj
arch/x86/*.c.obj...
Other *.obj files
Other *.obj files
libkernel.a
libkernel.a
arch__x86__core.a
arch__x86__core.a
Other archives
Other archives
GNU ar
GNU ranlib
GNU ar...
GNU ar
GNU ranlib
GNU ar...
GNU ar
GNU ranlib
GNU ar...
GNU cc
(cpp, cc1, as)
GNU cc...
GNU cc
(cpp, cc1, as)
GNU cc...
GNU cc
(cpp, cc1, as)
GNU cc...
*.h
*.h
*.h
*.h
scripts/build/gen_app_partitions.py
scripts/build/gen_app_partitions.py
app_smem_unaligned
linker files
app_smem_unaligned...Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/doc/build/cmake/build-postprocess-1.svg b/doc/build/cmake/build-postprocess-1.svg index 39ff6db0aff..5ea81dcd3f0 100644 --- a/doc/build/cmake/build-postprocess-1.svg +++ b/doc/build/cmake/build-postprocess-1.svg @@ -1,4 +1,4 @@ -

Makefile
(various)

Makefile...
App partition grouping
App partition grouping
zephyr_pre0.elf
zephyr_pre0.elf
scripts/gen_app_partitions.py
scripts/gen_app_partitions.py
app_smem_aligned.ld
app_smem_aligned.ld Viewer does not support full SVG 1.1 \ No newline at end of file +

Makefile
(various)

Makefile...
App partition grouping
App partition grouping
zephyr_pre0.elf
zephyr_pre0.elf
scripts/build/gen_app_partitions.py
scripts/build/gen_app_partitions.py
app_smem_aligned.ld
app_smem_aligned.ld Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/doc/build/cmake/index.rst b/doc/build/cmake/index.rst index 3ef7707b35d..09bdfc3b44f 100644 --- a/doc/build/cmake/index.rst +++ b/doc/build/cmake/index.rst @@ -409,9 +409,9 @@ The following is a detailed description of the scripts used during the build pro :start-after: """ :end-before: """ -:zephyr_file:`scripts/gen_app_partitions.py` +:zephyr_file:`scripts/build/gen_app_partitions.py` -------------------------------------------- -.. include:: ../../../scripts/gen_app_partitions.py +.. include:: ../../../scripts/build/gen_app_partitions.py :start-after: """ :end-before: """ diff --git a/doc/kernel/usermode/memory_domain.rst b/doc/kernel/usermode/memory_domain.rst index ca9c6478eef..c37e646b660 100644 --- a/doc/kernel/usermode/memory_domain.rst +++ b/doc/kernel/usermode/memory_domain.rst @@ -270,7 +270,7 @@ Automatic Partitions for Static Library Globals ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The build-time logic for setting up automatic memory partitions is in -``scripts/gen_app_partitions.py``. If a static library is linked into Zephyr, +``scripts/build/gen_app_partitions.py``. If a static library is linked into Zephyr, it is possible to route all the globals in that library to a specific memory partition with the ``--library`` argument. diff --git a/scripts/gen_app_partitions.py b/scripts/build/gen_app_partitions.py similarity index 100% rename from scripts/gen_app_partitions.py rename to scripts/build/gen_app_partitions.py