mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-23 01:29:33 +00:00
Merge pull request #966 from g-oikonomou/cc2538-startup-to-cpu-dir
Move cc2538 startup-gcc.c to the CPU dir
This commit is contained in:
commit
71f22b1775
@ -59,6 +59,13 @@ DEBUG_IO_SOURCEFILES += dbg-printf.c dbg-snprintf.c dbg-sprintf.c strformat.c
|
|||||||
USB_CORE_SOURCEFILES += usb-core.c cdc-acm.c
|
USB_CORE_SOURCEFILES += usb-core.c cdc-acm.c
|
||||||
USB_ARCH_SOURCEFILES += usb-arch.c usb-serial.c cdc-acm-descriptors.c
|
USB_ARCH_SOURCEFILES += usb-arch.c usb-serial.c cdc-acm-descriptors.c
|
||||||
|
|
||||||
|
ifneq ($(TARGET_START_SOURCEFILES),)
|
||||||
|
CPU_START_SOURCEFILES = TARGET_START_SOURCEFILES
|
||||||
|
else
|
||||||
|
CPU_START_SOURCEFILES = startup-gcc.c
|
||||||
|
endif
|
||||||
|
CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
|
||||||
|
|
||||||
CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
|
CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
|
||||||
CONTIKI_SOURCEFILES += $(USB_CORE_SOURCEFILES) $(USB_ARCH_SOURCEFILES)
|
CONTIKI_SOURCEFILES += $(USB_CORE_SOURCEFILES) $(USB_ARCH_SOURCEFILES)
|
||||||
|
|
||||||
@ -75,7 +82,7 @@ $(OBJECTDIR)/ieee-addr.o: ieee-addr.c FORCE | $(OBJECTDIR)
|
|||||||
### Compilation rules
|
### Compilation rules
|
||||||
CUSTOM_RULE_LINK=1
|
CUSTOM_RULE_LINK=1
|
||||||
|
|
||||||
%.elf: $(TARGET_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LDSCRIPT)
|
%.elf: $(CPU_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LDSCRIPT)
|
||||||
$(TRACE_LD)
|
$(TRACE_LD)
|
||||||
$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@
|
$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@
|
||||||
|
|
||||||
|
@ -30,22 +30,23 @@
|
|||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
* \addtogroup cc2538dk
|
* \addtogroup cc2538
|
||||||
* @{
|
* @{
|
||||||
*
|
*
|
||||||
* \file
|
* \file
|
||||||
* Startup code for the cc2538dk platform, to be used when building with gcc
|
* Startup code for the cc2538 chip, to be used when building with gcc
|
||||||
*/
|
*/
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "reg.h"
|
#include "reg.h"
|
||||||
#include "flash-cca.h"
|
#include "flash-cca.h"
|
||||||
#include "sys-ctrl.h"
|
#include "sys-ctrl.h"
|
||||||
#include "uart.h"
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
extern int main(void);
|
extern int main(void);
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
#define WEAK_ALIAS(x) __attribute__ ((weak, alias(#x)))
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
/* System handlers provided here */
|
/* System handlers provided here */
|
||||||
void reset_handler(void);
|
void reset_handler(void);
|
||||||
void nmi_handler(void);
|
void nmi_handler(void);
|
||||||
@ -62,6 +63,9 @@ void cc2538_rf_rx_tx_isr(void);
|
|||||||
void cc2538_rf_err_isr(void);
|
void cc2538_rf_err_isr(void);
|
||||||
void udma_isr(void);
|
void udma_isr(void);
|
||||||
void udma_err_isr(void);
|
void udma_err_isr(void);
|
||||||
|
void usb_isr(void) WEAK_ALIAS(default_handler);
|
||||||
|
void uart0_isr(void) WEAK_ALIAS(default_handler);
|
||||||
|
void uart1_isr(void) WEAK_ALIAS(default_handler);
|
||||||
|
|
||||||
/* Boot Loader Backdoor selection */
|
/* Boot Loader Backdoor selection */
|
||||||
#if FLASH_CCA_CONF_BOOTLDR_BACKDOOR
|
#if FLASH_CCA_CONF_BOOTLDR_BACKDOOR
|
||||||
@ -83,22 +87,6 @@ void udma_err_isr(void);
|
|||||||
#else
|
#else
|
||||||
#define FLASH_CCA_BOOTLDR_CFG FLASH_CCA_BOOTLDR_CFG_DISABLE
|
#define FLASH_CCA_BOOTLDR_CFG FLASH_CCA_BOOTLDR_CFG_DISABLE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Link in the USB ISR only if USB is enabled */
|
|
||||||
#if USB_SERIAL_CONF_ENABLE
|
|
||||||
void usb_isr(void);
|
|
||||||
#else
|
|
||||||
#define usb_isr default_handler
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Likewise for the UART[01] ISRs */
|
|
||||||
#if UART_CONF_ENABLE
|
|
||||||
void uart0_isr(void);
|
|
||||||
void uart1_isr(void);
|
|
||||||
#else /* UART_CONF_ENABLE */
|
|
||||||
#define uart0_isr default_handler
|
|
||||||
#define uart1_isr default_handler
|
|
||||||
#endif /* UART_CONF_ENABLE */
|
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
/* Allocate stack space */
|
/* Allocate stack space */
|
||||||
static unsigned long stack[512];
|
static unsigned long stack[512];
|
@ -11,9 +11,6 @@ CONTIKI_TARGET_SOURCEFILES += contiki-main.c
|
|||||||
CONTIKI_TARGET_SOURCEFILES += sensors.c smartrf-sensors.c
|
CONTIKI_TARGET_SOURCEFILES += sensors.c smartrf-sensors.c
|
||||||
CONTIKI_TARGET_SOURCEFILES += button-sensor.c adc-sensor.c
|
CONTIKI_TARGET_SOURCEFILES += button-sensor.c adc-sensor.c
|
||||||
|
|
||||||
TARGET_START_SOURCEFILES += startup-gcc.c
|
|
||||||
TARGET_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(TARGET_START_SOURCEFILES)}}
|
|
||||||
|
|
||||||
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
||||||
|
|
||||||
CLEAN += *.cc2538dk
|
CLEAN += *.cc2538dk
|
||||||
|
Loading…
Reference in New Issue
Block a user