RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

added fixes for compilation for mc1322x

Browse Source
This commit is contained in:
Thomas Eichinger 2013-07-24 15:50:16 +02:00
parent 585f4f3698
commit 4bc89bd458
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/Makefile.include
View File

@ -14,6 +14,7 @@ endif
ifeq ($(CPU),mc1322x)
export USEMODULE += arm_common
export UNDEF += $(BINDIR)syscalls.o
export UNDEF += $(BINDIR)mc1322x_syscalls.o
export INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include
endif
ifeq ($(CPU),native)

10
cpu/mc1322x/mc1322x.lds
View File

@ -160,7 +160,8 @@ HEAP_SIZE = 4096;
.got : { *(.got.plt) *(.got) }
.data :
{
__data_start = . ;
/* changed from __data_start = . ; */
_data = . ;
*(.data .data.* .gnu.linkonce.d.*)
SORT(CONSTRUCTORS)
}
@ -212,15 +213,16 @@ HEAP_SIZE = 4096;
pad the .data section. */
. = ALIGN(. != 0 ? 32 / 8 : 1);
}
_bss_end__ = . ; __bss_end__ = . ;
/* changed from _bss_end__ = . ; __bss_end__ = . ; */
__bss_end = . ; __bss_end__ = . ;
. = ALIGN(32 / 8);
.heap : {
__heap_start__ = . ; PROVIDE(__HEAP_START = .);
__heap_start__ = . ; PROVIDE(__heap_start = .);
*(.heap);
. += HEAP_SIZE;
. = ALIGN (4);
__heap_end__ = . ; PROVIDE(__HEAP_END = .);
__heap_end__ = . ; PROVIDE(__heap_end = .);
}

2
drivers/cc110x_ng/cc110x-rx.c
View File

@ -10,7 +10,7 @@
#include <transceiver.h>
#include <cpu-conf.h>
#include <board.h>
//#include <board.h>
#ifdef DBG_IGNORE
#include <stdio.h>

2
drivers/cc110x_ng/cc110x-tx.c
View File

@ -9,7 +9,7 @@
#include <irq.h>
#include <board.h>
//#include <board.h>
uint8_t cc110x_send(cc110x_packet_t *packet) {
volatile uint32_t abort_count;

2
sys/net/sixlowpan/sixlowpan.c
View File

@ -9,7 +9,7 @@
#include <mutex.h>
#include <hwtimer.h>
#include <rtc.h>
#include <lpc2387-rtc.h>
//#include <lpc2387-rtc.h>
#include "msg.h"
#include "sixlowmac.h"
#include "sixlowpan.h"