Squashed commit of the following:
ez80: Fixing a few more compile problems. I am afraid that the 5.3.0 compiler it too buggy to use.
ez80: Additional build-related fixed.
eZ80: Updating to use the newest ZDSII 5.3.0 toolchain.
This commit is contained in:
Gregory Nutt
parent
396552ac4c
commit
2767e80459
@ -43,7 +43,7 @@ config EZ80_TOOLCHAIN_ZDSII
|
||||
|
||||
choice
|
||||
prompt "ZDS-II Toolchain version"
|
||||
default EZ80_ZDSII_V521
|
||||
default EZ80_ZDSII_V530
|
||||
|
||||
config EZ80_ZDSII_V511
|
||||
bool "ZDS-II 5.1.1"
|
||||
@ -51,6 +51,9 @@ config EZ80_ZDSII_V511
|
||||
config EZ80_ZDSII_V521
|
||||
bool "ZDS-II 5.2.1"
|
||||
|
||||
config EZ80_ZDSII_V530
|
||||
bool "ZDS-II 5.3.0"
|
||||
|
||||
endchoice # ZDS-II Toolchain version
|
||||
|
||||
if EZ80_EMAC
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
############################################################################
|
||||
# configs/ez80f910200kitg/ostest/Make.defs
|
||||
# configs/ez80f910200kitg/scripts/Make.defs
|
||||
#
|
||||
# Copyright (C) 2008, 2009, 2013 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -36,23 +36,31 @@
|
||||
include $(TOPDIR)/.config
|
||||
include $(TOPDIR)/tools/Config.mk
|
||||
|
||||
# These are the directories where the ZDS-II toolchain is installed. NOTE
|
||||
# that short 8.3 path names are used in order to avoid spaces. On my machine
|
||||
# I have:
|
||||
# These are the default directories where the ZDS-II toolchain is installed.
|
||||
# NOTE that short 8.3 path names are used in order to avoid spaces. On my
|
||||
# machine I have:
|
||||
#
|
||||
# C:\PROGRA~1\ = C:\Profram Files\
|
||||
# Versions 5.1.1 and 5.2.1
|
||||
# C:\PROGRA~1\ = C:\Program Files\
|
||||
# C:\PROGRA~2\ = C:\Program Files (x86)\
|
||||
#
|
||||
# Your PC may be configured differently.
|
||||
#
|
||||
# Version 5.3.0, the default install location is C:\ZiLOG
|
||||
|
||||
ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
|
||||
ZDSVERSION := 5.2.1
|
||||
else # ifeq ($(CONFIGEZ80_ZDSII_V511),y)
|
||||
ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
|
||||
INSTALLROOT = C:/PROGRA~2/ZiLOG
|
||||
ZDSVERSION := 5.1.1
|
||||
else ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
|
||||
INSTALLROOT = C:/PROGRA~2/ZiLOG
|
||||
ZDSVERSION := 5.2.1
|
||||
else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
|
||||
INSTALLROOT = C:/ZiLOG
|
||||
ZDSVERSION := 5.3.0
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
|
||||
ZDSBINDIR := $(INSTALLDIR)\bin
|
||||
ZDSSTDINCDIR := $(INSTALLDIR)\include\std
|
||||
@ -68,7 +76,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
ARCHUSRINCLUDES = -usrinc:.
|
||||
else
|
||||
WINTOOL := y
|
||||
ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
|
||||
ZDSBINDIR := $(INSTALLDIR)/bin
|
||||
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
|
||||
@ -152,16 +160,16 @@ ARFLAGS = -quiet -warn
|
||||
|
||||
# Linker definitions
|
||||
|
||||
LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200kitg$(DELIM)ostest$(DELIM)ostest.linkcmd
|
||||
LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200kitg$(DELIM)scripts$(DELIM)ez80f910200kitg.linkcmd.linkcmd
|
||||
|
||||
# Tool names/pathes
|
||||
# Tool names/paths.
|
||||
|
||||
CROSSDEV =
|
||||
CC = ez80cc.exe
|
||||
CC = $(ZDSBINDIR)$(DELIM)ez80cc.exe
|
||||
CPP = gcc -E
|
||||
LD = ez80link.exe
|
||||
AS = ez80asm.exe
|
||||
AR = ez80lib.exe
|
||||
LD = $(ZDSBINDIR)$(DELIM)ez80link.exe
|
||||
AS = $(ZDSBINDIR)$(DELIM)ez80asm.exe
|
||||
AR = $(ZDSBINDIR)$(DELIM)ez80lib.exe
|
||||
|
||||
# File extensions
|
||||
|
||||
@ -179,15 +187,15 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
|
||||
define PREPROCESS
|
||||
@echo CPP: $1->$2
|
||||
$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
|
||||
$(Q) $(CPP) $(CPPFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define COMPILE
|
||||
$(Q) "$(CC)" $(CFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
$(Q) $(CC) $(CFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
$(Q) $(AS) $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
endef
|
||||
|
||||
define MOVEOBJ
|
||||
@ -198,7 +206,7 @@ endef
|
||||
|
||||
define ARCHIVE
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
$(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
define CLEAN
|
||||
@ -214,15 +222,15 @@ else
|
||||
|
||||
define PREPROCESS
|
||||
@echo "CPP: $1->$2"
|
||||
$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
|
||||
$(Q) $(CPP) $(CPPFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define COMPILE
|
||||
$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
|
||||
$(Q) $(CC) $(CFLAGS) `cygpath -w "$1"`
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
|
||||
$(Q) $(AS) $(AFLAGS) `cygpath -w "$1"`
|
||||
endef
|
||||
|
||||
define MOVEOBJ
|
||||
@ -234,7 +242,7 @@ endef
|
||||
define ARCHIVE
|
||||
$(Q) for __obj in $(2) ; do \
|
||||
echo "AR: $$__obj"; \
|
||||
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
|
||||
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
|
||||
done
|
||||
endef
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************/
|
||||
/* configs/ez80f910200kitg/ostest/ostest.linkcmd */
|
||||
/* configs/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd */
|
||||
/* */
|
||||
/* Copyright (C) 2008 Gregory Nutt. All rights reserved. */
|
||||
/* Author: Gregory Nutt <gnutt@nuttx.org> */
|
||||
@ -36,23 +36,31 @@
|
||||
include $(TOPDIR)/.config
|
||||
include $(TOPDIR)/tools/Config.mk
|
||||
|
||||
# These are the directories where the ZDS-II toolchain is installed. NOTE
|
||||
# that short 8.3 path names are used in order to avoid spaces. On my machine
|
||||
# I have:
|
||||
# These are the default directories where the ZDS-II toolchain is installed.
|
||||
# NOTE that short 8.3 path names are used in order to avoid spaces. On my
|
||||
# machine I have:
|
||||
#
|
||||
# C:\PROGRA~1\ = C:\Profram Files\
|
||||
# Versions 5.1.1 and 5.2.1
|
||||
# C:\PROGRA~1\ = C:\Program Files\
|
||||
# C:\PROGRA~2\ = C:\Program Files (x86)\
|
||||
#
|
||||
# Your PC may be configured differently.
|
||||
#
|
||||
# Version 5.3.0, the default install location is C:\ZiLOG
|
||||
|
||||
ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
|
||||
ZDSVERSION := 5.2.1
|
||||
else # ifeq ($(CONFIGEZ80_ZDSII_V511),y)
|
||||
ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
|
||||
INSTALLROOT = C:/PROGRA~2/ZiLOG
|
||||
ZDSVERSION := 5.1.1
|
||||
else ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
|
||||
INSTALLROOT = C:/PROGRA~2/ZiLOG
|
||||
ZDSVERSION := 5.2.1
|
||||
else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
|
||||
INSTALLROOT = C:/ZiLOG
|
||||
ZDSVERSION := 5.3.0
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
|
||||
ZDSBINDIR := $(INSTALLDIR)\bin
|
||||
ZDSSTDINCDIR := $(INSTALLDIR)\include\std
|
||||
@ -68,7 +76,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
ARCHUSRINCLUDES = -usrinc:.
|
||||
else
|
||||
WINTOOL := y
|
||||
ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
|
||||
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
|
||||
ZDSBINDIR := $(INSTALLDIR)/bin
|
||||
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
|
||||
@ -154,14 +162,14 @@ ARFLAGS = -quiet -warn
|
||||
|
||||
LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200zco$(DELIM)scripts$(DELIM)ez80f910200zco.linkcmd
|
||||
|
||||
# Tool names/pathes
|
||||
# Tool names/paths.
|
||||
|
||||
CROSSDEV =
|
||||
CC = ez80cc.exe
|
||||
CC = $(ZDSBINDIR)$(DELIM)ez80cc.exe
|
||||
CPP = gcc -E
|
||||
LD = ez80link.exe
|
||||
AS = ez80asm.exe
|
||||
AR = ez80lib.exe
|
||||
LD = $(ZDSBINDIR)$(DELIM)ez80link.exe
|
||||
AS = $(ZDSBINDIR)$(DELIM)ez80asm.exe
|
||||
AR = $(ZDSBINDIR)$(DELIM)ez80lib.exe
|
||||
|
||||
# File extensions
|
||||
|
||||
@ -179,15 +187,15 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
|
||||
define PREPROCESS
|
||||
@echo CPP: $1->$2
|
||||
$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
|
||||
$(Q) $(CPP) $(CPPFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define COMPILE
|
||||
$(Q) "$(CC)" $(CFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
$(Q) $(CC) $(CFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
$(Q) $(AS) $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
|
||||
endef
|
||||
|
||||
define MOVEOBJ
|
||||
@ -198,7 +206,7 @@ endef
|
||||
|
||||
define ARCHIVE
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
$(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
define CLEAN
|
||||
@ -214,15 +222,15 @@ else
|
||||
|
||||
define PREPROCESS
|
||||
@echo "CPP: $1->$2"
|
||||
$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
|
||||
$(Q) $(CPP) $(CPPFLAGS) $1 -o $2
|
||||
endef
|
||||
|
||||
define COMPILE
|
||||
$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
|
||||
$(Q) $(CC) $(CFLAGS) `cygpath -w "$1"`
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
|
||||
$(Q) $(AS) $(AFLAGS) `cygpath -w "$1"`
|
||||
endef
|
||||
|
||||
define MOVEOBJ
|
||||
@ -234,7 +242,7 @@ endef
|
||||
define ARCHIVE
|
||||
$(Q) for __obj in $(2) ; do \
|
||||
echo "AR: $$__obj"; \
|
||||
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
|
||||
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
|
||||
done
|
||||
endef
|
||||
|
||||
|
||||
@ -46,8 +46,12 @@
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef CONFIG_WIRELESS_BLUETOOTH
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
@ -465,4 +469,5 @@ begin_packed_struct struct bt_hci_evt_le_ltk_request_s
|
||||
uint16_t ediv;
|
||||
} end_packed_struct;
|
||||
|
||||
#endif /* CONFIG_WIRELESS_BLUETOOTH */
|
||||
#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_HCI_H */
|
||||
|
||||
@ -677,16 +677,20 @@ union ieee802154_phyattr_u
|
||||
/* TODO: Fill this out as we implement supported get/set commands */
|
||||
};
|
||||
|
||||
#if 0 /* Empty union causes errors on some compilers */
|
||||
union ieee802154_secattr_u
|
||||
{
|
||||
/* TODO: Fill this out as we implement supported get/set commands */
|
||||
};
|
||||
#endif
|
||||
|
||||
union ieee802154_attr_u
|
||||
{
|
||||
union ieee802154_macattr_u mac;
|
||||
union ieee802154_phyattr_u phy;
|
||||
#if 0 /* Empty union causes errors on some compilers */
|
||||
union ieee802154_secattr_u sec;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct ieee802154_gts_info_s
|
||||
|
||||
@ -210,3 +210,4 @@ void net_initialize(void)
|
||||
}
|
||||
|
||||
#endif /* CONFIG_NET */
|
||||
|
||||
|
||||
@ -353,7 +353,7 @@ void udp_poll(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn);
|
||||
****************************************************************************/
|
||||
|
||||
int psock_udp_cansend(FAR struct socket *psock);
|
||||
;
|
||||
|
||||
/****************************************************************************
|
||||
* Name: udp_send
|
||||
*
|
||||
|
||||
@ -142,9 +142,9 @@ static void group_remove(FAR struct task_group_s *group)
|
||||
|
||||
static inline void group_release(FAR struct task_group_s *group)
|
||||
{
|
||||
#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_SCHED_CHILD_STATUS)
|
||||
/* Free all un-reaped child exit status */
|
||||
|
||||
#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_SCHED_CHILD_STATUS)
|
||||
group_removechildren(group);
|
||||
#endif
|
||||
|
||||
@ -170,7 +170,6 @@ static inline void group_release(FAR struct task_group_s *group)
|
||||
/* Free resource held by the stream list */
|
||||
|
||||
lib_stream_release(group);
|
||||
|
||||
#endif /* CONFIG_NFILE_STREAMS */
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
|
||||
Loading…
Reference in New Issue
Block a user