All ZNEO configurations converted to use the mconf/Kconfig tool

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5401 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-29 18:44:02 +00:00
parent a9cdbb61ea
commit cb890fd484
6 changed files with 29 additions and 19 deletions

View File

@ -426,3 +426,5 @@
various DHCPC improvements(Darcy Gong). various DHCPC improvements(Darcy Gong).
* apps/nshlib/nsh_apps.c: Fix compilation errors whenCONFIG_NSH_DISABLEBG=y. * apps/nshlib/nsh_apps.c: Fix compilation errors whenCONFIG_NSH_DISABLEBG=y.
From Freddie Chopin. From Freddie Chopin.
* Rename CONFIG_PCODE and CONFIG_FICL as CONFIG_INTERPRETERS_PCODE and
CONFIG_INTERPRETERS_FICL for consistency with other configuration naming.

View File

@ -39,30 +39,38 @@ include $(APPDIR)/Make.defs
# Pascal Add-On Example # Pascal Add-On Example
ASRCS = ifeq ($(WINTOOL),y)
CSRCS = pashello.c device.c INCDIROPT = -w
endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
"." \
"$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \
"$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)insn$(DELIM)include"}
AOBJS = $(ASRCS:.S=$(OBJEXT)) ASRCS =
COBJS = $(CSRCS:.c=$(OBJEXT)) CSRCS = pashello.c device.c
SRCS = $(ASRCS) $(CSRCS) AOBJS = $(ASRCS:.S=$(OBJEXT))
OBJS = $(AOBJS) $(COBJS) COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT) BIN = ..\..\libapps$(LIBEXT)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = ..\\..\\libapps$(LIBEXT) BIN = ..\\..\\libapps$(LIBEXT)
else else
BIN = ../../libapps$(LIBEXT) BIN = ../../libapps$(LIBEXT)
endif endif
endif endif
ROOTDEPPATH = --dep-path . ROOTDEPPATH = --dep-path .
# Common build # Common build
VPATH = VPATH =
all: .built all: .built
.PHONY: clean depend distclean .PHONY: clean depend distclean

View File

@ -43,8 +43,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <debug.h> #include <debug.h>
#include "apps/pcode/insn/pexec.h" #include "pexec.h"
#include "apps/pcode/pedefs.h" #include "pedefs.h"
#include "pashello.h" #include "pashello.h"
/**************************************************************************** /****************************************************************************

View File

@ -7,7 +7,7 @@ comment "Interpreters"
source "$APPSDIR/interpreters/ficl/Kconfig" source "$APPSDIR/interpreters/ficl/Kconfig"
config PCODE config INTERPRETERS_PCODE
bool "Pascal p-code interpreter" bool "Pascal p-code interpreter"
default n default n
---help--- ---help---
@ -16,6 +16,6 @@ config PCODE
configuration implies that you have performed the required installation of the configuration implies that you have performed the required installation of the
Pascal run-time code. Pascal run-time code.
if PCODE if INTERPRETERS_PCODE
endif endif

View File

@ -34,10 +34,10 @@
# #
############################################################################ ############################################################################
ifeq ($(CONFIG_PCODE),y) ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
CONFIGURED_APPS += interpreters/pcode CONFIGURED_APPS += interpreters/pcode
endif endif
ifeq ($(CONFIG_FICL),y) ifeq ($(CONFIG_INTERPRETERS_FICL),y)
CONFIGURED_APPS += interpreters/ficl CONFIGURED_APPS += interpreters/ficl
endif endif

View File

@ -3,7 +3,7 @@
# see misc/tools/kconfig-language.txt. # see misc/tools/kconfig-language.txt.
# #
config FICL config INTERPRETERS_FICL
bool "Ficl Forth interpreter" bool "Ficl Forth interpreter"
default n default n
---help--- ---help---
@ -11,6 +11,6 @@ config FICL
apps/interpreters/ficl directory. Use of this configuration assumes apps/interpreters/ficl directory. Use of this configuration assumes
that you have performed the required installation of the Ficl run-time code. that you have performed the required installation of the Ficl run-time code.
if FICL if INTERPRETERS_FICL
endif endif