mirror of
https://github.com/apache/nuttx.git
synced 2026-06-02 09:28:40 +08:00
config: finalize transition from USER_ENTRYPOINT to INIT_ENTRYPOINT
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
committed by
Xiang Xiao
parent
aa84559566
commit
20ac85860c
@@ -189,7 +189,7 @@ const struct userspace_s userspace __attribute__ ((section ("userspace"))) =
|
|||||||
|
|
||||||
.us_base =
|
.us_base =
|
||||||
{
|
{
|
||||||
.us_entrypoint = CONFIG_USER_ENTRYPOINT,
|
.us_entrypoint = CONFIG_INIT_ENTRYPOINT,
|
||||||
.us_textstart = (uintptr_t)g_textstart,
|
.us_textstart = (uintptr_t)g_textstart,
|
||||||
.us_textend = (uintptr_t)g_textend,
|
.us_textend = (uintptr_t)g_textend,
|
||||||
.us_datasource = (uintptr_t)g_datasource,
|
.us_datasource = (uintptr_t)g_datasource,
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ CONFIG_EXAMPLES_HELLO=y
|
|||||||
CONFIG_EXAMPLES_HELLO_STACKSIZE=4096
|
CONFIG_EXAMPLES_HELLO_STACKSIZE=4096
|
||||||
CONFIG_EXAMPLES_NULL=y
|
CONFIG_EXAMPLES_NULL=y
|
||||||
CONFIG_FS_WRITABLE=y
|
CONFIG_FS_WRITABLE=y
|
||||||
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
CONFIG_INTELHEX_BINARY=y
|
CONFIG_INTELHEX_BINARY=y
|
||||||
CONFIG_LIBC_EXECFUNCS=y
|
CONFIG_LIBC_EXECFUNCS=y
|
||||||
CONFIG_MAX_TASKS=16
|
CONFIG_MAX_TASKS=16
|
||||||
@@ -61,5 +62,4 @@ CONFIG_UART1_BAUD=9600
|
|||||||
CONFIG_UART1_SERIAL_CONSOLE=y
|
CONFIG_UART1_SERIAL_CONSOLE=y
|
||||||
CONFIG_UART2_BAUD=9600
|
CONFIG_UART2_BAUD=9600
|
||||||
CONFIG_USERMAIN_STACKSIZE=4096
|
CONFIG_USERMAIN_STACKSIZE=4096
|
||||||
CONFIG_USER_ENTRYPOINT="nsh_main"
|
|
||||||
CONFIG_WDOG_INTRESERVE=0
|
CONFIG_WDOG_INTRESERVE=0
|
||||||
|
|||||||
@@ -232,7 +232,7 @@ config TTY_LAUNCH_FILEPATH
|
|||||||
---help---
|
---help---
|
||||||
The name of the entry point for user applications. For the example
|
The name of the entry point for user applications. For the example
|
||||||
applications this is of the form 'app_main' where 'app' is the application
|
applications this is of the form 'app_main' where 'app' is the application
|
||||||
name. If not defined, USER_ENTRYPOINT defaults to "main".
|
name. If not defined, INIT_ENTRYPOINT defaults to "main".
|
||||||
|
|
||||||
endif # TTY_LAUNCH
|
endif # TTY_LAUNCH
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user