[ion] cleanup

Makefile

@@ -67,7 +67,6 @@ output_size: boot.elf
 	@echo "==============================="
 endif
 
-include boot/Makefile
 ifeq ($(USE_LIBA),0)
 LDFLAGS += -lc -lc++ -lcrt1.o
 else

Makefile.device

@@ -22,18 +22,5 @@ else
 endif
 SFLAGS += -mcpu=cortex-m4 -mfpu=fpv4-sp-d16
 
-LDFLAGS += -T boot/device/flash.ld
-
-ifeq ($(VERBOSE),1)
-  LDFLAGS += -M -Map output.map
-  products += output.map
-.PHONY: memory_map
-postbuild: memory_map
-memory_map:
-	@echo "========== MEMORY MAP ========="
-	@awk -f boot/device/memory_map.awk < output.map
-	@echo "==============================="
-endif
-
 # Platform configuration
 USE_LIBA=1

boot/Makefile

@@ -1,2 +0,0 @@
-objs += boot/boot.o
-include boot/$(PLATFORM)/Makefile

boot/README.txt

@@ -1,3 +0,0 @@
-Boot
-
-Code in boot is responsible for creating an executable that can be started on the PLATFORM.

boot/device/Makefile

@@ -1 +0,0 @@
-objs += $(addprefix boot/device/, isr.o crt0.o)

ion/Makefile

@@ -1,3 +1,3 @@
 SFLAGS += -Iion/include -DKD_CONFIG_H=1
-include ion/platform/$(PLATFORM)/Makefile
-objs += $(addprefix ion/src/, keyboard.o)
+include ion/src/shared/Makefile
+include ion/src/$(PLATFORM)/Makefile

ion/README.txt

@@ -1,3 +1,4 @@
 ION is the hardware abstraction layer. It does I/O.
 
-It exposes a set of headers that are implemented for various hardwares (device, simulator)
+It exposes a set of headers that are implemented for various hardwares (device, simulator).
+It is also responsible for setting up the boot environment.

ion/platform/device/Makefile

@@ -1,2 +0,0 @@
-objs += $(addprefix ion/platform/device/, platform.o init.o display.o framebuffer.o keyboard.o display/dma.o display/gpio.o display/spi.o)
-objs += $(addprefix ion/drivers/, st7586/st7586.o)

ion/src/device/Makefile

@@ -0,0 +1,3 @@
+include ion/src/device/boot/Makefile
+objs += $(addprefix ion/src/device/, platform.o init.o display.o framebuffer.o keyboard.o display/dma.o display/gpio.o display/spi.o)
+objs += $(addprefix ion/drivers/, st7586/st7586.o)

ion/src/device/boot/Makefile

@@ -0,0 +1,14 @@
+objs += $(addprefix ion/src/device/boot/, isr.o crt0.o)
+LDFLAGS += -T ion/src/device/boot/flash.ld
+
+ifeq ($(VERBOSE),1)
+  LDFLAGS += -M -Map output.map
+  products += output.map
+.PHONY: memory_map
+postbuild: memory_map
+memory_map:
+	@echo "========== MEMORY MAP ========="
+	@awk -f boot/device/memory_map.awk < output.map
+	@echo "==============================="
+endif
+

ion/src/device/boot/crt0.c

@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <string.h>
-#include <boot/boot.h>
+#include "../../shared/boot/boot.h"
 
 extern char _data_section_start_flash;
 extern char _data_section_start_ram;