sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed AVR build issues

Browse Source
This commit is contained in:
Pavel Ionut Catalin 2020-07-15 14:41:02 +03:00 committed by Alan Carvalho de Assis
parent 4910d43ab0
commit 954ee9d5f3
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/avr/include/avr/types.h
View File

@ -74,6 +74,9 @@ typedef unsigned long _uint32_t;
typedef signed long long _int64_t; /* long long is 64-bits */ typedef signed long long _int64_t; /* long long is 64-bits */
typedef unsigned long long _uint64_t; typedef unsigned long long _uint64_t;
typedef double double_t;
#define __INT64_DEFINED #define __INT64_DEFINED
/* A (near) size is 2 bytes */ /* A (near) size is 2 bytes */

7
arch/avr/src/avr/Toolchain.defs
View File

@ -76,18 +76,25 @@ endif
ifeq ($(CONFIG_ARCH_CHIP_ATMEGA128),y) ifeq ($(CONFIG_ARCH_CHIP_ATMEGA128),y)
ARCHCPUFLAGS += -mmcu=atmega128 ARCHCPUFLAGS += -mmcu=atmega128
LDFLAGS += -mavr51
else ifeq ($(CONFIG_ARCH_CHIP_ATMEGA1284P),y) else ifeq ($(CONFIG_ARCH_CHIP_ATMEGA1284P),y)
ARCHCPUFLAGS += -mmcu=atmega1284p ARCHCPUFLAGS += -mmcu=atmega1284p
LDFLAGS += -mavr51
else ifeq ($(CONFIG_ARCH_CHIP_AT90USB646),y) else ifeq ($(CONFIG_ARCH_CHIP_AT90USB646),y)
ARCHCPUFLAGS += -mmcu=at90usb646 ARCHCPUFLAGS += -mmcu=at90usb646
LDFLAGS += -mavr5
else ifeq ($(CONFIG_ARCH_CHIP_AT90USB647),y) else ifeq ($(CONFIG_ARCH_CHIP_AT90USB647),y)
ARCHCPUFLAGS += -mmcu=at90usb647 ARCHCPUFLAGS += -mmcu=at90usb647
LDFLAGS += -mavr5
else ifeq ($(CONFIG_ARCH_CHIP_AT90USB1286),y) else ifeq ($(CONFIG_ARCH_CHIP_AT90USB1286),y)
ARCHCPUFLAGS += -mmcu=at90usb1286 ARCHCPUFLAGS += -mmcu=at90usb1286
LDFLAGS += -mavr51
else ifeq ($(CONFIG_ARCH_CHIP_AT90USB1287),y) else ifeq ($(CONFIG_ARCH_CHIP_AT90USB1287),y)
ARCHCPUFLAGS += -mmcu=at90usb1287 ARCHCPUFLAGS += -mmcu=at90usb1287
LDFLAGS += -mavr51
else ifeq ($(CONFIG_ARCH_CHIP_ATMEGA2560),y) else ifeq ($(CONFIG_ARCH_CHIP_ATMEGA2560),y)
ARCHCPUFLAGS += -mmcu=atmega2560 ARCHCPUFLAGS += -mmcu=atmega2560
LDFLAGS += -mavr6
else else
$(error "No valid CONFIG_ARCH_CHIP_ set in the configuration") $(error "No valid CONFIG_ARCH_CHIP_ set in the configuration")
endif endif

10
arch/avr/src/avr/up_stackframe.c
View File

@ -53,6 +53,16 @@
* Pre-processor Macros * Pre-processor Macros
****************************************************************************/ ****************************************************************************/
/* Stack can be aligned to 1 byte */
#define CONFIG_STACK_ALIGNMENT 1
/* Stack alignment macros */
#define STACK_ALIGN_MASK (CONFIG_STACK_ALIGNMENT-1)
#define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
#define STACK_ALIGN_UP(a) (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/