From fc8b9f0e1268bf6452e7d1d5018987738b3a3dbd Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sun, 24 Dec 2023 22:53:21 +0800 Subject: [PATCH 1/3] [stm32-pandora] add attach config CI check --- bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lcd.attach | 3 +++ bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lvgl.attach | 2 ++ .../stm32l475-atk-pandora/.ci/attachconfig/rtduino.attach | 5 +++++ 3 files changed, 10 insertions(+) create mode 100644 bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lcd.attach create mode 100644 bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lvgl.attach create mode 100644 bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/rtduino.attach diff --git a/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lcd.attach b/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lcd.attach new file mode 100644 index 00000000000..a03c04ee6a9 --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lcd.attach @@ -0,0 +1,3 @@ +CONFIG_BSP_USING_SPI_LCD=y +CONFIG_BSP_USING_LCD_SAMPLE=y +CONFIG_BSP_USING_LCD_QRCODE=y diff --git a/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lvgl.attach b/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lvgl.attach new file mode 100644 index 00000000000..d90eeb40aee --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/lvgl.attach @@ -0,0 +1,2 @@ +CONFIG_BSP_USING_LVGL=y +CONFIG_BSP_USING_LVGL_DEMO=y diff --git a/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/rtduino.attach b/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/rtduino.attach new file mode 100644 index 00000000000..b414212c9d4 --- /dev/null +++ b/bsp/stm32/stm32l475-atk-pandora/.ci/attachconfig/rtduino.attach @@ -0,0 +1,5 @@ +CONFIG_BSP_USING_ARDUINO=y +CONFIG_BSP_USING_ARDUINO_ST7789=y +CONFIG_BSP_USING_ARDUINO_ST7789_DEMO=y +CONFIG_BSP_USING_ARDUINO_AHT10=y +CONFIG_BSP_USING_ARDUINO_AHT10_DEMO=y From 89eac517a6c35440de2198f656bbe4a614f19e38 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 25 Dec 2023 21:08:47 +0800 Subject: [PATCH 2/3] [libc][picolibc] fix llvm compling warning /home/runner/work/rt-thread/rt-thread/components/libc/compilers/picolibc/syscall.c:24:16: warning: returning 'volatile int *' from a function with result type 'int *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers] return &__pico_errno; ^~~~~~~~~~~~~ /home/runner/work/rt-thread/rt-thread/components/libc/compilers/picolibc/syscall.c:30:16: warning: returning 'volatile int *' from a function with result type 'int *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers] return &__pico_errno; ^~~~~~~~~~~~~ /home/runner/work/rt-thread/rt-thread/components/libc/compilers/picolibc/syscall.c:33:12: warning: incompatible pointer types returning 'rt_err_t *' (aka 'long *') from a function with result type 'int *' [-Wincompatible-pointer-types] return &tid->error; --- components/libc/compilers/picolibc/syscall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/libc/compilers/picolibc/syscall.c b/components/libc/compilers/picolibc/syscall.c index c2e45624f9f..cf5622df844 100644 --- a/components/libc/compilers/picolibc/syscall.c +++ b/components/libc/compilers/picolibc/syscall.c @@ -21,16 +21,16 @@ int *pico_get_errno(void) if (rt_interrupt_get_nest() != 0) { /* it's in interrupt context */ - return &__pico_errno; + return (int *)&__pico_errno; } tid = rt_thread_self(); if (tid == RT_NULL) { - return &__pico_errno; + return (int *)&__pico_errno; } - return &tid->error; + return (int *)&tid->error; } #ifdef RT_USING_HEAP From 309da7b059c3f1c70a77a045a681d494ae0eb342 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 25 Dec 2023 22:45:47 +0800 Subject: [PATCH 3/3] [ci] silent pkgs --update when building bsp --- tools/ci/bsp_buildings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci/bsp_buildings.py b/tools/ci/bsp_buildings.py index 01222a74665..39351d76419 100644 --- a/tools/ci/bsp_buildings.py +++ b/tools/ci/bsp_buildings.py @@ -44,11 +44,11 @@ def build_bsp(bsp): scons -C bsp/{bsp} --pyconfig-silent > /dev/null cd {rtt_root}/bsp/{bsp} - pkgs --update + pkgs --update > /dev/null pkgs --list cd {rtt_root} - scons -C bsp/{bsp} -j{nproc} --debug=time + scons -C bsp/{bsp} -j{nproc} cd {rtt_root}/bsp/{bsp} scons -c > /dev/null @@ -62,7 +62,7 @@ def build_bsp(bsp): run_cmd(f'scons -C bsp/{bsp} --pyconfig-silent', output_info=False) os.chdir(f'{rtt_root}/bsp/{bsp}') - run_cmd('pkgs --update') + run_cmd('pkgs --update', output_info=False) run_cmd('pkgs --list') nproc = multiprocessing.cpu_count()