You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/02/15 14:26:44 UTC
[incubator-nuttx] branch master updated (0a37744 -> db57e2c)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 0a37744 Fix jlink-nuttx build with GCC 10.2
new b0fa232 boards: Remove -D__NuttX__ from the individual Make.defs
new db57e2c Fix the minor style issue
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:
Documentation/guides/cpp_cmake.rst | 2 +-
arch/risc-v/src/common/Toolchain.defs | 2 +-
boards/risc-v/bl602/bl602evb/scripts/Make.defs | 2 +-
include/nuttx/serial/uart_rpmsg.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[incubator-nuttx] 01/02: boards: Remove -D__NuttX__ from the individual Make.defs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b0fa2329185fa8b2e694cfd03391a0f18ba65703
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Feb 13 06:26:35 2022 +0800
boards: Remove -D__NuttX__ from the individual Make.defs
since it is defined globally in tools/Config.mk now
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Documentation/guides/cpp_cmake.rst | 2 +-
boards/risc-v/bl602/bl602evb/scripts/Make.defs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/guides/cpp_cmake.rst b/Documentation/guides/cpp_cmake.rst
index 498f5ed..00c45bb 100644
--- a/Documentation/guides/cpp_cmake.rst
+++ b/Documentation/guides/cpp_cmake.rst
@@ -147,7 +147,7 @@ Creating the project
set(AC_HW_FLAGS "-mcpu=cortex-m4 -mthumb -mfloat-abi=soft ")
set(AC_HW_FLAGS "${AC_HW_FLAGS} -isystem ${NUTTX_PATH}/include")
- set(AC_HW_FLAGS "${AC_HW_FLAGS} -pipe -D__NuttX__")
+ set(AC_HW_FLAGS "${AC_HW_FLAGS} -pipe")
set(AC_LINKER_FLAGS "--entry=__start -nostartfiles -nodefaultlibs -T${MCU_LINKER_SCRIPT}")
diff --git a/boards/risc-v/bl602/bl602evb/scripts/Make.defs b/boards/risc-v/bl602/bl602evb/scripts/Make.defs
index 0ab4838..76943d4 100644
--- a/boards/risc-v/bl602/bl602evb/scripts/Make.defs
+++ b/boards/risc-v/bl602/bl602evb/scripts/Make.defs
@@ -46,7 +46,7 @@ endif
ARCHCPUFLAGS += -mno-relax
ARCHCFLAGS = -fno-common -fno-builtin -ffunction-sections -fdata-sections
-ARCHCXXFLAGS = -fno-common -fno-builtin -ffunction-sections -fdata-sections -fno-exceptions -fcheck-new -std=c++17 -D__NuttX__ -pipe -nostdinc++
+ARCHCXXFLAGS = -fno-common -fno-builtin -ffunction-sections -fdata-sections -fno-exceptions -fcheck-new -std=c++17 -pipe -nostdinc++
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
[incubator-nuttx] 02/02: Fix the minor style issue
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit db57e2cd8efe27fe7658c454ffbf5dbcc0362b17
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Feb 13 06:27:50 2022 +0800
Fix the minor style issue
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/risc-v/src/common/Toolchain.defs | 2 +-
include/nuttx/serial/uart_rpmsg.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index 83970f3..95f7854 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -82,7 +82,7 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
endif
ifeq ($(CONFIG_ARCH_FPU),y)
- ARCHRVISAF = f
+ ARCHRVISAF = f
endif
ifeq ($(CONFIG_ARCH_DPFPU),y)
diff --git a/include/nuttx/serial/uart_rpmsg.h b/include/nuttx/serial/uart_rpmsg.h
index c4e2de8..d702914 100644
--- a/include/nuttx/serial/uart_rpmsg.h
+++ b/include/nuttx/serial/uart_rpmsg.h
@@ -43,7 +43,7 @@ extern "C"
#define EXTERN extern
#endif
-int uart_rpmsg_init(FAR const char *cpu_name, FAR const char *dev_name,
+int uart_rpmsg_init(FAR const char *cpuname, FAR const char *devname,
int buf_size, bool isconsole);
#undef EXTERN