diff --git a/boards/arm/s32k1xx/s32k118evb/scripts/flash.ld b/boards/arm/s32k1xx/s32k118evb/scripts/flash.ld index a6af6a403ae..94c238fcf6e 100644 --- a/boards/arm/s32k1xx/s32k118evb/scripts/flash.ld +++ b/boards/arm/s32k1xx/s32k118evb/scripts/flash.ld @@ -60,6 +60,7 @@ SECTIONS { _stext = ABSOLUTE(.); *(.vectors) + . = 0x0000410; /* Skip over flash configuration field */ *(.text .text.*) *(.fixup) *(.gnu.warning) @@ -73,7 +74,6 @@ SECTIONS _etext = ABSOLUTE(.); } > flash - . = ALIGN(4); .init_section : { _sinit = ABSOLUTE(.); @@ -81,13 +81,11 @@ SECTIONS _einit = ABSOLUTE(.); } > flash - . = ALIGN(4); .ARM.extab : { *(.ARM.extab*) } >flash - . = ALIGN(4); __exidx_start = ABSOLUTE(.); .ARM.exidx : { @@ -95,7 +93,6 @@ SECTIONS } >flash __exidx_end = ABSOLUTE(.); - . = ALIGN(4); .data : { _sdata = ABSOLUTE(.); diff --git a/boards/arm/s32k1xx/s32k146evb/README.txt b/boards/arm/s32k1xx/s32k146evb/README.txt index e6f30294481..bcb673dd99f 100644 --- a/boards/arm/s32k1xx/s32k146evb/README.txt +++ b/boards/arm/s32k1xx/s32k146evb/README.txt @@ -128,5 +128,5 @@ Configurations nsh: --- Configures the NuttShell (nsh) located at apps/examples/nsh. Support - for builtin applications is enabled, but in the base configuration no - builtin applications are selected. + for builtin applications is enabled, but in the base configuration but + the builtin applications selected is the "Hello, World!" example. diff --git a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig index 8a1e24ec690..141dcbe9427 100644 --- a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig @@ -5,12 +5,10 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLE_EXEC is not set -# CONFIG_NSH_DISABLE_EXIT is not set -# CONFIG_NSH_DISABLE_HEXDUMP is not set -# CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NSH_DISABLE_XD is not set +# CONFIG_ARCH_FPU is not set +# CONFIG_NSH_ARGCAT is not set +# CONFIG_NSH_CMDOPT_HEXDUMP is not set +# CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="s32k146evb" CONFIG_ARCH_BOARD_S32K146EVB=y @@ -19,34 +17,26 @@ CONFIG_ARCH_CHIP_S32K146=y CONFIG_ARCH_CHIP_S32K14X=y CONFIG_ARCH_CHIP_S32K1XX=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=2988 -CONFIG_DEFAULT_SMALL=y -CONFIG_DISABLE_MOUNTPOINT=y -CONFIG_DISABLE_MQUEUE=y +CONFIG_BUILTIN=y +CONFIG_EXAMPLES_HELLO=y +CONFIG_FS_PROCFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_LPUART1_RXBUFSIZE=64 CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_LPUART1_TXBUFSIZE=64 -CONFIG_MAX_TASKS=8 +CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_SMALL=y CONFIG_MOTOROLA_SREC=y -CONFIG_NFILE_DESCRIPTORS=6 -CONFIG_NFILE_STREAMS=6 -CONFIG_NPTHREAD_KEYS=0 -CONFIG_NSH_DISABLE_CD=y -CONFIG_NSH_DISABLE_CP=y -CONFIG_NSH_DISABLE_MKDIR=y -CONFIG_NSH_DISABLE_MOUNT=y -CONFIG_NSH_DISABLE_RM=y -CONFIG_NSH_DISABLE_RMDIR=y -CONFIG_NSH_DISABLE_UMOUNT=y -CONFIG_NSH_FILEIOSIZE=64 -CONFIG_NSH_LINELEN=80 -CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_PTHREAD_STACK_DEFAULT=1536 +CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_READLINE=y +CONFIG_PREALLOC_MQ_MSGS=4 +CONFIG_PREALLOC_TIMERS=4 +CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=23552 CONFIG_RAM_START=0x1ffffc00 CONFIG_RR_INTERVAL=200 @@ -59,8 +49,5 @@ CONFIG_START_YEAR=2019 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 -CONFIG_USERMAIN_STACKSIZE=1536 +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/s32k1xx/s32k146evb/scripts/flash.ld b/boards/arm/s32k1xx/s32k146evb/scripts/flash.ld index 421c10beb42..1d02106268f 100644 --- a/boards/arm/s32k1xx/s32k146evb/scripts/flash.ld +++ b/boards/arm/s32k1xx/s32k146evb/scripts/flash.ld @@ -60,6 +60,7 @@ SECTIONS { _stext = ABSOLUTE(.); *(.vectors) + . = 0x0000410; /* Skip over flash configuration field */ *(.text .text.*) *(.fixup) *(.gnu.warning) @@ -73,7 +74,6 @@ SECTIONS _etext = ABSOLUTE(.); } > flash - . = ALIGN(4); .init_section : { _sinit = ABSOLUTE(.); @@ -81,13 +81,11 @@ SECTIONS _einit = ABSOLUTE(.); } > flash - . = ALIGN(4); .ARM.extab : { *(.ARM.extab*) } >flash - . = ALIGN(4); __exidx_start = ABSOLUTE(.); .ARM.exidx : { @@ -95,7 +93,6 @@ SECTIONS } >flash __exidx_end = ABSOLUTE(.); - . = ALIGN(4); .data : { _sdata = ABSOLUTE(.); diff --git a/boards/arm/s32k1xx/s32k146evb/scripts/sram.ld b/boards/arm/s32k1xx/s32k146evb/scripts/sram.ld index e8f8b432fb4..8888c05a4da 100644 --- a/boards/arm/s32k1xx/s32k146evb/scripts/sram.ld +++ b/boards/arm/s32k1xx/s32k146evb/scripts/sram.ld @@ -73,7 +73,6 @@ SECTIONS _etext = ABSOLUTE(.); } > sram - . = ALIGN(4); .init_section : { _sinit = ABSOLUTE(.); @@ -81,13 +80,11 @@ SECTIONS _einit = ABSOLUTE(.); } > sram - . = ALIGN(4); .ARM.extab : { *(.ARM.extab*) } >sram - . = ALIGN(4); __exidx_start = ABSOLUTE(.); .ARM.exidx : { @@ -95,7 +92,6 @@ SECTIONS } >sram __exidx_end = ABSOLUTE(.); - . = ALIGN(4); .data : { _sdata = ABSOLUTE(.); diff --git a/boards/arm/s32k1xx/s32k148evb/README.txt b/boards/arm/s32k1xx/s32k148evb/README.txt index f4b81c78be2..3f13e70411a 100644 --- a/boards/arm/s32k1xx/s32k148evb/README.txt +++ b/boards/arm/s32k1xx/s32k148evb/README.txt @@ -116,5 +116,5 @@ Configurations nsh: --- Configures the NuttShell (nsh) located at apps/examples/nsh. Support - for builtin applications is enabled, but in the base configuration no - builtin applications are selected. + for builtin applications is enabled, but in the base configuration but + the builtin applications selected is the "Hello, World!" example. diff --git a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig index 0b669c7273c..cb76dd2f999 100644 --- a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig @@ -5,12 +5,10 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLE_EXEC is not set -# CONFIG_NSH_DISABLE_EXIT is not set -# CONFIG_NSH_DISABLE_HEXDUMP is not set -# CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NSH_DISABLE_XD is not set +# CONFIG_ARCH_FPU is not set +# CONFIG_NSH_ARGCAT is not set +# CONFIG_NSH_CMDOPT_HEXDUMP is not set +# CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="s32k148evb" CONFIG_ARCH_BOARD_S32K148EVB=y @@ -19,34 +17,26 @@ CONFIG_ARCH_CHIP_S32K148=y CONFIG_ARCH_CHIP_S32K14X=y CONFIG_ARCH_CHIP_S32K1XX=y CONFIG_ARCH_STACKDUMP=y -CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=2988 -CONFIG_DEFAULT_SMALL=y -CONFIG_DISABLE_MOUNTPOINT=y -CONFIG_DISABLE_MQUEUE=y +CONFIG_BUILTIN=y +CONFIG_EXAMPLES_HELLO=y +CONFIG_FS_PROCFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_LPUART1_RXBUFSIZE=64 CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_LPUART1_TXBUFSIZE=64 -CONFIG_MAX_TASKS=8 +CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_SMALL=y CONFIG_MOTOROLA_SREC=y -CONFIG_NFILE_DESCRIPTORS=6 -CONFIG_NFILE_STREAMS=6 -CONFIG_NPTHREAD_KEYS=0 -CONFIG_NSH_DISABLE_CD=y -CONFIG_NSH_DISABLE_CP=y -CONFIG_NSH_DISABLE_MKDIR=y -CONFIG_NSH_DISABLE_MOUNT=y -CONFIG_NSH_DISABLE_RM=y -CONFIG_NSH_DISABLE_RMDIR=y -CONFIG_NSH_DISABLE_UMOUNT=y -CONFIG_NSH_FILEIOSIZE=64 -CONFIG_NSH_LINELEN=80 -CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_PTHREAD_STACK_DEFAULT=1536 +CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_READLINE=y +CONFIG_PREALLOC_MQ_MSGS=4 +CONFIG_PREALLOC_TIMERS=4 +CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=23552 CONFIG_RAM_START=0x1ffffc00 CONFIG_RR_INTERVAL=200 @@ -59,8 +49,5 @@ CONFIG_START_YEAR=2019 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 -CONFIG_USERMAIN_STACKSIZE=1536 +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/s32k1xx/s32k148evb/scripts/flash.ld b/boards/arm/s32k1xx/s32k148evb/scripts/flash.ld index 6edc1a916b2..bc8f305440d 100644 --- a/boards/arm/s32k1xx/s32k148evb/scripts/flash.ld +++ b/boards/arm/s32k1xx/s32k148evb/scripts/flash.ld @@ -60,6 +60,7 @@ SECTIONS { _stext = ABSOLUTE(.); *(.vectors) + . = 0x0000410; /* Skip over flash configuration field */ *(.text .text.*) *(.fixup) *(.gnu.warning) @@ -73,7 +74,6 @@ SECTIONS _etext = ABSOLUTE(.); } > flash - . = ALIGN(4); .init_section : { _sinit = ABSOLUTE(.); @@ -81,13 +81,11 @@ SECTIONS _einit = ABSOLUTE(.); } > flash - . = ALIGN(4); .ARM.extab : { *(.ARM.extab*) } >flash - . = ALIGN(4); __exidx_start = ABSOLUTE(.); .ARM.exidx : { @@ -95,7 +93,6 @@ SECTIONS } >flash __exidx_end = ABSOLUTE(.); - . = ALIGN(4); .data : { _sdata = ABSOLUTE(.); diff --git a/boards/arm/s32k1xx/s32k148evb/scripts/sram.ld b/boards/arm/s32k1xx/s32k148evb/scripts/sram.ld index 5c023cfb627..f2f1b07115b 100644 --- a/boards/arm/s32k1xx/s32k148evb/scripts/sram.ld +++ b/boards/arm/s32k1xx/s32k148evb/scripts/sram.ld @@ -73,7 +73,6 @@ SECTIONS _etext = ABSOLUTE(.); } > sram - . = ALIGN(4); .init_section : { _sinit = ABSOLUTE(.); @@ -81,13 +80,11 @@ SECTIONS _einit = ABSOLUTE(.); } > sram - . = ALIGN(4); .ARM.extab : { *(.ARM.extab*) } >sram - . = ALIGN(4); __exidx_start = ABSOLUTE(.); .ARM.exidx : { @@ -95,7 +92,6 @@ SECTIONS } >sram __exidx_end = ABSOLUTE(.); - . = ALIGN(4); .data : { _sdata = ABSOLUTE(.);