michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: move gen_kobject_placeholders.py to scripts/build/

Browse source 
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>
This commit is contained in:
Anas Nashif 2022-07-11 10:53:38 -04:00 • committed by Carles Cufí
commit d5dcf20382
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1096,7 +1096,7 @@ if(CONFIG_USERSPACE)
OUTPUT ${KOBJECT_LINKER_HEADER_DATA} OUTPUT ${KOBJECT_LINKER_HEADER_DATA}
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/gen_kobject_placeholders.py ${ZEPHYR_BASE}/scripts/build/gen_kobject_placeholders.py
--object $<TARGET_OBJECTS:kobj_prebuilt_hash_output_lib> --object $<TARGET_OBJECTS:kobj_prebuilt_hash_output_lib>
--outdir ${PROJECT_BINARY_DIR}/include/generated --outdir ${PROJECT_BINARY_DIR}/include/generated
--datapct ${CONFIG_KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT} --datapct ${CONFIG_KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT}

2
CODEOWNERS
View file

@ -702,7 +702,7 @@ scripts/gen_image_info.py @tejlmand
/arch/x86/gen_gdt.py @dcpleung @nashif /arch/x86/gen_gdt.py @dcpleung @nashif
/arch/x86/gen_idt.py @dcpleung @nashif /arch/x86/gen_idt.py @dcpleung @nashif
/scripts/build/gen_kobject_list.py @dcpleung @nashif /scripts/build/gen_kobject_list.py @dcpleung @nashif
/scripts/gen_kobject_placeholders.py @dcpleung /scripts/build/gen_kobject_placeholders.py @dcpleung
/scripts/gen_syscalls.py @dcpleung @nashif /scripts/gen_syscalls.py @dcpleung @nashif
/scripts/list_boards.py @mbolivar-nordic /scripts/list_boards.py @mbolivar-nordic
/scripts/process_gperf.py @dcpleung @nashif /scripts/process_gperf.py @dcpleung @nashif

4
include/zephyr/linker/kobject-data.ld
View file

@ -24,7 +24,7 @@
* space needs to be reserved for the rodata that will be * space needs to be reserved for the rodata that will be
* produced by gperf during the final stages of linking. * produced by gperf during the final stages of linking.
* The alignment and size are produced by * The alignment and size are produced by
* scripts/gen_kobject_placeholders.py. These are here * scripts/build/gen_kobject_placeholders.py. These are here
* so the addresses to kobjects would remain the same * so the addresses to kobjects would remain the same
* during the final stages of linking (LINKER_ZEPHYR_FINAL). * during the final stages of linking (LINKER_ZEPHYR_FINAL).
*/ */
@ -60,7 +60,7 @@
_kobject_data_area_used = _kobject_data_area_end - _kobject_data_area_start; _kobject_data_area_used = _kobject_data_area_end - _kobject_data_area_start;
ASSERT(_kobject_data_area_used <= KOBJECT_DATA_SZ, ASSERT(_kobject_data_area_used <= KOBJECT_DATA_SZ,
"scripts/gen_kobject_placeholders.py did not reserve enough space \ "scripts/build/gen_kobject_placeholders.py did not reserve enough space \
for kobject data." for kobject data."
); );

4
include/zephyr/linker/kobject-priv-stacks.ld
View file

@ -14,7 +14,7 @@
* space needs to be reserved for the rodata that will be * space needs to be reserved for the rodata that will be
* produced by gperf during the final stages of linking. * produced by gperf during the final stages of linking.
* The alignment and size are produced by * The alignment and size are produced by
* scripts/gen_kobject_placeholders.py. These are here * scripts/build/gen_kobject_placeholders.py. These are here
* so the addresses to kobjects would remain the same * so the addresses to kobjects would remain the same
* during the final stages of linking (LINKER_ZEPHYR_FINAL). * during the final stages of linking (LINKER_ZEPHYR_FINAL).
*/ */
@ -42,7 +42,7 @@
z_priv_stacks_ram_used = z_priv_stacks_ram_end - z_priv_stacks_ram_start; z_priv_stacks_ram_used = z_priv_stacks_ram_end - z_priv_stacks_ram_start;
ASSERT(z_priv_stacks_ram_used <= KOBJECT_PRIV_STACKS_SZ, ASSERT(z_priv_stacks_ram_used <= KOBJECT_PRIV_STACKS_SZ,
"scripts/gen_kobject_placeholders.py did not reserve enough space \ "scripts/build/gen_kobject_placeholders.py did not reserve enough space \
for privileged stacks." for privileged stacks."
); );

4
include/zephyr/linker/kobject-rom.ld
View file

@ -10,7 +10,7 @@
* space needs to be reserved for the rodata that will be * space needs to be reserved for the rodata that will be
* produced by gperf during the final stages of linking. * produced by gperf during the final stages of linking.
* The alignment and size are produced by * The alignment and size are produced by
* scripts/gen_kobject_placeholders.py. These are here * scripts/build/gen_kobject_placeholders.py. These are here
* so the addresses to kobjects would remain the same * so the addresses to kobjects would remain the same
* during the final stages of linking (LINKER_ZEPHYR_FINAL). * during the final stages of linking (LINKER_ZEPHYR_FINAL).
*/ */
@ -43,7 +43,7 @@
_kobject_rodata_area_used = _kobject_rodata_area_end - _kobject_rodata_area_start; _kobject_rodata_area_used = _kobject_rodata_area_end - _kobject_rodata_area_start;
ASSERT(_kobject_rodata_area_used <= KOBJECT_RODATA_SZ, ASSERT(_kobject_rodata_area_used <= KOBJECT_RODATA_SZ,
"scripts/gen_kobject_placeholders.py did not reserve enough space \ "scripts/build/gen_kobject_placeholders.py did not reserve enough space \
for kobject rodata." for kobject rodata."
); );

0
scripts/gen_kobject_placeholders.py → scripts/build/gen_kobject_placeholders.py
View file