From 4ad8b4a67fef6d2f150ed4e84cd413801d5b46f0 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Thu, 10 Sep 2015 10:08:11 +0200 Subject: [PATCH] Rename stm32f429 to device --- Makefile | 2 +- Makefile.stm32f429 => Makefile.device | 2 +- boot/device/Makefile | 1 + boot/{stm32f429 => device}/crt0.c | 0 boot/{stm32f429 => device}/flash.ld | 0 boot/{stm32f429 => device}/isr.c | 0 boot/{stm32f429 => device}/isr.h | 0 boot/stm32f429/Makefile | 1 - ion/platform/device/Makefile | 2 ++ ion/platform/{stm32f429 => device}/display.c | 0 ion/platform/{stm32f429 => device}/display.h | 0 ion/platform/{stm32f429 => device}/framebuffer.h | 0 ion/platform/{stm32f429 => device}/init.c | 0 ion/platform/{stm32f429 => device}/init_heap.c | 0 ion/platform/{stm32f429 => device}/init_heap.h | 0 ion/platform/{stm32f429 => device}/init_kbd.c | 0 ion/platform/{stm32f429 => device}/init_kbd.h | 0 ion/platform/{stm32f429 => device}/platform.c | 0 ion/platform/{stm32f429 => device}/platform.h | 0 ion/platform/{stm32f429 => device}/registers/gpio.h | 0 ion/platform/{stm32f429 => device}/registers/ltdc.h | 0 ion/platform/{stm32f429 => device}/registers/rcc.h | 0 ion/platform/{stm32f429 => device}/registers/registers.h | 0 ion/platform/{stm32f429 => device}/registers/spi.h | 0 ion/platform/stm32f429/Makefile | 2 -- 25 files changed, 5 insertions(+), 5 deletions(-) rename Makefile.stm32f429 => Makefile.device (92%) create mode 100644 boot/device/Makefile rename boot/{stm32f429 => device}/crt0.c (100%) rename boot/{stm32f429 => device}/flash.ld (100%) rename boot/{stm32f429 => device}/isr.c (100%) rename boot/{stm32f429 => device}/isr.h (100%) delete mode 100644 boot/stm32f429/Makefile create mode 100644 ion/platform/device/Makefile rename ion/platform/{stm32f429 => device}/display.c (100%) rename ion/platform/{stm32f429 => device}/display.h (100%) rename ion/platform/{stm32f429 => device}/framebuffer.h (100%) rename ion/platform/{stm32f429 => device}/init.c (100%) rename ion/platform/{stm32f429 => device}/init_heap.c (100%) rename ion/platform/{stm32f429 => device}/init_heap.h (100%) rename ion/platform/{stm32f429 => device}/init_kbd.c (100%) rename ion/platform/{stm32f429 => device}/init_kbd.h (100%) rename ion/platform/{stm32f429 => device}/platform.c (100%) rename ion/platform/{stm32f429 => device}/platform.h (100%) rename ion/platform/{stm32f429 => device}/registers/gpio.h (100%) rename ion/platform/{stm32f429 => device}/registers/ltdc.h (100%) rename ion/platform/{stm32f429 => device}/registers/rcc.h (100%) rename ion/platform/{stm32f429 => device}/registers/registers.h (100%) rename ion/platform/{stm32f429 => device}/registers/spi.h (100%) delete mode 100644 ion/platform/stm32f429/Makefile diff --git a/Makefile b/Makefile index e5d1c2bf5..a2a543427 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PLATFORM ?= stm32f429 +PLATFORM ?= device DEBUG ?= 1 include Makefile.$(PLATFORM) diff --git a/Makefile.stm32f429 b/Makefile.device similarity index 92% rename from Makefile.stm32f429 rename to Makefile.device index 95ab75327..35ab9a48c 100644 --- a/Makefile.stm32f429 +++ b/Makefile.device @@ -22,7 +22,7 @@ else endif SFLAGS += -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -LDFLAGS += -T boot/stm32f429/flash.ld +LDFLAGS += -T boot/device/flash.ld # Platform configuration USE_LIBA=1 diff --git a/boot/device/Makefile b/boot/device/Makefile new file mode 100644 index 000000000..35709922b --- /dev/null +++ b/boot/device/Makefile @@ -0,0 +1 @@ +objs += $(addprefix boot/device/, isr.o crt0.o) diff --git a/boot/stm32f429/crt0.c b/boot/device/crt0.c similarity index 100% rename from boot/stm32f429/crt0.c rename to boot/device/crt0.c diff --git a/boot/stm32f429/flash.ld b/boot/device/flash.ld similarity index 100% rename from boot/stm32f429/flash.ld rename to boot/device/flash.ld diff --git a/boot/stm32f429/isr.c b/boot/device/isr.c similarity index 100% rename from boot/stm32f429/isr.c rename to boot/device/isr.c diff --git a/boot/stm32f429/isr.h b/boot/device/isr.h similarity index 100% rename from boot/stm32f429/isr.h rename to boot/device/isr.h diff --git a/boot/stm32f429/Makefile b/boot/stm32f429/Makefile deleted file mode 100644 index 1daaf7035..000000000 --- a/boot/stm32f429/Makefile +++ /dev/null @@ -1 +0,0 @@ -objs += $(addprefix boot/stm32f429/, isr.o crt0.o) diff --git a/ion/platform/device/Makefile b/ion/platform/device/Makefile new file mode 100644 index 000000000..0556602c2 --- /dev/null +++ b/ion/platform/device/Makefile @@ -0,0 +1,2 @@ +objs += $(addprefix ion/platform/device/, platform.o init.o display.o init_kbd.o) +objs += $(addprefix ion/drivers/, ili9341/ili9341.o fx92kbd/fx92kbd.o) diff --git a/ion/platform/stm32f429/display.c b/ion/platform/device/display.c similarity index 100% rename from ion/platform/stm32f429/display.c rename to ion/platform/device/display.c diff --git a/ion/platform/stm32f429/display.h b/ion/platform/device/display.h similarity index 100% rename from ion/platform/stm32f429/display.h rename to ion/platform/device/display.h diff --git a/ion/platform/stm32f429/framebuffer.h b/ion/platform/device/framebuffer.h similarity index 100% rename from ion/platform/stm32f429/framebuffer.h rename to ion/platform/device/framebuffer.h diff --git a/ion/platform/stm32f429/init.c b/ion/platform/device/init.c similarity index 100% rename from ion/platform/stm32f429/init.c rename to ion/platform/device/init.c diff --git a/ion/platform/stm32f429/init_heap.c b/ion/platform/device/init_heap.c similarity index 100% rename from ion/platform/stm32f429/init_heap.c rename to ion/platform/device/init_heap.c diff --git a/ion/platform/stm32f429/init_heap.h b/ion/platform/device/init_heap.h similarity index 100% rename from ion/platform/stm32f429/init_heap.h rename to ion/platform/device/init_heap.h diff --git a/ion/platform/stm32f429/init_kbd.c b/ion/platform/device/init_kbd.c similarity index 100% rename from ion/platform/stm32f429/init_kbd.c rename to ion/platform/device/init_kbd.c diff --git a/ion/platform/stm32f429/init_kbd.h b/ion/platform/device/init_kbd.h similarity index 100% rename from ion/platform/stm32f429/init_kbd.h rename to ion/platform/device/init_kbd.h diff --git a/ion/platform/stm32f429/platform.c b/ion/platform/device/platform.c similarity index 100% rename from ion/platform/stm32f429/platform.c rename to ion/platform/device/platform.c diff --git a/ion/platform/stm32f429/platform.h b/ion/platform/device/platform.h similarity index 100% rename from ion/platform/stm32f429/platform.h rename to ion/platform/device/platform.h diff --git a/ion/platform/stm32f429/registers/gpio.h b/ion/platform/device/registers/gpio.h similarity index 100% rename from ion/platform/stm32f429/registers/gpio.h rename to ion/platform/device/registers/gpio.h diff --git a/ion/platform/stm32f429/registers/ltdc.h b/ion/platform/device/registers/ltdc.h similarity index 100% rename from ion/platform/stm32f429/registers/ltdc.h rename to ion/platform/device/registers/ltdc.h diff --git a/ion/platform/stm32f429/registers/rcc.h b/ion/platform/device/registers/rcc.h similarity index 100% rename from ion/platform/stm32f429/registers/rcc.h rename to ion/platform/device/registers/rcc.h diff --git a/ion/platform/stm32f429/registers/registers.h b/ion/platform/device/registers/registers.h similarity index 100% rename from ion/platform/stm32f429/registers/registers.h rename to ion/platform/device/registers/registers.h diff --git a/ion/platform/stm32f429/registers/spi.h b/ion/platform/device/registers/spi.h similarity index 100% rename from ion/platform/stm32f429/registers/spi.h rename to ion/platform/device/registers/spi.h diff --git a/ion/platform/stm32f429/Makefile b/ion/platform/stm32f429/Makefile deleted file mode 100644 index a3ba008e4..000000000 --- a/ion/platform/stm32f429/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -objs += $(addprefix ion/platform/stm32f429/, platform.o init.o display.o init_kbd.o) -objs += $(addprefix ion/drivers/, ili9341/ili9341.o fx92kbd/fx92kbd.o)