Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

boards: move USERMAIN_XX out of INIT_ENTRYPOINT

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2021-12-23 11:56:43 +08:00
committed by Xiang Xiao
parent 0bb32f27c0
commit 412d030149
930 changed files with 1195 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
+1 -1
View File
@@ -29,6 +29,7 @@ CONFIG_IMXRT_FLEXCAN1=y
CONFIG_IMXRT_FLEXCAN2=y
CONFIG_IMXRT_FLEXCAN3=y
CONFIG_IMXRT_LPUART1=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
@@ -54,4 +55,3 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USER_ENTRYPOINT="nsh_main"
boards/arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig
+1 -1
View File
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENC1=y
CONFIG_IMXRT_LPUART1=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_NCHAINS=24
@@ -44,5 +45,4 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WQUEUE_NOTIFIER=y
boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
+1 -1
View File
@@ -27,6 +27,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPSPI4=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USBDEV=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -55,5 +56,4 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
+1 -1
View File
@@ -27,6 +27,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENET=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USBDEV=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_HOSTNAME="Teensy 4.x"
CONFIG_NET=y
@@ -67,4 +68,3 @@ CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_PING=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
CONFIG_USER_ENTRYPOINT="nsh_main"
boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
+1 -1
View File
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART6=y
CONFIG_IMXRT_USBDEV=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -38,4 +39,3 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_USBDEV=y
CONFIG_USER_ENTRYPOINT="nsh_main"
boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
+1 -1
View File
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USBDEV=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -39,4 +40,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
CONFIG_USER_ENTRYPOINT="nsh_main"
boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
+1 -1
View File
@@ -60,6 +60,7 @@ CONFIG_IMXRT_FLEXCAN_TXMB=1
CONFIG_IMXRT_LPSPI4=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_SNVS_LPSRTC=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -145,5 +146,4 @@ CONFIG_SYSTEM_PING=y
CONFIG_SYSTEM_TEE=y
CONFIG_TEENSY_41=y
CONFIG_USEC_PER_TICK=1000
CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
boards/arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig
+1 -1
View File
@@ -30,6 +30,7 @@ CONFIG_IMXRT_FLEXPWM2=y
CONFIG_IMXRT_FLEXPWM2_MOD1=y
CONFIG_IMXRT_FLEXPWM2_MOD2=y
CONFIG_IMXRT_LPUART1=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_NCHAINS=24
@@ -52,5 +53,4 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WQUEUE_NOTIFIER=y
boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
+1 -1
View File
@@ -32,6 +32,7 @@ CONFIG_IMXRT_USBDEV=y
CONFIG_IMXRT_USDHC1=y
CONFIG_IMXRT_USDHC1_INVERT_CD=y
CONFIG_IMXRT_USDHC1_WIDTH_D1_D4=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -55,4 +56,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
CONFIG_USER_ENTRYPOINT="nsh_main"
boards/arm/imxrt/teensy-4.x/kernel/Makefile
+2 -2
View File
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
CONFIG_USER_ENTRYPOINT ?= user_start
ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
CONFIG_INIT_ENTRYPOINT ?= user_start
ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
+2 -2
View File
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
.us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
.us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,