Merge pull request #204 from g-oikonomou/contrib/cm3-common

Provide common build infrastructure for CM3- and CM4-based systems

arch/cpu/arm/Makefile.arm

@@ -0,0 +1,54 @@
+CC       = arm-none-eabi-gcc
+CPP      = arm-none-eabi-cpp
+LD       = arm-none-eabi-gcc
+AR       = arm-none-eabi-ar
+OBJCOPY  = arm-none-eabi-objcopy
+OBJDUMP  = arm-none-eabi-objdump
+NM       = arm-none-eabi-nm
+SIZE     = arm-none-eabi-size
+SREC_CAT = srec_cat
+
+CFLAGS += -mthumb -mabi=aapcs -mlittle-endian
+CFLAGS += -Werror -Wall
+CFLAGS += -std=c99
+CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing
+CFLAGS += -fshort-enums -fomit-frame-pointer -fno-builtin
+
+LDFLAGS += -mthumb -mlittle-endian
+
+OBJDUMP_FLAGS += --disassemble --source --disassembler-options=force-thumb
+
+### Are we building with code size optimisations?
+SMALL ?= 1
+ifeq ($(SMALL),1)
+  CFLAGS += -Os
+else
+  CFLAGS += -O2
+endif
+
+### Use CMSIS and the existing dbg-io from arch/cpu/arm/common
+CONTIKI_ARM_DIRS += . common/dbg-io
+CONTIKI_CPU_DIRS += $(addprefix ../arm/, $(CONTIKI_ARM_DIRS))
+
+### CPU-dependent cleanup files
+CLEAN += *.d *.elf *.hex
+
+### Don't treat the following files as intermediate
+.PRECIOUS: %.elf %.hex %.bin
+
+%.i16hex: %.elf
+	$(OBJCOPY) -O ihex $< $@
+
+%.hex: %.i16hex
+	$(SREC_CAT) $< -intel -o $@ -intel
+
+%.bin: %.elf
+	$(OBJCOPY) -O binary $(OBJCOPY_FLAGS) $< $@
+
+%.lst: %.elf
+	$(OBJDUMP) $(OBJDUMP_FLAGS) $< > $@
+
+### We don't really need the .hex and .bin for the .$(TARGET) but let's make
+### sure they get built
+%.$(TARGET): %.elf %.hex %.bin
+	cp $< $@

arch/cpu/arm/cortex-m/Makefile.cortex-m

@@ -0,0 +1,3 @@
+CONTIKI_ARM_DIRS += cortex-m cortex-m/CMSIS
+
+include $(CONTIKI)/arch/cpu/arm/Makefile.arm

arch/cpu/arm/cortex-m/cm3/Makefile.cm3

@@ -0,0 +1,24 @@
+CONTIKI_ARM_DIRS += cortex-m/cm3
+
+CFLAGS += -mcpu=cortex-m3
+
+LDFLAGS += -mcpu=cortex-m3 -nostartfiles
+LDFLAGS += -T $(LDSCRIPT)
+LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
+LDFLAGS += -Wl,-Map=$(@:.elf=-$(TARGET).map),--cref,--no-warn-mismatch
+
+OBJCOPY_FLAGS += --gap-fill 0xff
+
+### Build syscalls for newlib
+MODULES += os/lib/newlib
+
+CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
+
+### Compilation rules
+CUSTOM_RULE_LINK = 1
+
+%.elf: $(CPU_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LDSCRIPT)
+	$(TRACE_LD)
+	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -lm -o $@
+
+include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m

arch/cpu/arm/cortex-m/cm4/Makefile.cm4

