[ion][build] Relocate epsilon-bootloader

Author: EmilieNumworks

build/targets.device.n0110.bootloader.mak

@@ -8,4 +8,4 @@ bootloader_obj = $(call flavored_object_for,$(bootloader_src),leavebootloader)
 $(BUILD_DIR)/bootloader.$(EXE): $(bootloader_obj)
 
 $(BUILD_DIR)/bootloader.$(EXE): LDFLAGS += -Lion/src/$(PLATFORM)/shared -Lion/src/$(PLATFORM)/$(MODEL)/shared
-$(BUILD_DIR)/bootloader.$(EXE): LDSCRIPT = epsilon-bootloader/$(PLATFORM)/$(MODEL)/bootloader/bootloader_flash.ld
+$(BUILD_DIR)/bootloader.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/$(MODEL)/epsilon-bootloader/bootloader/bootloader_flash.ld

ion/src/device/Makefile

@@ -1,22 +1,22 @@
 ifeq ($(FIRMWARE_COMPONENT),bootloader)
-include epsilon-bootloader/device/$(MODEL)/Makefile
+include ion/src/$(PLATFORM)/$(MODEL)/epsilon-bootloader/$(FIRMWARE_COMPONENT)/Makefile
 else
--include ion/src/device/$(MODEL)/$(FIRMWARE_COMPONENT)/Makefile
+-include ion/src/$(PLATFORM)/$(MODEL)/$(FIRMWARE_COMPONENT)/Makefile
 endif
 
-include ion/src/device/$(MODEL)/shared/Makefile
+include ion/src/$(PLATFORM)/$(MODEL)/shared/Makefile
 
 # We need to work around a GCC bug (concerning versions < 5.1). It is valid in
 # C++11 to initialize a character array by providing a string litteral (e.g.
 # char test[4]= "ab"; is valid and should initialize test to 'a','b',0,0).
 # Older versions of GCC are not conformant so we resort to an initializer list.
 initializer_list = $(shell echo $(1) | sed  "s/\(.\)/'\1',/g")0
-$(call object_for,ion/src/device/kernel/drivers/kernel_header.cpp ion/src/device/userland/drivers/userland_header.cpp): SFLAGS += -DPATCH_LEVEL="$(call initializer_list,$(PATCH_LEVEL))" -DEPSILON_VERSION="$(call initializer_list,$(EPSILON_VERSION))"
+$(call object_for,ion/src/$(PLATFORM)/kernel/drivers/kernel_header.cpp ion/src/$(PLATFORM)/userland/drivers/userland_header.cpp): SFLAGS += -DPATCH_LEVEL="$(call initializer_list,$(PATCH_LEVEL))" -DEPSILON_VERSION="$(call initializer_list,$(EPSILON_VERSION))"
 
-ION_DEVICE_SFLAGS += -Iion/src/device/$(MODEL)/shared -Iion/src/device/$(MODEL) -Iion/src/device/shared -Iion/src/device #TODO EMILIE: remove */shared and specify shared in inclusions
+ION_DEVICE_SFLAGS += -Iion/src/$(PLATFORM)/$(MODEL)/shared -Iion/src/$(PLATFORM)/$(MODEL) -Iion/src/$(PLATFORM)/shared -Iion/src/$(PLATFORM) #TODO EMILIE: remove */shared and specify shared in inclusions
 
 IN_FACTORY ?= 0
 ION_DEVICE_SFLAGS += -DPCB_LATEST=$(PCB_LATEST) -DIN_FACTORY=$(IN_FACTORY)
 
-$(call object_for,$(ion_device_$(FIRMWARE_COMPONENT)_src)): SFLAGS += $(ION_DEVICE_SFLAGS)
+$(call object_for,$(ion_$(PLATFORM)_$(FIRMWARE_COMPONENT)_src)): SFLAGS += $(ION_DEVICE_SFLAGS)