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 2022/07/27 15:22:28 UTC
[incubator-nuttx] branch master updated (9d4549d48b -> ad322ef67d)
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 9d4549d48b arch: limit output maximum size stackdump when sp is not within stack
new 5902b7f6d6 boads: icicle: Fix build errors in cxxtest_main.cxx
new 1742b7f6a4 arch: risc-v: Fix warnings in common/crt0.c
new 88d0a4d20e tools: Unix.mk: Generate .tar.gz file with make export
new 5633e38da2 tools: testbuild.sh: Add exportandimport func
new 714e6fda9c boards: sabre-6quad: Add iperf to netknsh/defconfig
new ad322ef67d boards: arm: Update README.txt regarding CONFIG_BUILD_KERNEL=y
The 6 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:
arch/risc-v/src/common/crt0.c | 4 +++
boards/arm/imx6/sabre-6quad/README.txt | 4 +--
.../arm/imx6/sabre-6quad/configs/netknsh/defconfig | 2 ++
boards/arm/sama5/sama5d4-ek/README.txt | 4 +--
boards/risc-v/mpfs/icicle/configs/knsh/defconfig | 3 ++
tools/Unix.mk | 2 +-
tools/testbuild.sh | 33 ++++++++++++++++++++++
7 files changed, 47 insertions(+), 5 deletions(-)
[incubator-nuttx] 02/06: arch: risc-v: Fix warnings in common/crt0.c
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 1742b7f6a4d1c7f6be2d3b5e5379a0b0e86c6ee9
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 27 20:44:52 2022 +0900
arch: risc-v: Fix warnings in common/crt0.c
Summary:
- This commit fixes warnings in common/crt0.c
Impact:
- None
Testing:
- Build only
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/risc-v/src/common/crt0.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/risc-v/src/common/crt0.c b/arch/risc-v/src/common/crt0.c
index 7b6fb5101d..56bef0ba72 100644
--- a/arch/risc-v/src/common/crt0.c
+++ b/arch/risc-v/src/common/crt0.c
@@ -103,6 +103,8 @@ extern void (*_edtors)(void);
* Private Functions
****************************************************************************/
+#ifdef CONFIG_HAVE_CXX
+
/****************************************************************************
* Name: exec_ctors
*
@@ -135,6 +137,8 @@ static void exec_dtors(void)
}
}
+#endif
+
/****************************************************************************
* Public Functions
****************************************************************************/
[incubator-nuttx] 06/06: boards: arm: Update README.txt regarding CONFIG_BUILD_KERNEL=y
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 ad322ef67d3503bcb74ca82ba3401730d58f2008
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 27 16:14:12 2022 +0900
boards: arm: Update README.txt regarding CONFIG_BUILD_KERNEL=y
Summary:
- This commit updates README.txt regarding
Impact:
- CONFIG_BUILD_KERNEL=y
Testing:
- build only
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
boards/arm/imx6/sabre-6quad/README.txt | 4 ++--
boards/arm/sama5/sama5d4-ek/README.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/boards/arm/imx6/sabre-6quad/README.txt b/boards/arm/imx6/sabre-6quad/README.txt
index c314a9cf30..46ef1a3bc8 100644
--- a/boards/arm/imx6/sabre-6quad/README.txt
+++ b/boards/arm/imx6/sabre-6quad/README.txt
@@ -913,7 +913,7 @@ Configuration sub-directories
$ make V=1 -j7
$ make export V=1
$ cd ../apps
- $ ./tools/mkimport.sh -x ../nuttx/nuttx-export-*.zip
+ $ ./tools/mkimport.sh -z -x ../nuttx/nuttx-export-*.tar.gz
$ make import V=1
$ cd ../nuttx
$ qemu-system-arm -semihosting -M sabrelite -m 1024 -smp 4 -nographic -kernel ./nuttx
@@ -950,7 +950,7 @@ Configuration sub-directories
$ make
$ make export
$ cd ../apps
- $ ./tools/mkimport.sh -x ../nuttx/nuttx-export-*.zip
+ $ ./tools/mkimport.sh -z -x ../nuttx/nuttx-export-*.tar.gz
$ make import
$ cd ../nuttx
$ qemu-system-arm -semihosting -M sabrelite -m 1024 -smp 4 -nographic -kernel ./nuttx
diff --git a/boards/arm/sama5/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt
index dd3cd2f868..1557528568 100644
--- a/boards/arm/sama5/sama5d4-ek/README.txt
+++ b/boards/arm/sama5/sama5d4-ek/README.txt
@@ -4114,7 +4114,7 @@ Configurations
C. Build the file system image at apps/bin
$ cd apps/ : Go to the apps/ directory
- $ tools/mkimport.sh -x <zip-file> : Use the full path to nuttx-export-*.zip
+ $ tools/mkimport.sh -z -x <tgz-file>: Use the full path to nuttx-export-*.tar.gz
$ make import : This will build the file system.
You will then need to copy the files from apps/bin to an SD card or USB
@@ -4149,7 +4149,7 @@ Configurations
C. Build the file system image at apps/bin
$ cd apps/ : Go to the apps/ directory
- $ tools/mkimport.sh -x <zip-file> : Use the full path to nuttx-export-*.zip
+ $ tools/mkimport.sh -z -x <tgz-file>: Use the full path to nuttx-export-*.tar.gz
$ make import : This will build the file system
D. Create the ROMFS file system image
[incubator-nuttx] 05/06: boards: sabre-6quad: Add iperf to netknsh/defconfig
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 714e6fda9cc967651b7e7418aa8c5dca620602a2
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 27 14:10:14 2022 +0900
boards: sabre-6quad: Add iperf to netknsh/defconfig
Summary:
- This commit adds iperf to netknsh/defconfig
Impact:
- None
Testing:
- Tested with qemu-6.2
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig
index 683a3a105f..f9b1f64fd6 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig
@@ -76,6 +76,8 @@ CONFIG_NETINIT_DRIPADDR=0x0a000202
CONFIG_NETINIT_IPADDR=0x0a00020f
CONFIG_NETINIT_NOMAC=y
CONFIG_NETUTILS_CODECS=y
+CONFIG_NETUTILS_IPERF=y
+CONFIG_NETUTILS_IPERFTEST_DEVNAME="eth0"
CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NET_BROADCAST=y
[incubator-nuttx] 03/06: tools: Unix.mk: Generate .tar.gz file with make export
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 88d0a4d20e0b1e4d2fa59a995e385f36f6b6a5f0
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 27 16:03:58 2022 +0900
tools: Unix.mk: Generate .tar.gz file with make export
Summary:
- This commit generates .tar.gz file with make export
Impact:
- make export file format
Testing:
- Tested with sabre-6quad:netknsh
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
tools/Unix.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/Unix.mk b/tools/Unix.mk
index 292dceef6f..86abf0e579 100644
--- a/tools/Unix.mk
+++ b/tools/Unix.mk
@@ -127,7 +127,7 @@ LINKLIBS = $(patsubst staging/%,%,$(NUTTXLIBS))
# Export tool definitions
MKEXPORT= tools/mkexport.sh
-MKEXPORT_ARGS = -t "$(TOPDIR)" -b "$(BOARD_DIR)"
+MKEXPORT_ARGS = -z -t "$(TOPDIR)" -b "$(BOARD_DIR)"
ifneq ($(CONFIG_BUILD_FLAT),y)
MKEXPORT_ARGS += -u
[incubator-nuttx] 01/06: boads: icicle: Fix build errors in cxxtest_main.cxx
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 5902b7f6d6f78c0256c52c509a395fe695cb326e
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 27 20:42:29 2022 +0900
boads: icicle: Fix build errors in cxxtest_main.cxx
Summary:
- This commit fixes build errors in cxxtest_main.cxx
Impact:
- None
Testing:
- build only
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
boards/risc-v/mpfs/icicle/configs/knsh/defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
index 0e83cbc042..c50bee97af 100644
--- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
@@ -54,11 +54,14 @@ CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_LIBC_HOSTNAME="icicle"
CONFIG_LIBC_MAX_EXITFUNS=2
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
+CONFIG_LIBM=y
CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y
CONFIG_MM_PGALLOC=y
[incubator-nuttx] 04/06: tools: testbuild.sh: Add exportandimport func
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 5633e38da2b9c8aebb9098a1e8841c4d1d4a216e
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jul 27 14:07:32 2022 +0900
tools: testbuild.sh: Add exportandimport func
Summary:
- This commit adds exportandimport func for CONFIG_BUILD_KERNEL=y
Impact:
- ci with CONFIG_BUILD_KERNEL=y only
Testing:
- Tested with sabre-6quad:netknsh (will be updated later)
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
tools/testbuild.sh | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index a44a23fcb1..abb42cd08f 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -177,9 +177,42 @@ blacklist=`grep "^-" $testfile || true`
cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
+function exportandimport {
+ # Do nothing until we finish to build the nuttx
+ if [ ! -f nuttx ]; then
+ return $fail
+ fi
+
+ # If CONFIG_BUILD_KERNEL=y does not exist in .config, do nothing
+ if ! grep CONFIG_BUILD_KERNEL=y .config 1>/dev/null; then
+ return $fail
+ fi
+
+ if ! ${MAKE} export ${JOPTION} 1>/dev/null; then
+ fail=1
+ return $fail
+ fi
+
+ pushd ../apps/
+
+ if ! ./tools/mkimport.sh -z -x ../nuttx/nuttx-export-*.tar.gz 1>/dev/null; then
+ fail=1
+ popd
+ return $fail
+ fi
+
+ if ! ${MAKE} import ${JOPTION} 1>/dev/null; then
+ fail=1
+ fi
+ popd
+ return $fail
+}
+
function makefunc {
if ! ${MAKE} ${MAKE_FLAGS} "${EXTRA_FLAGS}" ${JOPTION} $@ 1>/dev/null; then
fail=1
+ else
+ exportandimport
fi
return $fail