diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-11-19 13:59:52 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-11-19 13:59:52 +0000 |
| commit | 449f7b1fa6fd495cf33dc668bdedd0804987fe01 (patch) | |
| tree | b8e8c9cad6f9ed7ac9cbe7d88078294440f6392d /os/common/ports | |
| parent | 5a0d462a552da04f31044b9ad4598b71a7ab594a (diff) | |
| download | ChibiOS-449f7b1fa6fd495cf33dc668bdedd0804987fe01.tar.gz ChibiOS-449f7b1fa6fd495cf33dc668bdedd0804987fe01.tar.bz2 ChibiOS-449f7b1fa6fd495cf33dc668bdedd0804987fe01.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6493 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/ports')
| -rw-r--r-- | os/common/ports/e200/compilers/GCC/rules.mk | 6 | ||||
| -rw-r--r-- | os/common/ports/e200/compilers/GCC/rules_z4.ld | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/os/common/ports/e200/compilers/GCC/rules.mk b/os/common/ports/e200/compilers/GCC/rules.mk index 0d799d8dc..26ad97945 100644 --- a/os/common/ports/e200/compilers/GCC/rules.mk +++ b/os/common/ports/e200/compilers/GCC/rules.mk @@ -37,9 +37,9 @@ endif # Exceptions stack size
ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
- LDOPT := $(LDOPT),--defsym=__main_stack_size__=0x400
+ LDOPT := $(LDOPT),--defsym=__irq_stack_size__=0x400
else
- LDOPT := $(LDOPT),--defsym=__main_stack_size__=$(USE_EXCEPTIONS_STACKSIZE)
+ LDOPT := $(LDOPT),--defsym=__irq_stack_size__=$(USE_EXCEPTIONS_STACKSIZE)
endif
# Output directory and files
@@ -86,7 +86,7 @@ ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS) ASXFLAGS = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)
CFLAGS = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
-LDFLAGS = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),--script=$(LDSCRIPT),$(LDOPT)
+LDFLAGS = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),$(LDOPT),--script=$(LDSCRIPT)
# Generate dependency information
CFLAGS += -MD -MP -MF .dep/$(@F).d
diff --git a/os/common/ports/e200/compilers/GCC/rules_z4.ld b/os/common/ports/e200/compilers/GCC/rules_z4.ld index 72932c6fb..ae4a1e693 100644 --- a/os/common/ports/e200/compilers/GCC/rules_z4.ld +++ b/os/common/ports/e200/compilers/GCC/rules_z4.ld @@ -29,8 +29,6 @@ SECTIONS . = ORIGIN(flash);
.boot0 : ALIGN(16) SUBALIGN(16)
{
- . += ${conf.instance.runtime_settings.load_address[0]?trim};
- . = ALIGN(0x10000);
__ivpr_base__ = .;
KEEP(*(.boot))
} > flash
|