@@ -0,0 +1,13 @@
+CONTIKI_ARM_DIRS += cortex-m/cm4
+
+CFLAGS += -mcpu=cortex-m4
+LDFLAGS += -mcpu=cortex-m4
+
+### Compilation rules
+CUSTOM_RULE_LINK=1
+
+%.elf: $(TARGET_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(TARGET_LIBS)
+	$(TRACE_LD)
+	$(Q)$(CC) $(LDFLAGS) ${filter %o %.co %.a,$^} -o $@
+
+include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m

arch/cpu/cc2538/Makefile.cc2538

@@ -1,52 +1,17 @@
-CC      = arm-none-eabi-gcc
-CPP     = arm-none-eabi-cpp
-LD      = arm-none-eabi-gcc
-AR      = arm-none-eabi-ar
-OBJCOPY = arm-none-eabi-objcopy
-OBJDUMP = arm-none-eabi-objdump
-NM      = arm-none-eabi-nm
-
 ifndef SOURCE_LDSCRIPT
 SOURCE_LDSCRIPT = $(CONTIKI_CPU)/cc2538.lds
 endif
 LDSCRIPT = $(OBJECTDIR)/cc2538.ld
 
-CFLAGS += -mcpu=cortex-m3 -mthumb -mlittle-endian
-CFLAGS += -ffunction-sections -fdata-sections
-CFLAGS += -fshort-enums -fomit-frame-pointer -fno-strict-aliasing
-CFLAGS += -Wall -DCMSIS_DEV_HDR=\"cc2538_cm3.h\"
-LDFLAGS += -mcpu=cortex-m3 -mthumb -nostartfiles
-LDFLAGS += -T $(LDSCRIPT)
-LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
-LDFLAGS += -Wl,-Map=$(@:.elf=-$(TARGET).map),--cref,--no-warn-mismatch
-OBJCOPY_FLAGS += -O binary --gap-fill 0xff
-OBJDUMP_FLAGS += --disassemble --source --disassembler-options=force-thumb
-
-ifeq ($(WERROR),1)
-CFLAGS += -Werror
-endif
-
-### Are we building with code size optimisations?
-SMALL ?= 1
-ifeq ($(SMALL),1)
-  CFLAGS += -Os
-else
-  CFLAGS += -O2
-endif
+CFLAGS += -DCMSIS_DEV_HDR=\"cc2538_cm3.h\"
 
 ### If the user-specified a Node ID, pass a define
 ifdef NODEID
   CFLAGS += -DIEEE_ADDR_NODE_ID=$(NODEID)
 endif
 
-### CPU-dependent cleanup files
-CLEAN += *.d *.elf *.hex
-
 ### CPU-dependent directories
-CONTIKI_CPU_DIRS = ../arm/common/CMSIS . dev usb usb/common usb/common/cdc-acm
-
-### Use the existing debug I/O in arch/cpu/arm/common
-CONTIKI_CPU_DIRS += ../arm/common/dbg-io
+CONTIKI_CPU_DIRS = . dev usb usb/common usb/common/cdc-acm
 
 ### CPU-dependent source files
 CONTIKI_CPU_SOURCEFILES += soc.c clock.c rtimer-arch.c uart.c watchdog.c
@@ -66,23 +31,13 @@ DEBUG_IO_SOURCEFILES += dbg-printf.c dbg-snprintf.c dbg-sprintf.c strformat.c
 
 USB_SOURCEFILES += usb-core.c cdc-acm.c 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 += $(USB_SOURCEFILES)
 
-MODULES += os/lib/newlib
-
 .SECONDEXPANSION:
 
-### Don't treat the .elf as intermediate
-.PRECIOUS: %.elf %.hex %.bin
-
 ### Always re-build ieee-addr.o in case the command line passes a new NODEID
 FORCE:
 
@@ -90,27 +45,6 @@ $(OBJECTDIR)/ieee-addr.o: ieee-addr.c FORCE | $(OBJECTDIR)
 	$(TRACE_CC)
 	$(Q)$(CC) $(CFLAGS) -c $< -o $@
 
-### Compilation rules
-CUSTOM_RULE_LINK=1
-
-%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT)
-	$(TRACE_LD)
-	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@
-
-%.hex: %.elf
-	$(OBJCOPY) -O ihex $< $@
-
-%.bin: %.elf
-	$(OBJCOPY) $(OBJCOPY_FLAGS) $< $@
-
-%.lst: %.elf
-	$(OBJDUMP) $(OBJDUMP_FLAGS) $< > $@
-
-### We don't really need the .hex and .bin for the .$(TARGET) but let's make
-### sure they get built
-%.$(TARGET): %.elf %.hex %.bin
-	cp $< $@
-
 ### This rule is used to generate the correct linker script
 LDGENFLAGS += $(CFLAGS)
 LDGENFLAGS += -imacros "contiki-conf.h" -imacros "dev/cc2538-dev.h"
