Renamed the drivers directory to arch to reflect that this is the main place for architecture-dependent functionality.

.gitmodules

@@ -4,11 +4,11 @@
 [submodule "tools/cc2538-bsl"]
 	path = tools/cc2538-bsl
 	url = https://github.com/JelmerT/cc2538-bsl.git
-[submodule "drivers/cpu/cc26xx-cc13xx/lib/cc26xxware"]
-	path = drivers/cpu/cc26xx-cc13xx/lib/cc26xxware
+[submodule "arch/cpu/cc26xx-cc13xx/lib/cc26xxware"]
+	path = arch/cpu/cc26xx-cc13xx/lib/cc26xxware
 	url = https://github.com/contiki-os/cc26xxware.git
-[submodule "drivers/cpu/cc26xx-cc13xx/lib/cc13xxware"]
-	path = drivers/cpu/cc26xx-cc13xx/lib/cc13xxware
+[submodule "arch/cpu/cc26xx-cc13xx/lib/cc13xxware"]
+	path = arch/cpu/cc26xx-cc13xx/lib/cc13xxware
 	url = https://github.com/contiki-os/cc13xxware.git
 [submodule "tools/sensniff"]
 	path = tools/sensniff

Makefile.include

@@ -46,7 +46,7 @@ usage:
 	@echo "make MAKETARGETS... [TARGET=(TARGET)] [savetarget] [targets]"
 
 targets:
-	@ls -1 $(CONTIKI)/drivers/platform $(TARGETDIRS) | grep -v CVS
+	@ls -1 $(CONTIKI)/arch/platform $(TARGETDIRS) | grep -v CVS
 
 savetarget:
 	-@rm -f Makefile.target
@@ -115,7 +115,7 @@ uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 ifdef APPS
   APPDS = ${wildcard ${foreach DIR, $(APPDIRS), ${addprefix $(DIR)/, $(APPS)}}} \
              ${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
-             ${addprefix $(CONTIKI)/drivers/platform/$(TARGET)/apps/, $(APPS)} \
+             ${addprefix $(CONTIKI)/arch/platform/$(TARGET)/apps/, $(APPS)} \
              $(APPS)}
   APPINCLUDES = ${foreach APP, $(APPS), ${wildcard ${foreach DIR, $(APPDS), $(DIR)/Makefile.$(APP)}}}
   -include $(APPINCLUDES)
@@ -125,7 +125,7 @@ endif
 
 ### Include target makefile (TODO Unsafe?)
 
-target_makefile := $(wildcard $(CONTIKI)/drivers/platform/$(TARGET)/Makefile.$(TARGET) ${foreach TDIR, $(TARGETDIRS), $(TDIR)/$(TARGET)/Makefile.$(TARGET)})
+target_makefile := $(wildcard $(CONTIKI)/arch/platform/$(TARGET)/Makefile.$(TARGET) ${foreach TDIR, $(TARGETDIRS), $(TDIR)/$(TARGET)/Makefile.$(TARGET)})
 
 # Check if the target makefile exists, and create the object directory if necessary.
 ifeq ($(strip $(target_makefile)),)
@@ -172,9 +172,9 @@ CONTIKI_TARGET_DIRS_CONCAT = ${addprefix ${dir $(target_makefile)}, \
                                $(CONTIKI_TARGET_DIRS)}
 CONTIKI_CPU_DIRS_CONCAT    = ${addprefix $(CONTIKI_CPU)/, \
                                $(CONTIKI_CPU_DIRS)}
-CONTIKI_DRIVERS_DIRS    = ${addprefix $(CONTIKI)/, drivers}
+CONTIKI_ARCH_DIRS    = ${addprefix $(CONTIKI)/, arch}
 
-SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) $(CONTIKI_DRIVERS_DIRS) \
+SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) $(CONTIKI_ARCH_DIRS) \
              $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDS) $(EXTERNALDIRS) ${dir $(target_makefile)}
 
 vpath %.c $(SOURCEDIRS)
@@ -221,7 +221,7 @@ clean:
 distclean: clean
 	-rm -f ${addsuffix .$(TARGET),$(CONTIKI_PROJECT)}
 
--include $(CONTIKI)/drivers/platform/$(TARGET)/Makefile.customrules-$(TARGET)
+-include $(CONTIKI)/arch/platform/$(TARGET)/Makefile.customrules-$(TARGET)
 
 ifndef CUSTOM_RULE_C_TO_CE
 %.ce: %.c

arch/cpu/cc2538/Makefile.cc2538

@@ -45,10 +45,10 @@ CLEAN += *.d *.elf *.hex
 ### CPU-dependent directories
 CONTIKI_CPU_DIRS = ../arm/common/CMSIS . dev usb
 
-### Use the existing debug I/O in drivers/cpu/arm/common
+### Use the existing debug I/O in arch/cpu/arm/common
 CONTIKI_CPU_DIRS += ../arm/common/dbg-io
 
-### Use usb core from drivers/cpu/cc253x/usb/common
+### Use usb core from arch/cpu/cc253x/usb/common
 CONTIKI_CPU_DIRS += ../cc253x/usb/common ../cc253x/usb/common/cdc-acm
 
 ### CPU-dependent source files
@@ -80,7 +80,7 @@ CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES
 CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
 CONTIKI_SOURCEFILES += $(USB_CORE_SOURCEFILES) $(USB_ARCH_SOURCEFILES)
 
-MODULES += lib/newlib drivers/cpu/arm/common/sys
+MODULES += lib/newlib arch/cpu/arm/common/sys
 
 .SECONDEXPANSION: