Move include/$arch to include/arch/$arch to be consistent with src/ hierarchy

25 files changed, 3 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index b7089b4..e5dc27d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 default: build/system.elf
 
-INCLUDES = -Iinclude
+INCLUDES = -Iinclude -Iinclude/arch/${arch}
 COMMON_FLAGS = -g -Os -Wall -Wextra -fno-rtti
 CFLAGS = -std=c99
 CXXFLAGS = -std=c++14
diff --git a/include/arduino-nano/driver/gpio.h b/include/arch/arduino-nano/driver/gpio.h
index 6acf977..6acf977 100644
--- a/include/arduino-nano/driver/gpio.h
+++ b/include/arch/arduino-nano/driver/gpio.h
diff --git a/include/arduino-nano/driver/i2c.h b/include/arch/arduino-nano/driver/i2c.h
index 6d6ea66..6d6ea66 100644
--- a/include/arduino-nano/driver/i2c.h
+++ b/include/arch/arduino-nano/driver/i2c.h
diff --git a/include/arduino-nano/driver/stdin.h b/include/arch/arduino-nano/driver/stdin.h
index 6462e0c..6462e0c 100644
--- a/include/arduino-nano/driver/stdin.h
+++ b/include/arch/arduino-nano/driver/stdin.h
diff --git a/include/arduino-nano/driver/stdout.h b/include/arch/arduino-nano/driver/stdout.h
index 2eb669d..2eb669d 100644
--- a/include/arduino-nano/driver/stdout.h
+++ b/include/arch/arduino-nano/driver/stdout.h
diff --git a/include/arduino-nano/driver/uptime.h b/include/arch/arduino-nano/driver/uptime.h
index 86a8bb5..86a8bb5 100644
--- a/include/arduino-nano/driver/uptime.h
+++ b/include/arch/arduino-nano/driver/uptime.h
diff --git a/include/esp8266/driver/gpio.h b/include/arch/esp8266/driver/gpio.h
index 3db5d9d..3db5d9d 100644
--- a/include/esp8266/driver/gpio.h
+++ b/include/arch/esp8266/driver/gpio.h
diff --git a/include/esp8266/driver/stdin.h b/include/arch/esp8266/driver/stdin.h
index 6462e0c..6462e0c 100644
--- a/include/esp8266/driver/stdin.h
+++ b/include/arch/esp8266/driver/stdin.h
diff --git a/include/esp8266/driver/stdout.h b/include/arch/esp8266/driver/stdout.h
index 038de2e..038de2e 100644
--- a/include/esp8266/driver/stdout.h
+++ b/include/arch/esp8266/driver/stdout.h
diff --git a/include/esp8266/driver/uptime.h b/include/arch/esp8266/driver/uptime.h
index 21740c9..21740c9 100644
--- a/include/esp8266/driver/uptime.h
+++ b/include/arch/esp8266/driver/uptime.h
diff --git a/include/esp8266/user_config.h b/include/arch/esp8266/user_config.h
index 529fb46..529fb46 100644
--- a/include/esp8266/user_config.h
+++ b/include/arch/esp8266/user_config.h
diff --git a/include/msp430fr5969lp/driver/adc.h b/include/arch/msp430fr5969lp/driver/adc.h
index d93aed4..d93aed4 100644
--- a/include/msp430fr5969lp/driver/adc.h
+++ b/include/arch/msp430fr5969lp/driver/adc.h
diff --git a/include/msp430fr5969lp/driver/gpio.h b/include/arch/msp430fr5969lp/driver/gpio.h
index caed74a..caed74a 100644
--- a/include/msp430fr5969lp/driver/gpio.h
+++ b/include/arch/msp430fr5969lp/driver/gpio.h
diff --git a/include/msp430fr5969lp/driver/i2c.h b/include/arch/msp430fr5969lp/driver/i2c.h
index 6d6ea66..6d6ea66 100644
--- a/include/msp430fr5969lp/driver/i2c.h
+++ b/include/arch/msp430fr5969lp/driver/i2c.h
diff --git a/include/msp430fr5969lp/driver/spi_b.h b/include/arch/msp430fr5969lp/driver/spi_b.h
index 4be7346..4be7346 100644
--- a/include/msp430fr5969lp/driver/spi_b.h
+++ b/include/arch/msp430fr5969lp/driver/spi_b.h
diff --git a/include/msp430fr5969lp/driver/stdin.h b/include/arch/msp430fr5969lp/driver/stdin.h
index 6462e0c..6462e0c 100644
--- a/include/msp430fr5969lp/driver/stdin.h
+++ b/include/arch/msp430fr5969lp/driver/stdin.h
diff --git a/include/msp430fr5969lp/driver/stdout.h b/include/arch/msp430fr5969lp/driver/stdout.h
index 2eb669d..2eb669d 100644
--- a/include/msp430fr5969lp/driver/stdout.h
+++ b/include/arch/msp430fr5969lp/driver/stdout.h
diff --git a/include/msp430fr5969lp/driver/uptime.h b/include/arch/msp430fr5969lp/driver/uptime.h
index 3a52840..3a52840 100644
--- a/include/msp430fr5969lp/driver/uptime.h
+++ b/include/arch/msp430fr5969lp/driver/uptime.h
diff --git a/include/posix/driver/gpio.h b/include/arch/posix/driver/gpio.h
index 0995729..0995729 100644
--- a/include/posix/driver/gpio.h
+++ b/include/arch/posix/driver/gpio.h
diff --git a/include/posix/driver/stdout.h b/include/arch/posix/driver/stdout.h
index b21ad56..b21ad56 100644
--- a/include/posix/driver/stdout.h
+++ b/include/arch/posix/driver/stdout.h
diff --git a/include/posix/driver/uptime.h b/include/arch/posix/driver/uptime.h
index 93711b9..93711b9 100644
--- a/include/posix/driver/uptime.h
+++ b/include/arch/posix/driver/uptime.h
diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index bceecad..b97ae16 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -5,7 +5,6 @@ PROGRAMMER ?= usbasp
 PORT = /dev/ttyUSB0
 BAUD = 57600
 
