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 2020/04/18 11:32:16 UTC
[incubator-nuttx] branch master updated (1d39453 -> 0e9b0d7)
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 1d39453 arch/README.txt: Various improvements to the text
new 15d328c sim: Fix config check for romfs image generation
new 0e9b0d7 sim: Don't generate romfs image if CONFIG_NSH_CUSTOMROMFS=y
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/sim/sim/sim/src/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
[incubator-nuttx] 02/02: sim: Don't generate romfs image if
CONFIG_NSH_CUSTOMROMFS=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 0e9b0d76032aac8c3f6591f906d21909b532abec
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Apr 17 15:21:40 2020 +0900
sim: Don't generate romfs image if CONFIG_NSH_CUSTOMROMFS=y
---
boards/sim/sim/sim/src/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boards/sim/sim/sim/src/Makefile b/boards/sim/sim/sim/src/Makefile
index c70af73..57590ca 100644
--- a/boards/sim/sim/sim/src/Makefile
+++ b/boards/sim/sim/sim/src/Makefile
@@ -75,8 +75,10 @@ endif
endif
ifeq ($(CONFIG_NSH_ROMFSETC),y)
+ifneq ($(CONFIG_NSH_CUSTOMROMFS),y)
RCSRCS = etc/init.d/rcS
RCRAWS = etc/group etc/passwd
endif
+endif
include $(TOPDIR)/boards/Board.mk
[incubator-nuttx] 01/02: sim: Fix config check for romfs image
generation
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 15d328c3abf13a29a478103f7f72f4e4dae25eaa
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Apr 17 15:19:44 2020 +0900
sim: Fix config check for romfs image generation
---
boards/sim/sim/sim/src/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/boards/sim/sim/sim/src/Makefile b/boards/sim/sim/sim/src/Makefile
index 4d2ca01..c70af73 100644
--- a/boards/sim/sim/sim/src/Makefile
+++ b/boards/sim/sim/sim/src/Makefile
@@ -74,9 +74,9 @@ else
endif
endif
-#ifdef CONFIG_NSH_ROMFSETC
+ifeq ($(CONFIG_NSH_ROMFSETC),y)
RCSRCS = etc/init.d/rcS
RCRAWS = etc/group etc/passwd
-#endif
+endif
include $(TOPDIR)/boards/Board.mk