From 4a5ebcc6b34c76f02d341e1d41b00c322eb0fd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 30 Mar 2025 10:43:09 +0200 Subject: [PATCH 1/2] feat: use new init commands feature for lvperf images --- docker/Dockerfile.lvperf_32b | 2 ++ docker/Dockerfile.lvperf_64b | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker/Dockerfile.lvperf_32b b/docker/Dockerfile.lvperf_32b index bb7f4140d..14dd231a3 100644 --- a/docker/Dockerfile.lvperf_32b +++ b/docker/Dockerfile.lvperf_32b @@ -16,6 +16,7 @@ RUN echo 'PLATFORM := virt32' > build.conf RUN cd so3;\ make virt32_lvperf_defconfig;\ + sed -i 's/CONFIG_USER_INIT_PROGRAM="lvgl_benchmark.elf"/CONFIG_USER_INIT_PROGRAM="init.elf"/g' .config; \ make -j`nproc` RUN cd u-boot;\ @@ -48,6 +49,7 @@ RUN mkdir -p rootfs RUN mkdir -p docker/scripts COPY usr usr +RUN printf "run lvgl_benchmark.elf\nexit\n" > usr/out/init_commands.txt COPY docker/scripts docker/scripts COPY target/virt32_lvperf.its target diff --git a/docker/Dockerfile.lvperf_64b b/docker/Dockerfile.lvperf_64b index eda25926d..8634d04b4 100644 --- a/docker/Dockerfile.lvperf_64b +++ b/docker/Dockerfile.lvperf_64b @@ -16,6 +16,7 @@ RUN echo 'PLATFORM := virt64' > build.conf RUN cd so3;\ make virt64_lvperf_defconfig;\ + sed -i 's/CONFIG_USER_INIT_PROGRAM="lvgl_benchmark.elf"/CONFIG_USER_INIT_PROGRAM="init.elf"/g' .config; \ make -j`nproc` RUN cd u-boot;\ @@ -49,6 +50,7 @@ RUN mkdir -p docker/scripts RUN mkdir -p rootfs COPY usr usr +RUN printf "run lvgl_benchmark.elf\nexit\n" > usr/out/init_commands.txt COPY target/virt64_lvperf.its target COPY docker/scripts docker/scripts From 66bf2105872481974f36595af5d1658a440e5bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Tue, 1 Apr 2025 10:22:12 +0200 Subject: [PATCH 2/2] refactor: rename init_commands.txt to commands.ini --- docker/Dockerfile.lvperf_32b | 2 +- docker/Dockerfile.lvperf_64b | 2 +- usr/out/{init_commands.txt => commands.ini} | 0 usr/src/init.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename usr/out/{init_commands.txt => commands.ini} (100%) diff --git a/docker/Dockerfile.lvperf_32b b/docker/Dockerfile.lvperf_32b index 14dd231a3..d683a4b9d 100644 --- a/docker/Dockerfile.lvperf_32b +++ b/docker/Dockerfile.lvperf_32b @@ -49,7 +49,7 @@ RUN mkdir -p rootfs RUN mkdir -p docker/scripts COPY usr usr -RUN printf "run lvgl_benchmark.elf\nexit\n" > usr/out/init_commands.txt +RUN printf "run lvgl_benchmark.elf\nexit\n" > usr/out/commands.ini COPY docker/scripts docker/scripts COPY target/virt32_lvperf.its target diff --git a/docker/Dockerfile.lvperf_64b b/docker/Dockerfile.lvperf_64b index 8634d04b4..730b3360c 100644 --- a/docker/Dockerfile.lvperf_64b +++ b/docker/Dockerfile.lvperf_64b @@ -50,7 +50,7 @@ RUN mkdir -p docker/scripts RUN mkdir -p rootfs COPY usr usr -RUN printf "run lvgl_benchmark.elf\nexit\n" > usr/out/init_commands.txt +RUN printf "run lvgl_benchmark.elf\nexit\n" > usr/out/commands.ini COPY target/virt64_lvperf.its target COPY docker/scripts docker/scripts diff --git a/usr/out/init_commands.txt b/usr/out/commands.ini similarity index 100% rename from usr/out/init_commands.txt rename to usr/out/commands.ini diff --git a/usr/src/init.c b/usr/src/init.c index 2e9118128..f88a6dcf9 100644 --- a/usr/src/init.c +++ b/usr/src/init.c @@ -56,7 +56,7 @@ #include #include -#define INPUT_COMMAND_FILE "init_commands.txt" +#define INPUT_COMMAND_FILE "commands.ini" #define ARGS_MAX 16 #define MAX_COMMAND_LEN 512