-INCLUDES += -Iinclude/arduino-nano
 COMMON_FLAGS += -mmcu=${MCU} -DF_CPU=16000000UL -DMULTIPASS_ARCH_arduino_nano
 COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C
 
diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc
index 33df2b2..8deaa95 100644
--- a/src/arch/esp8266/Makefile.inc
+++ b/src/arch/esp8266/Makefile.inc
@@ -15,7 +15,7 @@ ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler ${TOOLCHAIN_BASE}/xtensa-lx106-elf-g++ -p . --Xcompiler
 endif
 
-INCLUDES += -Iinclude/esp8266 -I${SDK_BASE}/include
+INCLUDES += -I${SDK_BASE}/include
 COMMON_FLAGS += -nostdlib -mlongcalls -D__ets__ -DICACHE_FLASH -DMULTIPASS_ARCH_esp8266
 CXXFLAGS = -std=c++11
 LDFLAGS += -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 3b8fcd1..5512cb9 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -3,7 +3,7 @@
 CPU = 430x
 MCU = msp430fr5969
 
-INCLUDES += -Iinclude/msp430fr5969lp -I/opt/msp430/ti/gcc/include
+INCLUDES += -I/opt/msp430/ti/gcc/include
 COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5969lp
 COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C
 
diff --git a/src/arch/posix/Makefile.inc b/src/arch/posix/Makefile.inc
index a706314..03402bc 100644
--- a/src/arch/posix/Makefile.inc
+++ b/src/arch/posix/Makefile.inc
@@ -7,7 +7,6 @@ ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 -p . --Xcompiler
 endif
 
-INCLUDES += -Iinclude/posix
 TARGETS += src/arch/posix/arch.cc src/arch/posix/driver/gpio.cc
 TARGETS += src/arch/posix/driver/stdout.cc src/arch/posix/driver/uptime.cc