Skip to content

Commit

Permalink
scripts: move gen_app_partitions.py to scripts/build
Browse files Browse the repository at this point in the history
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 <anas.nashif@intel.com>
  • Loading branch information
nashif authored and carlescufi committed Jul 12, 2022
1 parent 361e6e5 commit 6e1a335
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
$<$<BOOL:${APP_SMEM_PINNED_UNALIGNED_LD}>:--pinoutput=${APP_SMEM_PINNED_UNALIGNED_LD}>
Expand Down Expand Up @@ -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 $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
-o ${APP_SMEM_ALIGNED_LD}
$<$<BOOL:${APP_SMEM_PINNED_ALIGNED_LD}>:--pinoutput=${APP_SMEM_PINNED_ALIGNED_LD}>
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/build/cmake/build-build-phase-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion doc/build/cmake/build-postprocess-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions doc/build/cmake/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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: """
2 changes: 1 addition & 1 deletion doc/kernel/usermode/memory_domain.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
File renamed without changes.

0 comments on commit 6e1a335

Please sign in to comment.