This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0c3839973b7647952b1daf8c60c31648da68516e Author: dechao_gong <[email protected]> AuthorDate: Mon Sep 21 09:44:33 2026 +0800 arch/arm/ameba: fix CI failures in RTL8730E port Two CI issues in the RTL8730E (AmebaSmart CA32) port: 1. PREBUILD used $(ARCHOPTIMIZATION) which injects --param=min-pagesize=0 on GCC>=12. arm-none-eabi-gcc in CI does not recognise this flag. Fix: replace $(ARCHOPTIMIZATION) with explicit -Os -ffunction-sections -fdata-sections in both the fwlib and wifi PREBUILD loops, matching the pattern already used by the other Ameba ICs (rtl8721dx/8720f/8721f). 2. boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig was out of sync with `make savedefconfig` output (missing CONFIG_ARCH_CHIP_RTL8730E_CA32, wrong ordering of several NETUTILS options, and redundant entries that are auto-selected by Kconfig). Regenerated with olddefconfig+savedefconfig. Signed-off-by: dechao_gong <[email protected]> Assisted-by: Claude <[email protected]> --- arch/arm/src/rtl8730e/ameba_board.mk | 5 +++-- boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig | 14 +++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/arm/src/rtl8730e/ameba_board.mk b/arch/arm/src/rtl8730e/ameba_board.mk index 4e1c6eb0df4..8c227677257 100644 --- a/arch/arm/src/rtl8730e/ameba_board.mk +++ b/arch/arm/src/rtl8730e/ameba_board.mk @@ -169,7 +169,8 @@ define PREBUILD for src in $(AMEBA_FWLIB_SRCS); do \ obj="$(AMEBA_PREBUILT_LIBS)/$$(basename $${src%.c}).o"; \ echo " CC $$src"; \ - $(CC) $(ARCHCPUFLAGS) $(ARCHOPTIMIZATION) $(AMEBA_FWLIB_INC) \ + $(CC) $(ARCHCPUFLAGS) -Os -ffunction-sections -fdata-sections \ + $(AMEBA_FWLIB_INC) \ -c $$src -o $$obj || exit 1; \ objs="$$objs $$obj"; \ done; \ @@ -181,7 +182,7 @@ define PREBUILD for src in $(AMEBA_WIFI_SRCS); do \ obj=$(AMEBA_PREBUILT_LIBS)/wifi_obj/`basename $$src .c`.o; \ if [ "$$src" -nt "$$obj" ] 2>/dev/null || [ ! -f "$$obj" ]; then \ - $(CC) $(ARCHCPUFLAGS) $(ARCHOPTIMIZATION) \ + $(CC) $(ARCHCPUFLAGS) -Os -ffunction-sections -fdata-sections \ $(AMEBA_WIFI_INC) -c $$src -o $$obj || exit 1; \ rebuild_wifi=1; \ fi; \ diff --git a/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig b/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig index 63a96ca5cbe..7c6b79af880 100644 --- a/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig +++ b/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH_BOARD="rtl8730e_evb" CONFIG_ARCH_BOARD_RTL8730E_EVB=y CONFIG_ARCH_CHIP="rtl8730e" CONFIG_ARCH_CHIP_RTL8730E=y +CONFIG_ARCH_CHIP_RTL8730E_CA32=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y @@ -34,7 +35,6 @@ CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_IDENTITY_TEXTMAP=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_BUFSIZE=512 @@ -54,6 +54,10 @@ CONFIG_NETINIT_DHCPC=y CONFIG_NETINIT_THREAD=y CONFIG_NETINIT_WAPI_PASSPHRASE="YOUR_WIFI_PASSWORD" CONFIG_NETINIT_WAPI_SSID="YOUR_WIFI_SSID" +CONFIG_NETUTILS_DHCPD=y +CONFIG_NETUTILS_DHCPD_ROUTERIP=0xc0a80401 +CONFIG_NETUTILS_DHCPD_STARTIP=0xc0a80402 +CONFIG_NETUTILS_IPERF=y CONFIG_NET_ARP_IPIN=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1514 @@ -68,12 +72,6 @@ CONFIG_NET_TCP_OUT_OF_ORDER=y CONFIG_NET_TCP_OUT_OF_ORDER_BUFSIZE=10000 CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y -CONFIG_NETUTILS_DHCPD=y -CONFIG_NETUTILS_DHCPD_ROUTERIP=0xc0a80401 -CONFIG_NETUTILS_DHCPD_STARTIP=0xc0a80402 -CONFIG_NETUTILS_DHCPC=y -CONFIG_NETUTILS_IPERF=y -CONFIG_NETUTILS_PING=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_VCONFIG=y CONFIG_NSH_FILEIOSIZE=512 @@ -92,9 +90,7 @@ CONFIG_SCHED_HAVE_PARENT=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_WAITPID=y CONFIG_SMP=y -CONFIG_SMP_CALL=y CONFIG_SMP_NCPUS=2 CONFIG_STACK_COLORATION=y CONFIG_START_DAY=20
