You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/02/13 15:31:56 UTC
[incubator-nuttx] branch master updated (01248ca -> 702bc95)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 01248ca arch/stm32f7: Fix nxstyle errors
new 7df273b boards/arm/tiva/lm3s6965-ek/README.txt: Replace a few non-ascii characters
new 702bc95 tiva/lm3s6965-ek: Add a few configs for qemu
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/arm/tiva/lm3s6965-ek/README.txt | 45 ++++++++++++++----
.../configs/{discover => qemu-flat}/defconfig | 49 ++++++++++++++-----
.../configs/{discover => qemu-protected}/defconfig | 55 +++++++++++++++++-----
3 files changed, 115 insertions(+), 34 deletions(-)
copy boards/arm/tiva/lm3s6965-ek/configs/{discover => qemu-flat}/defconfig (66%)
copy boards/arm/tiva/lm3s6965-ek/configs/{discover => qemu-protected}/defconfig (62%)
[incubator-nuttx] 02/02: tiva/lm3s6965-ek: Add a few configs for
qemu
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 702bc95cac16fe90cfaf8abb178b0822ba707521
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Feb 13 21:53:40 2021 +0900
tiva/lm3s6965-ek: Add a few configs for qemu
Mainly for me. I keep forgetting how to run this on qemu.
Hopefully this can be useful for others too.
---
boards/arm/tiva/lm3s6965-ek/README.txt | 25 +++++
.../tiva/lm3s6965-ek/configs/qemu-flat/defconfig | 109 +++++++++++++++++++
.../lm3s6965-ek/configs/qemu-protected/defconfig | 115 +++++++++++++++++++++
3 files changed, 249 insertions(+)
diff --git a/boards/arm/tiva/lm3s6965-ek/README.txt b/boards/arm/tiva/lm3s6965-ek/README.txt
index 35efe7f..142435d 100644
--- a/boards/arm/tiva/lm3s6965-ek/README.txt
+++ b/boards/arm/tiva/lm3s6965-ek/README.txt
@@ -414,6 +414,31 @@ Where <subdir> is one of the following:
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot (arm-nuttx-elf-gcc)
CONFIG_RAW_BINARY=y : Output formats: ELF and raw binary
+ qemu-flat:
+ An example config with FLAT memory model to run on qemu.
+
+ ./tools/configure.sh lm3s6965-ek:qemu-flat
+ make
+ qemu-system-arm -semihosting \
+ -M lm3s6965evb \
+ -device loader,file=nuttx.bin,addr=0x00000000 \
+ -netdev user,id=user0 \
+ -nic user,id=user0 \
+ -serial mon:stdio -nographic
+
+ qemu-protected:
+ An example config with PROTECTED memory model to run on qemu.
+
+ ./tools/configure.sh lm3s6965-ek:qemu-protected
+ make
+ qemu-system-arm -semihosting \
+ -M lm3s6965evb \
+ -device loader,file=nuttx.bin,addr=0x00000000 \
+ -device loader,file=nuttx_user.bin,addr=0x00020000 \
+ -netdev user,id=user0 \
+ -nic user,id=user0 \
+ -serial mon:stdio -nographic
+
tcpecho:
This configuration builds the simple TCP echo example based on W.Richard
Steven UNIX Programming book to ensure correct usage of the socket API.
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig
new file mode 100644
index 0000000..260d971
--- /dev/null
+++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig
@@ -0,0 +1,109 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_FS_PROCFS_EXCLUDE_ENVIRON is not set
+# CONFIG_NSH_DISABLE_DATE is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="lm3s6965-ek"
+CONFIG_ARCH_BOARD_LM3S6965EK=y
+CONFIG_ARCH_CHIP="tiva"
+CONFIG_ARCH_CHIP_LM3S6965=y
+CONFIG_ARCH_CHIP_LM3S=y
+CONFIG_ARCH_CHIP_LM=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARM_SEMIHOSTING_HOSTFS=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
+CONFIG_BOARD_LOOPSPERMSEC=4531
+CONFIG_BUILTIN=y
+CONFIG_CLOCK_MONOTONIC=y
+CONFIG_DEBUG_ASSERTIONS=y
+CONFIG_DEBUG_ERROR=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_FULLOPT=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_WARN=y
+CONFIG_ELF=y
+CONFIG_EXAMPLES_ELF=y
+CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram5"
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_MODULE=y
+CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram6"
+CONFIG_EXAMPLES_NETTEST=m
+CONFIG_EXAMPLES_WGET=y
+CONFIG_FS_BINFS=y
+CONFIG_FS_HOSTFS=y
+CONFIG_FS_PROCFS=y
+CONFIG_FS_TMPFS=y
+CONFIG_HOST_MACOS=y
+CONFIG_LIBC_DLFCN=y
+CONFIG_LIB_ENVPATH=y
+CONFIG_MAX_TASKS=16
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPICLOCK=12500000
+CONFIG_NET=y
+CONFIG_NETDB_DNSCLIENT=y
+CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
+CONFIG_NETDB_DNSSERVER_NOADDR=y
+CONFIG_NETDB_MAX_IPADDR=2
+CONFIG_NETINIT_DHCPC=y
+CONFIG_NETINIT_NOMAC=y
+CONFIG_NETUTILS_NETCAT=y
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NETUTILS_TFTPC=y
+CONFIG_NETUTILS_WEBCLIENT=y
+CONFIG_NET_BROADCAST=y
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_MAX_LISTENPORTS=8
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_UDP=y
+CONFIG_NET_UDP_CHECKSUMS=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_FILE_APPS=y
+CONFIG_NSH_LINELEN=1000
+CONFIG_NSH_READLINE=y
+CONFIG_PATH_INITIAL="/bin"
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=65536
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_SIG_DEFAULT=y
+CONFIG_SIG_PIPE=11
+CONFIG_SPI=y
+CONFIG_START_DAY=8
+CONFIG_START_MONTH=5
+CONFIG_START_YEAR=2010
+CONFIG_SYSLOG_CONSOLE=y
+CONFIG_SYSTEM_DHCPC_RENEW=y
+CONFIG_SYSTEM_NETDB=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NTPC=y
+CONFIG_SYSTEM_PING=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_TIVA_ETHERNET=y
+CONFIG_TIVA_GPIOA_IRQS=y
+CONFIG_TIVA_GPIOB_IRQS=y
+CONFIG_TIVA_GPIOC_IRQS=y
+CONFIG_TIVA_GPIOD_IRQS=y
+CONFIG_TIVA_GPIOE_IRQS=y
+CONFIG_TIVA_GPIOF_IRQS=y
+CONFIG_TIVA_GPIOG_IRQS=y
+CONFIG_TIVA_SSI0=y
+CONFIG_TIVA_UART0=y
+CONFIG_TIVA_WITH_QEMU=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig
new file mode 100644
index 0000000..af5ce4e
--- /dev/null
+++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig
@@ -0,0 +1,115 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_FS_PROCFS_EXCLUDE_ENVIRON is not set
+# CONFIG_NSH_DISABLE_DATE is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="lm3s6965-ek"
+CONFIG_ARCH_BOARD_LM3S6965EK=y
+CONFIG_ARCH_CHIP="tiva"
+CONFIG_ARCH_CHIP_LM3S6965=y
+CONFIG_ARCH_CHIP_LM3S=y
+CONFIG_ARCH_CHIP_LM=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARM_MPU=y
+CONFIG_ARM_SEMIHOSTING_HOSTFS=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
+CONFIG_BOARD_LOOPSPERMSEC=4531
+CONFIG_BUILD_PROTECTED=y
+CONFIG_BUILTIN=y
+CONFIG_CLOCK_MONOTONIC=y
+CONFIG_DEBUG_ASSERTIONS=y
+CONFIG_DEBUG_ERROR=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_FULLOPT=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_WARN=y
+CONFIG_ELF=y
+CONFIG_EXAMPLES_ELF=y
+CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram5"
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_MODULE=y
+CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram6"
+CONFIG_EXAMPLES_NETTEST=m
+CONFIG_EXAMPLES_WGET=y
+CONFIG_FS_BINFS=y
+CONFIG_FS_HOSTFS=y
+CONFIG_FS_PROCFS=y
+CONFIG_FS_TMPFS=y
+CONFIG_HOST_MACOS=y
+CONFIG_LIBC_DLFCN=y
+CONFIG_LIB_ENVPATH=y
+CONFIG_MAX_TASKS=16
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPICLOCK=12500000
+CONFIG_MODULE=y
+CONFIG_NET=y
+CONFIG_NETDB_DNSCLIENT=y
+CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
+CONFIG_NETDB_DNSSERVER_NOADDR=y
+CONFIG_NETDB_MAX_IPADDR=2
+CONFIG_NETINIT_DHCPC=y
+CONFIG_NETINIT_NOMAC=y
+CONFIG_NETUTILS_NETCAT=y
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NETUTILS_TFTPC=y
+CONFIG_NETUTILS_WEBCLIENT=y
+CONFIG_NET_BROADCAST=y
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_MAX_LISTENPORTS=8
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_UDP=y
+CONFIG_NET_UDP_CHECKSUMS=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_FILE_APPS=y
+CONFIG_NSH_LINELEN=1000
+CONFIG_NSH_READLINE=y
+CONFIG_NUTTX_USERSPACE=0x00020000
+CONFIG_PASS1_BUILDIR="boards/arm/tiva/lm3s6965-ek/kernel"
+CONFIG_PATH_INITIAL="/bin"
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=65536
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_SIG_DEFAULT=y
+CONFIG_SIG_PIPE=11
+CONFIG_SPI=y
+CONFIG_START_DAY=8
+CONFIG_START_MONTH=5
+CONFIG_START_YEAR=2010
+CONFIG_SYSLOG_CONSOLE=y
+CONFIG_SYSTEM_DHCPC_RENEW=y
+CONFIG_SYSTEM_NETDB=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NTPC=y
+CONFIG_SYSTEM_PING=y
+CONFIG_SYS_RESERVED=8
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_TIVA_ETHERNET=y
+CONFIG_TIVA_GPIOA_IRQS=y
+CONFIG_TIVA_GPIOB_IRQS=y
+CONFIG_TIVA_GPIOC_IRQS=y
+CONFIG_TIVA_GPIOD_IRQS=y
+CONFIG_TIVA_GPIOE_IRQS=y
+CONFIG_TIVA_GPIOF_IRQS=y
+CONFIG_TIVA_GPIOG_IRQS=y
+CONFIG_TIVA_SSI0=y
+CONFIG_TIVA_UART0=y
+CONFIG_TIVA_WITH_QEMU=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_USER_ENTRYPOINT="nsh_main"
[incubator-nuttx] 01/02: boards/arm/tiva/lm3s6965-ek/README.txt:
Replace a few non-ascii characters
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7df273baf9e9a4fa83f50bcc6f1e9cad327fc9b5
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Feb 13 21:49:25 2021 +0900
boards/arm/tiva/lm3s6965-ek/README.txt: Replace a few non-ascii characters
0xae -> (R)
0x99 -> removed
0x96 -> -
---
boards/arm/tiva/lm3s6965-ek/README.txt | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/boards/arm/tiva/lm3s6965-ek/README.txt b/boards/arm/tiva/lm3s6965-ek/README.txt
index 22cdeb7..35efe7f 100644
--- a/boards/arm/tiva/lm3s6965-ek/README.txt
+++ b/boards/arm/tiva/lm3s6965-ek/README.txt
@@ -26,17 +26,17 @@ The Stellaris LM3S6965 Evaluation Board includes the following features:
o User LED, navigation switches, and select pushbuttons
o Magnetic speaker
o LM3S6965 I/O available on labeled break-out pads
- o Standard ARM� 20-pin JTAG debug connector with input and output modes
+ o Standard ARM(R) 20-pin JTAG debug connector with input and output modes
o USB interface for debugging and power supply
o MicroSD card slot
Features of the LM3S6965 Microcontroller
- o 32-bit RISC performance using ARM� Cortex�-M3 v7M architecture
- � 50-MHz operation
- � Hardware-division and single-cycle-multiplication
- � Integrated Nested Vectored Interrupt Controller (NVIC)
- � 42 interrupt channels with eight priority levels
+ o 32-bit RISC performance using ARM(R) Cortex-M3 v7M architecture
+ - 50-MHz operation
+ - Hardware-division and single-cycle-multiplication
+ - Integrated Nested Vectored Interrupt Controller (NVIC)
+ - 42 interrupt channels with eight priority levels
o 256 KB single-cycle flash
o 64 KB single-cycle SRAM
o Four general-purpose 32-bit timers
@@ -46,10 +46,10 @@ Features of the LM3S6965 Microcontroller
o Two independent integrated analog comparators
o Two I2C modules
o Three PWM generator blocks
- � One 16-bit counter
- � Two comparators
- � Produces two independent PWM signals
- � One dead-band generator
+ - One 16-bit counter
+ - Two comparators
+ - Produces two independent PWM signals
+ - One dead-band generator
o Two QEI modules with position integrator for tracking encoder position
o 0 to 42 GPIOs, depending on user configuration
o On-chip low drop-out (LDO) voltage regulator