reorganize hardware + create chips

Author: ThomasPietrzak

.gitignore

@@ -7,3 +7,4 @@
 tools/mkromfs
 *~
 .DS_Store
+*.pdf

Makefile

@@ -14,8 +14,9 @@ clean: clean-generic
 	$(Q)$(MAKE) $(MAKE_OPTS) -C acorn clean
 	$(Q)$(MAKE) $(MAKE_OPTS) -C lwip clean
 	$(Q)$(MAKE) $(MAKE_OPTS) -C tools clean
+	$(Q)$(MAKE) $(MAKE_OPTS) -C chips clean
 
-.PHONY: libs FreeRTOS arch hardware os libc libm acorn lwip tools deps
+.PHONY: libs FreeRTOS arch chips hardware os libc libm acorn lwip tools deps
 
 FreeRTOS/libFreeRTOS.a: FreeRTOS
 arch/libarch.a: arch
@@ -25,6 +26,7 @@ libc/libc.a: libc
 libm/libm.a: libm
 acorn/libacorn.a: acorn
 lwip/liblwip.a: lwip
+chips/libchips.a: chips
 
 libs: FreeRTOS arch hardware os libc libm acorn lwip
 
@@ -60,6 +62,10 @@ lwip:
 	$(E) "[MAKE]   Entering lwip"
 	$(Q)$(MAKE) $(MAKE_OPTS) -C lwip
 
+chips:
+	$(E) "[MAKE]   Entering chips"
+	$(Q)$(MAKE) $(MAKE_OPTS) -C chips
+
 tools:
 	$(E) "[MAKE]   Entering tools"
 	$(Q)$(MAKE) $(MAKE_OPTS) -C tools
@@ -81,6 +87,8 @@ deps: ldeps
 	$(Q)$(MAKE) $(MAKE_OPTS) -C acorn ldeps
 	$(E) "[DEPS]   Creating dependency tree for lwip"
 	$(Q)$(MAKE) $(MAKE_OPTS) -C lwip ldeps
+	$(E) "[DEPS]   Creating dependency tree for chips"
+	$(Q)$(MAKE) $(MAKE_OPTS) -C chips ldeps
 
 include arch/config.mk
 include FreeRTOS/config.mk
@@ -90,4 +98,5 @@ include libc/config.mk
 include libm/config.mk
 include lwip/config.mk
 include acorn/config.mk
+include chips/config.mk
 include target-rules.mk

arch/config.mk

@@ -47,7 +47,7 @@ ifeq ($(BOARD),stm32f429discovery)
 TARGET_INCLUDES += $(ROOTDIR)/arch/arm/stm32f4xx/stm32f429discovery
 TARGET_CPPFLAGS += -DHSE_VALUE=8000000
 TARGET_CPPFLAGS += -DPLL_M=8
-LDSCRIPT = $(ROOTDIR)/arch/arm/stm32f4xx/stm32f429.ld
+LDSCRIPT = $(ROOTDIR)/arch/arm/stm32f4xx/stm32f40x.ld
 endif
 
 endif

chips/Makefile

@@ -0,0 +1,17 @@
+TARGET_LIB = libchips.a
+
+all: $(TARGET_LIB)
+
+include $(ROOTDIR)/common.mk
+include $(ROOTDIR)/arch/config.mk
+include config.mk
+include $(ROOTDIR)/FreeRTOS/config.mk
+include $(ROOTDIR)/libc/config.mk
+include $(ROOTDIR)/hardware/config.mk
+
+TARGET_SRCS = \
+src/sdcard.c \
+
+include $(ROOTDIR)/target-rules.mk
+
+clean: clean-generic

chips/config.mk

@@ -0,0 +1 @@
+TARGET_INCLUDES += $(ROOTDIR)/chips/include

hardware/include/sdcard.h renamed to chips/include/sdcard.h

@@ -8,25 +8,26 @@ include config.mk
 include $(ROOTDIR)/FreeRTOS/config.mk
 include $(ROOTDIR)/libc/config.mk
 
-TARGET_SRCS = \
-src/sdcard.c \
-
 ifeq ($(CPU_SUBFAMILY),CM3)
 ifeq ($(CPU_FLAVOR),lpc17xx)
-TARGET_SRCS += src/gpio-lpc17xx.c
-TARGET_SRCS += src/ssp-lpc17xx.c
+TARGET_SRCS += src/lpc17xx/gpio.c
+TARGET_SRCS += src/lpc17xx/ssp.c
+endif
+
+ifeq ($(CPU_FLAVOR),stm32f10x)
+TARGET_SRCS += src/stm32f10x/i2c.c
+TARGET_SRCS += src/stm32f10x/uart.c
 endif
 endif
 
 ifeq ($(CPU_SUBFAMILY),CM4F)
 ifeq ($(CPU_FLAVOR),stm32f4xx)
-TARGET_SRCS += src/adc-stm32f4xx.c
-TARGET_SRCS += src/gpio-stm32f4xx.c
-TARGET_SRCS += src/i2c-stm32f4xx.c
-TARGET_SRCS += src/timer-stm32f4xx.c
-TARGET_SRCS += src/spi-stm32f4xx.c
-TARGET_SRCS += src/ssp-stm32f4xx.c
-TARGET_SRCS += src/uart-stm32f4xx.c
+TARGET_SRCS += src/stm32f4xx/adc.c
+TARGET_SRCS += src/stm32f4xx/gpio.c
+TARGET_SRCS += src/stm32f4xx/i2c.c
+TARGET_SRCS += src/stm32f4xx/ssp.c
+TARGET_SRCS += src/stm32f4xx/timer.c
+TARGET_SRCS += src/stm32f4xx/uart.c
 endif
 endif
 

hardware/src/sdcard.c renamed to chips/src/sdcard.c

@@ -1 +1,8 @@
 TARGET_INCLUDES += $(ROOTDIR)/hardware/include
+
+
+ifeq ($(CPU_SUBFAMILY),CM4F)
+ifeq ($(CPU_FLAVOR),stm32f4xx)
+TARGET_INCLUDES += $(ROOTDIR)/hardware/src/stm32f4xx
+endif
+endif

hardware/Makefile

@@ -1,6 +1,6 @@
 #include <stm32f4xx.h>
 #include <stm32f4xx_gpio.h>
-#include "stm32f4xx-hardware.h"
+#include "hardware.h"
 
 #include <gpio.h>
 

hardware/config.mk

@@ -1,5 +1,5 @@
 #include "ssp.h"
-#include "stm32f4xx-hardware.h"
+#include "hardware.h"
 
 #include <stm32f4xx.h>
 #include <stm32f4xx_gpio.h>