@@ -121,3 +55,5 @@ LDGENFLAGS += -x c -P -E
 $(LDSCRIPT): $(SOURCE_LDSCRIPT) FORCE | $(OBJECTDIR)
 	$(TRACE_CC)
 	$(Q)$(CC) $(LDGENFLAGS) $< | grep -v '^\s*#\s*pragma\>' > $@
+
+include $(CONTIKI)/arch/cpu/arm/cortex-m/cm3/Makefile.cm3

arch/cpu/cc2538/lpm.c

@@ -61,7 +61,7 @@
 #define DEEP_SLEEP_PM1_THRESHOLD    10
 #define DEEP_SLEEP_PM2_THRESHOLD    100
 /*---------------------------------------------------------------------------*/
-#define assert_wfi() do { asm("wfi"::); } while(0)
+#define assert_wfi() do { __asm("wfi"::); } while(0)
 /*---------------------------------------------------------------------------*/
 #if LPM_CONF_STATS
 rtimer_clock_t lpm_stats[3];

arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx

@@ -1,13 +1,3 @@
-CC      = arm-none-eabi-gcc
-CPP     = arm-none-eabi-cpp
-LD      = arm-none-eabi-gcc
-AR      = arm-none-eabi-ar
-OBJCOPY = arm-none-eabi-objcopy
-OBJDUMP = arm-none-eabi-objdump
-NM      = arm-none-eabi-nm
-SIZE    = arm-none-eabi-size
-SREC_CAT = srec_cat
-
 CPU_ABS_PATH       = arch/cpu/cc26xx-cc13xx
 TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
 
@@ -29,44 +19,14 @@ MODULES += $(TI_XXWARE_SRC)
 
 LDSCRIPT = $(CONTIKI_CPU)/cc26xx.ld
 
-CFLAGS += -mcpu=cortex-m3 -mthumb -mlittle-endian
-CFLAGS += -ffunction-sections -fdata-sections
-CFLAGS += -fshort-enums -fomit-frame-pointer -fno-strict-aliasing
-CFLAGS += -Wall -std=c99 -DCMSIS_DEV_HDR=\"cc13x0-cc26x0-cm3.h\"
-
-LDFLAGS += -mcpu=cortex-m3 -mthumb -mlittle-endian -nostartfiles
-LDFLAGS += -T $(LDSCRIPT)
-LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
-LDFLAGS += -Wl,-Map=$(@:.elf=-$(TARGET).map),--cref,--no-warn-mismatch
-OBJCOPY_FLAGS += -O binary --gap-fill 0xff
-OBJDUMP_FLAGS += --disassemble --source --disassembler-options=force-thumb
-
-ifeq ($(WERROR),1)
-CFLAGS += -Werror
-endif
-
-### Are we building with code size optimisations?
-SMALL ?= 1
-ifeq ($(SMALL),1)
-  CFLAGS += -Os
-else
-  CFLAGS += -O2
-endif
-
 ### If the user-specified a Node ID, pass a define
 ifdef NODEID
   CFLAGS += -DIEEE_ADDR_NODE_ID=$(NODEID)
 endif
 
-### CPU-dependent cleanup files
-CLEAN += *.d *.elf *.hex
-
 ### CPU-dependent directories
 CONTIKI_CPU_DIRS += . dev rf-core rf-core/api $(TI_XXWARE_STARTUP_DIR)
 
-### Use CMSIS and the existing debug I/O in arch/cpu/arm/common
-CONTIKI_CPU_DIRS += ../arm/common/dbg-io ../arm/common/CMSIS
-
 ### CPU-dependent source files
 CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c soc-rtc.c uart.c
 CONTIKI_CPU_SOURCEFILES += contiki-watchdog.c aux-ctrl.c
@@ -80,8 +40,7 @@ DEBUG_IO_SOURCEFILES += dbg-printf.c dbg-snprintf.c dbg-sprintf.c strformat.c
 
 CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
 
-TARGET_START_SOURCEFILES += fault-handlers.c $(TI_XXWARE_STARTUP_SRCS)
-TARGET_STARTFILES = $(addprefix $(OBJECTDIR)/,$(call oname, $(TARGET_START_SOURCEFILES)))
+CPU_START_SOURCEFILES += fault-handlers.c $(TI_XXWARE_STARTUP_SRCS)
 
 PYTHON = python
 BSL_FLAGS += -e -w -v
