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 d8224051e74155a5205bc8ad2828d5f9ba214c0d Author: dechao_gong <[email protected]> AuthorDate: Sun Sep 20 16:05:46 2026 +0800 arch/arm/ameba: fix nxstyle and cmake-format issues in RTL8730E port Fix all nxstyle and cmake-format violations found by CI checkpatch: - tools/nxstyle.c: add whitelist entries for SDK mixed-case symbols (CPU_, Diag, TRNG_, System_, vPort) used in amebasmart stubs - arch/arm/src/rtl8730e/rtl8730e_serial.c: fix block comment lengths, long lines (replace Unicode arrows with ASCII), align inline comments - arch/arm/src/rtl8730e/rtl8730e_flash_stubs.c: fix long lines and missing blank line after declaration - arch/arm/src/rtl8730e/rtl8730e_wifi_stubs.c: rename nDeviceId to device_id, add Public Functions section header - arch/arm/src/rtl8730e/rtl8730e_memorymap.h: fix block comment lengths and inline comment column alignment - arch/arm/src/rtl8730e/hardware/rtl8730e_loguart.h: wrap long comment - arch/arm/src/common/ameba/ameba_os_wrap.c: add missing blank lines after declarations - boards/arm/rtl8730e/rtl8730e_evb/src/rtl8730e_bringup.c: add missing blank line after extern declaration - arch/arm/src/rtl8730e/CMakeLists.txt: apply cmake-format - boards/arm/rtl8730e/rtl8730e_evb/src/CMakeLists.txt: apply cmake-format Signed-off-by: dechao_gong <[email protected]> --- .../arm/rtl8730e/boards/rtl8730e_evb/index.rst | 4 +- arch/arm/src/common/ameba/ameba_os_wrap.c | 3 ++ arch/arm/src/rtl8730e/CMakeLists.txt | 50 ++++++++++++---------- arch/arm/src/rtl8730e/hardware/rtl8730e_loguart.h | 3 +- arch/arm/src/rtl8730e/rtl8730e_flash_stubs.c | 6 ++- arch/arm/src/rtl8730e/rtl8730e_memorymap.h | 6 +-- arch/arm/src/rtl8730e/rtl8730e_serial.c | 41 ++++++++++-------- arch/arm/src/rtl8730e/rtl8730e_wifi_stubs.c | 16 ++++--- .../rtl8730e/rtl8730e_evb/configs/nsh/defconfig | 8 +--- .../arm/rtl8730e/rtl8730e_evb/src/CMakeLists.txt | 4 +- .../rtl8730e/rtl8730e_evb/src/etc/init.d/init.rc | 33 -------------- .../rtl8730e/rtl8730e_evb/src/rtl8730e_bringup.c | 1 + tools/nxstyle.c | 5 +++ 13 files changed, 82 insertions(+), 98 deletions(-) diff --git a/Documentation/platforms/arm/rtl8730e/boards/rtl8730e_evb/index.rst b/Documentation/platforms/arm/rtl8730e/boards/rtl8730e_evb/index.rst index d49982ba22f..d6609add034 100644 --- a/Documentation/platforms/arm/rtl8730e/boards/rtl8730e_evb/index.rst +++ b/Documentation/platforms/arm/rtl8730e/boards/rtl8730e_evb/index.rst @@ -1,6 +1,6 @@ -======== +============ RTL8730E_EVB -======== +============ .. tags:: chip:rtl8730e, arch:arm, vendor:realtek diff --git a/arch/arm/src/common/ameba/ameba_os_wrap.c b/arch/arm/src/common/ameba/ameba_os_wrap.c index ed562e16740..f63ea1d3333 100644 --- a/arch/arm/src/common/ameba/ameba_os_wrap.c +++ b/arch/arm/src/common/ameba/ameba_os_wrap.c @@ -784,6 +784,7 @@ int rtos_sema_delete_static(rtos_sema_t p_handle) uint32_t rtos_mem_get_free_heap_size(void) { struct mallinfo info = mallinfo(); + return (uint32_t)info.fordblks; } @@ -940,6 +941,7 @@ int rtos_timer_change_period(rtos_timer_t p_handle, uint32_t interval_ms, uint32_t rtos_timer_is_timer_active(rtos_timer_t p_handle) { struct ameba_timer_s *t = (struct ameba_timer_s *)p_handle; + return (t != NULL && t->active) ? 1 : 0; } @@ -968,6 +970,7 @@ int rtos_timer_delete_static(rtos_timer_t p_handle, uint32_t wait_ms) uint32_t rtos_timer_get_id(rtos_timer_t p_handle) { struct ameba_timer_s *t = (struct ameba_timer_s *)p_handle; + return (t != NULL) ? t->id : 0; } diff --git a/arch/arm/src/rtl8730e/CMakeLists.txt b/arch/arm/src/rtl8730e/CMakeLists.txt index b186022ac30..ab97bdd5646 100644 --- a/arch/arm/src/rtl8730e/CMakeLists.txt +++ b/arch/arm/src/rtl8730e/CMakeLists.txt @@ -61,7 +61,8 @@ endif() if(CONFIG_AMEBA_GPIO) list(APPEND SRCS ${AMEBA_COMMON}/ameba_gpio.c) # rtl8730e_flash_stubs.c is also needed for GPIO (irq_enable / Pinmux_Config - # called by lib_rom.a GPIO functions). Avoid duplicate if already added above. + # called by lib_rom.a GPIO functions). Avoid duplicate if already added + # above. if(NOT CONFIG_RTL8730E_FLASH_FS) list(APPEND SRCS rtl8730e_flash_stubs.c) endif() @@ -72,12 +73,12 @@ target_sources(arch PRIVATE ${SRCS}) # ############################################################################## # Vendor-SDK build machinery (fwlib + WiFi glue archives, prebuilt libs, and -# link flags). RTL8730E (CA32) differs from the KM4-based ICs: -# - No SDK autoconf / image2 ldscript generation: the board uses its own -# dramboot.ld and a static prebuilt platform_autoconf.h. -# - No NP firmware build: KM0/KM4 are prebuilt blobs in boards/.../prebuilt/. -# - No -mcmse (CA32 is ARMv7-A, not Cortex-M33). -# - lib_rom.a provides ROM functions (GPIO_Init, Pinmux_Config, flash MTD). +# link flags). RTL8730E (CA32) differs from the KM4-based ICs: - No SDK +# autoconf / image2 ldscript generation: the board uses its own dramboot.ld and +# a static prebuilt platform_autoconf.h. - No NP firmware build: KM0/KM4 are +# prebuilt blobs in boards/.../prebuilt/. - No -mcmse (CA32 is ARMv7-A, not +# Cortex-M33). - lib_rom.a provides ROM functions (GPIO_Init, Pinmux_Config, +# flash MTD). # ############################################################################## # Per-IC identifiers (parallel to the names in ameba_board.mk). @@ -183,8 +184,8 @@ endif() set(AMEBA_EXTRA_LIBS) -# lib_rom.a: prebuilt AP ROM stubs (GPIO_Init, RCC_PeriphClockCmd, -# PAD_PullCtrl, Pinmux_Config, flash MTD primitives). +# lib_rom.a: prebuilt AP ROM stubs (GPIO_Init, RCC_PeriphClockCmd, PAD_PullCtrl, +# Pinmux_Config, flash MTD primitives). if(CONFIG_AMEBA_GPIO OR CONFIG_RTL8730E_FLASH_FS) list(APPEND AMEBA_EXTRA_LIBS ${AMEBA_SOC}/project/${AMEBA_KM_PROJ}/lib/soc/lib_rom.a) @@ -204,16 +205,16 @@ if(CONFIG_RTL8730E_FLASH_FS AND EXISTS ${AMEBA_AUTOCONF}) list(GET _l 0 _l0) string(REGEX REPLACE ".*CONFIG_FLASH_VFS1_OFFSET[ \t]+([0-9xXa-fA-F]+).*" "\\1" _vfs1_off "${_l0}") - target_compile_definitions(arch PRIVATE - AMEBA_FLASH_VFS1_OFFSET_XIP=${_vfs1_off}) + target_compile_definitions(arch + PRIVATE AMEBA_FLASH_VFS1_OFFSET_XIP=${_vfs1_off}) endif() file(STRINGS ${AMEBA_AUTOCONF} _l REGEX "CONFIG_FLASH_VFS1_SIZE[ \t]") if(_l) list(GET _l 0 _l0) string(REGEX REPLACE ".*CONFIG_FLASH_VFS1_SIZE[ \t]+([0-9xXa-fA-F]+).*" "\\1" _vfs1_size "${_l0}") - target_compile_definitions(arch PRIVATE - AMEBA_FLASH_VFS1_SIZE_CFG=${_vfs1_size}) + target_compile_definitions(arch + PRIVATE AMEBA_FLASH_VFS1_SIZE_CFG=${_vfs1_size}) endif() endif() @@ -275,15 +276,19 @@ if(CONFIG_RTL8730E_WIFI) add_dependencies(nuttx ${_wifi_target}) set(_ameba_ap_lib ${AMEBA_SOC}/project/${AMEBA_KM_PROJ}/lib/application) - list(APPEND AMEBA_EXTRA_LIBS ${_ameba_ap_lib}/lib_wifi_whc_ap.a - ${_ameba_ap_lib}/lib_wifi_rtk_app.a - ${_ameba_ap_lib}/lib_wifi_com_sec.a - ${_ameba_ap_lib}/lib_wpa_lite.a - ${AMEBA_WIFI_A}) + list( + APPEND + AMEBA_EXTRA_LIBS + ${_ameba_ap_lib}/lib_wifi_whc_ap.a + ${_ameba_ap_lib}/lib_wifi_rtk_app.a + ${_ameba_ap_lib}/lib_wifi_com_sec.a + ${_ameba_ap_lib}/lib_wpa_lite.a + ${AMEBA_WIFI_A}) endif() # Suppress the VFP-ABI mismatch warning between lib_rom.a / WiFi libs (compiled -# without hard-float) and the rest of the NuttX build (compiled with hard-float). +# without hard-float) and the rest of the NuttX build (compiled with +# hard-float). if(AMEBA_EXTRA_LIBS) target_link_options(nuttx PRIVATE -Wl,--no-warn-mismatch) endif() @@ -295,7 +300,7 @@ set_property(GLOBAL APPEND PROPERTY NUTTX_EXTRA_LIBRARIES ${AMEBA_EXTRA_LIBS}) # ---------------------------------------------------------------------------- # `flash` target -- download boot.bin + nuttx.bin via ameba_smart_flash.sh. # Usage: AMEBA_PORT=/dev/ttyUSB1 [AMEBA_BAUD=1500000] cmake --build <dir> -# --target flash +# --target flash # ---------------------------------------------------------------------------- set(AMEBA_TOOLS_DIR ${AMEBA_COMMON}/tools) @@ -304,9 +309,8 @@ if(EXISTS ${AMEBA_TOOLS_DIR}/ameba_smart_flash.sh AND NOT TARGET flash) add_custom_target( flash DEPENDS nuttx - COMMAND - ${CMAKE_COMMAND} -E env sh ${AMEBA_TOOLS_DIR}/ameba_smart_flash.sh - ${AMEBA_SDK} ${AMEBA_PREBUILT} ${NUTTX_BINARY_DIR}/nuttx.bin + COMMAND ${CMAKE_COMMAND} -E env sh ${AMEBA_TOOLS_DIR}/ameba_smart_flash.sh + ${AMEBA_SDK} ${AMEBA_PREBUILT} ${NUTTX_BINARY_DIR}/nuttx.bin WORKING_DIRECTORY ${NUTTX_BINARY_DIR} USES_TERMINAL VERBATIM COMMENT "Flashing RTL8730E over ${AMEBA_PORT}") diff --git a/arch/arm/src/rtl8730e/hardware/rtl8730e_loguart.h b/arch/arm/src/rtl8730e/hardware/rtl8730e_loguart.h index 81646d8e839..196c82fcece 100644 --- a/arch/arm/src/rtl8730e/hardware/rtl8730e_loguart.h +++ b/arch/arm/src/rtl8730e/hardware/rtl8730e_loguart.h @@ -29,7 +29,8 @@ /* AmebaSmart (RTL8730E) LOGUART is a Realtek-specific console UART shared by * all three cores (KM0/KM4/CA32). It is NOT a PL011 nor a 16550. Register - * base and layout come from the vendor SDK (hal_platform.h / ameba_loguart.h). + * base and layout come from the vendor SDK (hal_platform.h / + * ameba_loguart.h). * The KM4 IMG1 bootloader has already configured the baud rate before it * hands control to the CA32, so NuttX only needs to poll the line-status * register and push characters into its own transmit path FIFO. diff --git a/arch/arm/src/rtl8730e/rtl8730e_flash_stubs.c b/arch/arm/src/rtl8730e/rtl8730e_flash_stubs.c index d1373d759f3..80c15caf633 100644 --- a/arch/arm/src/rtl8730e/rtl8730e_flash_stubs.c +++ b/arch/arm/src/rtl8730e/rtl8730e_flash_stubs.c @@ -60,7 +60,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Flash XIP window: 0x08000000–0x0FFFFFFF (128 MiB), 128 × 1 MiB sections. +/* Flash XIP window: 0x08000000-0x0FFFFFFF (128 MiB), 128 x 1 MiB sections. * Matches the range the SDK maps as MT_CODE in setupMMUTable(). */ @@ -101,7 +101,8 @@ void vPortWakeOtherCore(void) * 1. Clean+invalidate D-cache for the flash window (write back any dirty * lines so the device view is coherent). * 2. Re-map all 128 L1 sections to MMU_IOFLAGS (Device, non-cacheable). - * 3. Flush the TLB (via mmu_invalidate_region which also issues DSB/ISB). + * 3. Flush the TLB (via mmu_invalidate_region which also issues + * DSB/ISB). ****************************************************************************/ void xlat_flash_region_device(void) @@ -202,6 +203,7 @@ int CPU_InInterrupt(void) */ uint32_t cpsr; + __asm__ volatile("mrs %0, cpsr" : "=r"(cpsr)); return ((cpsr & 0x1f) != 0x10) && ((cpsr & 0x1f) != 0x1f); } diff --git a/arch/arm/src/rtl8730e/rtl8730e_memorymap.h b/arch/arm/src/rtl8730e/rtl8730e_memorymap.h index 64184af738d..3fc56d839a3 100644 --- a/arch/arm/src/rtl8730e/rtl8730e_memorymap.h +++ b/arch/arm/src/rtl8730e/rtl8730e_memorymap.h @@ -62,7 +62,7 @@ #define VIRT_DDR_PSECTION 0x60000000 /* 0x60000000-0x64000000 */ #define VIRT_GIC_PSECTION 0xa0000000 /* 0xa0000000-0xa0200000 */ -/* RTL8730E Virtual Memory Map *********************************************/ +/* RTL8730E Virtual Memory Map **********************************************/ #define VIRT_FLASH_VSECTION VIRT_FLASH_PSECTION #define VIRT_KM0_VSECTION VIRT_KM0_PSECTION @@ -75,8 +75,8 @@ #define VIRT_FLASH_SECSIZE (128*1024*1024) /* 128 MiB XIP window */ #define VIRT_KM4_SRAM_SECSIZE (1*1024*1024) /* 1 MiB covers 0x2001c01c */ -#define VIRT_KM0_SECSIZE (128*1024) /* 128 KB, rounds to 1 MMU section */ -#define VIRT_IO_SECSIZE (80*1024*1024) /* 0x40000000-0x44FFFFFF: APB + SPIC ctrl */ +#define VIRT_KM0_SECSIZE (128*1024) /* 128 KB, rounds to 1 MMU section */ +#define VIRT_IO_SECSIZE (80*1024*1024) /* 0x40000000-0x44FFFFFF: APB + SPIC ctrl */ #define VIRT_SEC_IO_SECSIZE (48*1024*1024) #define VIRT_DDR_SECSIZE (64*1024*1024) #define VIRT_GIC_SECSIZE (2*1024*1024) diff --git a/arch/arm/src/rtl8730e/rtl8730e_serial.c b/arch/arm/src/rtl8730e/rtl8730e_serial.c index 0c8d8d54e50..d38399f095d 100644 --- a/arch/arm/src/rtl8730e/rtl8730e_serial.c +++ b/arch/arm/src/rtl8730e/rtl8730e_serial.c @@ -1,4 +1,4 @@ -/*************************************************************************** +/**************************************************************************** * arch/arm/src/rtl8730e/rtl8730e_serial.c * * SPDX-License-Identifier: Apache-2.0 @@ -18,11 +18,11 @@ * License for the specific language governing permissions and limitations * under the License. * - ***************************************************************************/ + ****************************************************************************/ -/*************************************************************************** +/**************************************************************************** * Included Files - ***************************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> @@ -38,9 +38,9 @@ #include "hardware/rtl8730e_loguart.h" #include "chip.h" -/*************************************************************************** +/**************************************************************************** * Pre-processor Definitions - ***************************************************************************/ + ****************************************************************************/ /* RTL8730E AmebaSmart LOGUART console driver. * @@ -76,7 +76,9 @@ #define IPCAP_ISR (RTL8730E_IPCAP_BASE + 0x008) #define IPCAP_IMR (RTL8730E_IPCAP_BASE + 0x00c) -/* LP→AP LOGUART channel 0 = ISR/IMR bit 24 (IPC_BIT_ISR_RX0_FULL_STATUS0) */ +/* LP->AP LOGUART channel 0 = ISR/IMR bit 24 + * (IPC_BIT_ISR_RX0_FULL_STATUS0) + */ #define IPCAP_L2A_LOGUART_BIT (1u << 24) @@ -105,9 +107,9 @@ #define LOGUART_RXBUFSIZE 256 #define LOGUART_TXBUFSIZE 256 -/*************************************************************************** +/**************************************************************************** * Private Function Prototypes - ***************************************************************************/ + ****************************************************************************/ static int loguart_setup(struct uart_dev_s *dev); static void loguart_shutdown(struct uart_dev_s *dev); @@ -123,9 +125,9 @@ static void loguart_txint(struct uart_dev_s *dev, bool enable); static bool loguart_txready(struct uart_dev_s *dev); static bool loguart_txempty(struct uart_dev_s *dev); -/*************************************************************************** +/**************************************************************************** * Private Data - ***************************************************************************/ + ****************************************************************************/ static const struct uart_ops_s g_loguart_ops = { @@ -167,13 +169,13 @@ static struct uart_dev_s g_loguart_port = * it here so that loguart_receive() can serve it one byte at a time. */ -static char g_ipc_rxbuf[UART_LOG_CMDLEN + 1]; /* +1 for appended '\n' */ +static char g_ipc_rxbuf[UART_LOG_CMDLEN + 1]; /* +1 for appended '\n' */ static uint8_t g_ipc_rxcount; /* total chars available */ static uint8_t g_ipc_rxhead; /* next index to serve */ -/*************************************************************************** +/**************************************************************************** * Private Functions - ***************************************************************************/ + ****************************************************************************/ static int loguart_setup(struct uart_dev_s *dev) { @@ -223,7 +225,8 @@ static void loguart_detach(struct uart_dev_s *dev) */ /* Weak hook called at the end of every IPC_AP interrupt to give WiFi a - * chance to process its NP→AP channels (bits 16/17). rtl8730e_wifi_init.c + * chance to process its NP->AP channels (bits 16/17). + * rtl8730e_wifi_init.c * provides the strong definition when CONFIG_RTL8730E_WIFI is enabled. * The weak stub here is a no-op so non-WiFi builds compile without change. */ @@ -248,8 +251,8 @@ static int loguart_ipc_interrupt(int irq, void *context, void *arg) if ((getreg32(IPCAP_ISR) & IPCAP_L2A_LOGUART_BIT) != 0) { - /* Read IPC message slot: msg field holds UART_LOG_BUF physical address. - * KM0 SRAM is mapped device/IO (non-cacheable), no dcache flush needed. + /* Read IPC message slot: msg field holds UART_LOG_BUF + * physical address. KM0 SRAM is device/IO (non-cacheable). */ log_buf_addr = getreg32(IPC_L2A_LOGUART_SLOT + IPC_MSG_MSG_OFF); @@ -376,9 +379,9 @@ static bool loguart_txempty(struct uart_dev_s *dev) return true; } -/*************************************************************************** +/**************************************************************************** * Public Functions - ***************************************************************************/ + ****************************************************************************/ void up_putc(int ch) { diff --git a/arch/arm/src/rtl8730e/rtl8730e_wifi_stubs.c b/arch/arm/src/rtl8730e/rtl8730e_wifi_stubs.c index ca94f96b36d..b94ab2a6939 100644 --- a/arch/arm/src/rtl8730e/rtl8730e_wifi_stubs.c +++ b/arch/arm/src/rtl8730e/rtl8730e_wifi_stubs.c @@ -47,6 +47,10 @@ #include <stdint.h> #include <string.h> +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * PMU stubs — power management owned by KM4 on amebasmart ****************************************************************************/ @@ -56,15 +60,15 @@ int pmu_yield_os_check(void) return 0; } -int pmu_acquire_wakelock(uint32_t nDeviceId) +int pmu_acquire_wakelock(uint32_t device_id) { - (void)nDeviceId; + (void)device_id; return 0; } -int pmu_release_wakelock(uint32_t nDeviceId) +int pmu_release_wakelock(uint32_t device_id) { - (void)nDeviceId; + (void)device_id; return 0; } @@ -79,11 +83,11 @@ uint32_t pmu_get_wakelock_status(void) return 0; } -int pmu_register_sleep_callback(uint32_t nDeviceId, void *presleep, +int pmu_register_sleep_callback(uint32_t device_id, void *presleep, void *psleep_param, void *pwakeup, void *pwakeup_param) { - (void)nDeviceId; + (void)device_id; (void)presleep; (void)psleep_param; (void)pwakeup; diff --git a/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig b/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig index c5c80608921..63a96ca5cbe 100644 --- a/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig +++ b/boards/arm/rtl8730e/rtl8730e_evb/configs/nsh/defconfig @@ -24,27 +24,23 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_DHCPD=y -CONFIG_EXPERIMENTAL=y CONFIG_EXAMPLES_HELLO=y CONFIG_FLASH_SIZE=1048576 CONFIG_FLASH_START=0x60300000 CONFIG_FLASH_VSTART=0x60300000 CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y -CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDENTITY_TEXTMAP=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_INIT_ENTRYPOINT="init_main" +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_BUFSIZE=512 CONFIG_IOB_NBUFFERS=100 CONFIG_IOB_NCHAINS=36 CONFIG_IOB_THROTTLE=40 -CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_MEMFD_ERROR=y CONFIG_MM_DEFAULT_ALIGNMENT=64 CONFIG_MODULE=y @@ -92,7 +88,6 @@ CONFIG_READLINE_CMD_HISTORY=y CONFIG_RR_INTERVAL=200 CONFIG_RTL8730E_FLASH_FS=y CONFIG_RTL8730E_WIFI=y -CONFIG_SCHED_CHILD_STATUS=y CONFIG_SCHED_HAVE_PARENT=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 @@ -109,7 +104,6 @@ CONFIG_SYSTEM_CPULOAD=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_STACKSIZE=2500 -CONFIG_SYSTEM_NXINIT=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y diff --git a/boards/arm/rtl8730e/rtl8730e_evb/src/CMakeLists.txt b/boards/arm/rtl8730e/rtl8730e_evb/src/CMakeLists.txt index b9009fb1e54..26dc588e411 100644 --- a/boards/arm/rtl8730e/rtl8730e_evb/src/CMakeLists.txt +++ b/boards/arm/rtl8730e/rtl8730e_evb/src/CMakeLists.txt @@ -23,8 +23,8 @@ set(SRCS rtl8730e_boardinit.c rtl8730e_bringup.c) if(CONFIG_AMEBA_GPIO) list(APPEND SRCS rtl8730e_gpio.c) - target_include_directories(board PRIVATE - ${NUTTX_DIR}/arch/arm/src/common/ameba) + target_include_directories(board + PRIVATE ${NUTTX_DIR}/arch/arm/src/common/ameba) endif() if(CONFIG_LIBC_FDT) diff --git a/boards/arm/rtl8730e/rtl8730e_evb/src/etc/init.d/init.rc b/boards/arm/rtl8730e/rtl8730e_evb/src/etc/init.d/init.rc deleted file mode 100644 index 782eaf1cf4e..00000000000 --- a/boards/arm/rtl8730e/rtl8730e_evb/src/etc/init.d/init.rc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - * boards/arm/rtl8730e/rtl8730e_evb/src/etc/init.d/init.rc - * - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -#include <nuttx/config.h> - -#ifdef CONFIG_SYSTEM_NSH -service console sh - restart_period 1000 -#endif - -on init -#ifdef CONFIG_SYSTEM_NSH - start console -#endif diff --git a/boards/arm/rtl8730e/rtl8730e_evb/src/rtl8730e_bringup.c b/boards/arm/rtl8730e/rtl8730e_evb/src/rtl8730e_bringup.c index 45172d51eb1..f31d68db987 100644 --- a/boards/arm/rtl8730e/rtl8730e_evb/src/rtl8730e_bringup.c +++ b/boards/arm/rtl8730e/rtl8730e_evb/src/rtl8730e_bringup.c @@ -222,6 +222,7 @@ int rtl8730e_bringup(void) */ extern void rtl8730e_flash_init_para(void); + rtl8730e_flash_init_para(); ret = ameba_flash_fs_initialize(); diff --git a/tools/nxstyle.c b/tools/nxstyle.c index a2522a75208..ea08034c8a6 100644 --- a/tools/nxstyle.c +++ b/tools/nxstyle.c @@ -285,6 +285,8 @@ static const char *g_white_prefix[] = "Cache_", "DCache_", "ChipInfo_", + "CPU_", /* CPU_InInterrupt — amebasmart SDK exception check */ + "Diag", /* DiagPrintf, DiagVprintf, DiagPrintfNano — SDK log */ "EFUSE_", "FLASH_", "GPIO_", @@ -309,8 +311,11 @@ static const char *g_white_prefix[] = "SYSCFG_", "SYSTIMER_", "SYS_PLL_", /* SYS_PLL_ClkGet — RTL8720F SPI ip_clk query */ + "System_", /* System_Reset — amebasmart SDK power management */ + "TRNG_", /* TRNG_get_random_bytes — amebasmart SDK TRNG */ "UART_", "WDG_", /* WDG_Init, WDG_Refresh, WDG_INTConfig, etc. */ + "vPort", /* vPortGateOtherCore, vPortWakeOtherCore — FreeRTOS SMP */ "SystemCoreClock", /* SystemCoreClock, SystemCoreClockUpdate */ "cmse_", /* ARM CMSE TrustZone intrinsics (arm_cmse.h) */ "MQTTErrors", /* apps/tools/netutils/mqttc/MQTT-C/include/mqtt.h */