@@ -92,9 +51,6 @@ endif
 
 BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
 
-### Don't treat the .elf as intermediate
-.PRECIOUS: %.elf %.hex %.bin
-
 ### Always re-build ieee-addr.o in case the command line passes a new NODEID
 FORCE:
 
@@ -108,30 +64,6 @@ $(OBJECTDIR)/ccfg.o: ccfg.c FORCE | $(OBJECTDIR)
 	$(TRACE_CC)
 	$(Q)$(CC) $(CFLAGS) -include "ccxxware-conf.h" -c $< -o $@
 
-### Compilation rules
-CUSTOM_RULE_LINK=1
-
-%.elf: $(TARGET_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LDSCRIPT)
-	$(TRACE_LD)
-	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -lm -o $@
-
-%.i16hex: %.elf
-	$(OBJCOPY) -O ihex $< $@
-
-%.hex: %.i16hex
-	$(SREC_CAT) $< -intel -o $@ -intel
-
-%.bin: %.elf
-	$(OBJCOPY) $(OBJCOPY_FLAGS) $< $@
-
-%.lst: %.elf
-	$(OBJDUMP) $(OBJDUMP_FLAGS) $< > $@
-
-### We don't really need the .hex and .bin for the .$(TARGET) but let's make
-### sure they get built
-%.$(TARGET): %.elf %.hex %.bin
-	cp $< $@
-
 # a target that gives a user-friendly memory profile, taking into account the RAM
 # that is statically occupied by the stack as defined in the linker script
 # see $(LDSCRIPT)
@@ -170,3 +102,5 @@ UART_BAUDRATE = 115200
 
 login:
 	$(SERIALDUMP) -b$(UART_BAUDRATE) $(PORT)
+
+include $(CONTIKI)/arch/cpu/arm/cortex-m/cm3/Makefile.cm3

arch/cpu/nrf52832/Makefile.nrf52832

@@ -46,19 +46,6 @@ OBJECT_DIRECTORY = $(OBJECTDIR)
 LISTING_DIRECTORY := $(OBJECTDIR)
 OUTPUT_BINARY_DIRECTORY := bin_$(TARGET)
 
-MK := mkdir
-RM := rm -rf
-
-# Toolchain commands
-CC := arm-none-eabi-gcc
-AS := arm-none-eabi-as
-AR := arm-none-eabi-ar
-LD := arm-none-eabi-ld
-NM := arm-none-eabi-nm
-OBJDUMP := arm-none-eabi-objdump
-OBJCOPY := arm-none-eabi-objcopy
-SIZE := arm-none-eabi-size
-
 # JLink
 JLINK := $(NRF52_JLINK_PATH)/JLinkExe
 JLINK_OPTS = -Device NRF52 -if swd -speed 1000
@@ -141,44 +128,24 @@ EXTERNALDIRS += $(addprefix $(NRF52_SDK_ROOT)/, $(INC_PATHS))
 # Sorting removes duplicates
 BUILD_DIRECTORIES := $(sort $(OUTPUT_BINARY_DIRECTORY) $(LISTING_DIRECTORY))
 
-# Clean files and directories
-CLEAN += bin_$(TARGET) lst_$(TARGET) nrf52832.a *.elf *.hex
-
 #flags common to all targets
 ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
 CFLAGS += -DSOFTDEVICE_PRESENT
 CFLAGS += -DS132
 endif
 
-SMALL ?= 1
-ifeq ($(SMALL),1)
-CFLAGS += -Os
-else
-CFLAGS += -O2
-endif
-
 CFLAGS += -DNRF52
 CFLAGS += -DBOARD_$(shell echo $(NRF52_DK_REVISION) | tr a-z A-Z)
 CFLAGS += -D__HEAP_SIZE=512
 CFLAGS += -DSWI_DISABLE0
 CFLAGS += -DCONFIG_GPIO_AS_PINRESET
 CFLAGS += -DBLE_STACK_SUPPORT_REQD
-CFLAGS += -mcpu=cortex-m4
-CFLAGS += -mthumb -mabi=aapcs --std=gnu99
-CFLAGS += -Wall
-ifeq ($(WERROR),1)
-CFLAGS += -Werror
-endif
 CFLAGS += -ggdb
 CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
-# keep every function in separate section. This will allow linker to dump unused functions
-CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing
-CFLAGS += -fno-builtin --short-enums
 
 # keep every function in separate section. This will allow linker to dump unused functions
 LDFLAGS += -Xlinker -Map=$(LISTING_DIRECTORY)/$(OUTPUT_FILENAME).map
-LDFLAGS += -mthumb -mabi=aapcs -L $(TEMPLATE_PATH) -T$(LINKER_SCRIPT)
-LDFLAGS += -mcpu=cortex-m4
+LDFLAGS += -mabi=aapcs -L $(TEMPLATE_PATH) -T$(LINKER_SCRIPT)
 LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
 # let linker to dump unused sections
 LDFLAGS += -Wl,--gc-sections
@@ -212,41 +179,15 @@ OBJECTS = $(C_OBJECTS) $(ASM_OBJECTS)
 
 TARGET_LIBS= nrf52832.a $(NRF52_SDK_ROOT)/components/iot/ble_6lowpan/lib/ble_6lowpan.a
 
-### Don't treat the .elf as intermediate
-.PRECIOUS: %.hex %.bin
-
 nrf52832.a: $(OBJECTS)
 	$(TRACE_AR)
 	$(Q)$(AR) $(AROPTS) $@ $^
 
-### Compilation rules
-CUSTOM_RULE_LINK=1
-
-%.elf: $(TARGET_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(TARGET_LIBS)
-	$(TRACE_LD)
-	$(Q)$(CC) $(LDFLAGS) ${filter %o %.co %.a,$^} -o $@
-
 # Assemble files
 $(OBJECT_DIRECTORY)/%.o: %.s
 	@echo Compiling file: $(notdir $<)
 	$(Q)$(CC) $(ASMFLAGS) $(addprefix -I$(NRF52_SDK_ROOT)/, $(INC_PATHS)) -c -o $@ $<
 
-# Create binary file from the .out file
-%.bin: %.elf
-	@echo Preparing: $@
-	$(Q)$(OBJCOPY) -O binary $^ $@
-
-# Create binary .hex file from the .out file
-%.hex: %.elf
-	@echo Preparing: $@
-	$(Q)$(OBJCOPY) -O ihex $^ $@
-
-### We don't really need the .hex and .bin for the .$(TARGET) but let's make
-### sure they get built
-%.$(TARGET): %.elf %.hex %.bin
-	cp $*.elf $@
-	$(Q)$(SIZE) $@
-
 %.jlink:
 	sed -e 's/#OUTPUT_FILENAME#/$*.hex/' $(CONTIKI_CPU)/flash.jlink > $@
 
@@ -265,3 +206,5 @@ erase:
 	$(JLINK) $(JLINK_OPTS) -CommanderScript $(CONTIKI_CPU)/erase.jlink
 
 .PHONY: softdevice.jlink
+
+include $(CONTIKI)/arch/cpu/arm/cortex-m/cm4/Makefile.cm4

arch/platform/cc2538dk/platform.c

@@ -83,11 +83,11 @@ fade(unsigned char l)
 
     leds_on(l);
     for(i = 0; i < j; ++i) {
-      asm("nop");
+      __asm("nop");
     }
     leds_off(l);
     for(i = 0; i < 400 - j; ++i) {
-      asm("nop");
+      __asm("nop");
     }
   }
 }

arch/platform/openmote-cc2538/platform.c

@@ -91,11 +91,11 @@ fade(unsigned char l)
 
     leds_on(l);
     for(i = 0; i < j; ++i) {
-      asm("nop");
+      __asm("nop");
     }
     leds_off(l);
     for(i = 0; i < 400 - j; ++i) {
-      asm("nop");
+      __asm("nop");
     }
   }
 }

arch/platform/zoul/platform.c

@@ -90,11 +90,11 @@ fade(unsigned char l)
 
     leds_on(l);
     for(i = 0; i < j; ++i) {
-      asm("nop");
+      __asm("nop");
     }
     leds_off(l);
     for(i = 0; i < 400 - j; ++i) {
-      asm("nop");
+      __asm("nop");
     }
   }
 }