reorganizing a little

Author: ThomasPietrzak

FreeRTOS/Makefile

@@ -12,11 +12,11 @@ TARGET_SRCS = Source/croutine.c Source/list.c Source/queue.c Source/tasks.c Sour
 
 TARGET_SRCS += Source/portable/MemMang/heap_3.c
 
-ifeq ($(CPU),arm)
-ifeq ($(CPU_FAMILY),CM3)
+ifeq ($(CPU_FAMILY),arm)
+ifeq ($(CPU_SUBFAMILY),CM3)
 TARGET_SRCS += Source/portable/GCC/ARM_CM3/port.c
 endif
-ifeq ($(CPU_FAMILY),CM4F)
+ifeq ($(CPU_SUBFAMILY),CM4F)
 TARGET_SRCS += Source/portable/GCC/ARM_CM4F/port.c
 endif
 endif

FreeRTOS/config.mk

@@ -1,18 +1,18 @@
 TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/include
 
-TARGET_INCLUDES += $(ROOTDIR)/config/$(CPU)/$(CPU_FLAVOR)
+TARGET_INCLUDES += $(ROOTDIR)/config/$(CPU_FAMILY)/$(CPU_FLAVOR)
 
-ifeq ($(CPU),arm)
-ifeq ($(CPU_FAMILY),CM3)
+ifeq ($(CPU_FAMILY),arm)
+ifeq ($(CPU_SUBFAMILY),CM3)
 TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3
 endif
-ifeq ($(CPU_FAMILY),CM4F)
+ifeq ($(CPU_SUBFAMILY),CM4F)
 TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM4F
 endif
 endif
 
-ifeq ($(CPU),mips)
-ifeq ($(CPU_FLAVOR),mips4)
+ifeq ($(CPU_FAMILY),mips)
+ifeq ($(CPU_SUBFAMILY),mips4)
 TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/portable/MPLAB/PIC32MX
 endif
 endif

arch/Makefile

@@ -9,43 +9,43 @@ include $(ROOTDIR)/os/config.mk
 include $(ROOTDIR)/libc/config.mk
 include $(ROOTDIR)/hardware/config.mk
 
-ifeq ($(CPU),arm)
+ifeq ($(CPU_FAMILY),arm)
 
-ifeq ($(CPU_FAMILY),CM3)
-TARGET_SRCS += arm/src/CM3/angel.s
-TARGET_SRCS += arm/src/CM3/CoreSupport/core_cm3.c
-TARGET_SRCS += arm/src/CM3/setjmp.s arm/src/CM3/startup.s
-TARGET_SRCS += arm/src/CM3/handlers.c
+ifeq ($(CPU_SUBFAMILY),CM3)
+TARGET_SRCS += arm/Core/CM3/angel.s
+TARGET_SRCS += arm/Core/CM3/CoreSupport/core_cm3.c
+TARGET_SRCS += arm/Core/CM3/setjmp.s arm/Core/CM3/startup.s
+TARGET_SRCS += arm/Core/CM3/handlers.c
 endif
 
-ifeq ($(CPU_FAMILY),CM4F)
-TARGET_SRCS += arm/src/CM4F/angel.s
-#TARGET_SRCS += arm/src/CM4F/CoreSupport/core_cm4.c
-TARGET_SRCS += arm/src/CM4F/startup.s
-TARGET_SRCS += arm/src/CM4F/handlers.c
+ifeq ($(CPU_SUBFAMILY),CM4F)
+TARGET_SRCS += arm/Core/CM4F/angel.s
+#TARGET_SRCS += arm/Core/CM4F/CoreSupport/core_cm4.c
+TARGET_SRCS += arm/Core/CM4F/startup.s
+TARGET_SRCS += arm/Core/CM4F/handlers.c
 endif
 
 ifeq ($(CPU_FLAVOR),lpc17xx)
-TARGET_SRCS += arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.c
+TARGET_SRCS += arm/Core/CM3/DeviceSupport/NXP/lpc17xx/system_LPC17xx.c
 TARGET_SRCS += $(addprefix arm/lpc17xx/Drivers/source/lpc17xx_, spi.c rit.c exti.c wdt.c uart.c dac.c rtc.c i2s.c pwm.c mcpwm.c pinsel.c nvic.c emac.c systick.c ssp.c can.c gpio.c libcfg_default.c i2c.c timer.c gpdma.c clkpwr.c qei.c adc.c)
 TARGET_SRCS += arm/lpc17xx/init.c arm/lpc17xx/Drivers/source/debug_frmwrk.c
 TARGET_SRCS += arm/lpc17xx/registry.c
 endif
 
-ifeq ($(BOARD),mbed)
-TARGET_SRCS += arm/lpc17xx/mbed/BoardConsole.c arm/lpc17xx/mbed/BoardInit.c
+ifeq ($(BOARD),mbedlpc1768)
+TARGET_SRCS += arm/lpc17xx/mbedlpc1768/BoardConsole.c arm/lpc17xx/mbedlpc1768/BoardInit.c
 endif
 
-ifeq ($(CPU_FLAVOR),stm32f10)
-TARGET_SRCS += arm/stm32f10x/Core/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
+ifeq ($(CPU_FLAVOR),stm32f10x)
+TARGET_SRCS += arm/Core/CM3/DeviceSupport/ST/stm32f10x/system_stm32f10x.c
 TARGET_SRCS += $(addprefix arm/stm32f10x/Drivers/source/stm32f10x_, adc.c bkp.c can.c cec.c crc.c dac.c dbgmcu.c dma.c exti.c flash.c fsmc.c gpio.c i2c.c iwdg.c pwr.c rcc.c rtc.c sdio.c spi.c tim.c usart.c wwdg.c)
 TARGET_SRCS += arm/stm32f10x/Drivers/source/misc.c
 TARGET_SRCS += arm/stm32f10x/init.c
 TARGET_SRCS += arm/stm32f10x/registry.c
 endif
 
-ifeq ($(CPU_FLAVOR),stm32f4)
-TARGET_SRCS += arm/stm32f4xx/Core/CM4F/DeviceSupport/ST/STM32F4xx/system_stm32f4xx.c
+ifeq ($(CPU_FLAVOR),stm32f4xx)
+TARGET_SRCS += arm/Core/CM4F/DeviceSupport/ST/stm32f4xx/system_stm32f4xx.c
 TARGET_SRCS += $(addprefix arm/stm32f4xx/Drivers/source/stm32f4xx_, adc.c can.c crc.c cryp_aes.c cryp_des.c cryp_tdes.c cryp.c dac.c dbgmcu.c dcmi.c dma.c dma2d.c exti.c flash.c gpio.c hash_md5.c hash_sha1.c hash.c i2c.c iwdg.c ltdc.c pwr.c rcc.c rng.c rtc.c sai.c sdio.c spi.c syscfg.c tim.c usart.c wwdg.c)
 #STM32F427_437xx, STM32F429_439xx: fmc.c 
 #STM32F40_41xxx: fsmc.c
@@ -54,18 +54,18 @@ TARGET_SRCS += arm/stm32f4xx/init.c
 TARGET_SRCS += arm/stm32f4xx/registry.c
 endif
 
-ifeq ($(BOARD),inemo)
-TARGET_SRCS += arm/stm32f10x/inemo/BoardConsole.c arm/stm32f10x/inemo/BoardInit.c
+ifeq ($(BOARD),inemom1)
+TARGET_SRCS += arm/stm32f10x/inemom1/BoardConsole.c arm/stm32f10x/inemom1/BoardInit.c
 endif
 
 ifeq ($(BOARD),stm32f4discovery)
 TARGET_SRCS += $(addprefix arm/stm32f4xx/Drivers/source/stm32f4xx_, fsmc.c)
 TARGET_SRCS += arm/stm32f4xx/stm32f4discovery/BoardConsole.c arm/stm32f4xx/stm32f4discovery/BoardInit.c
 endif
 
-ifeq ($(BOARD),stm32f4discovery2)
+ifeq ($(BOARD),stm32f429discovery)
 TARGET_SRCS += $(addprefix arm/stm32f4xx/Drivers/source/stm32f4xx_, fmc.c)
-TARGET_SRCS += arm/stm32f4xx/stm32f4discovery2/BoardConsole.c arm/stm32f4xx/stm32f4discovery2/BoardInit.c
+TARGET_SRCS += arm/stm32f4xx/stm32f429discovery/BoardConsole.c arm/stm32f4xx/stm32f429discovery/BoardInit.c
 endif
 endif
 

arch/arm/src/CM3/CoreSupport/core_cm3.c renamed to arch/arm/Core/CM3/CoreSupport/core_cm3.c

@@ -1,39 +1,39 @@
-ifeq ($(CPU),arm)
+ifeq ($(CPU_FAMILY),arm)
 TARGET_INCLUDES += $(ROOTDIR)/arch/arm/include
 
+ifeq ($(CPU_SUBFAMILY),CM3)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/Core/CM3/CoreSupport
+SPECS = $(ROOTDIR)/arch/arm/src/specs
+endif
+
+ifeq ($(CPU_SUBFAMILY),CM4F)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/Core/CM4F/CoreSupport
+SPECS = $(ROOTDIR)/arch/arm/src/specs
+endif
+
 ifeq ($(CPU_FLAVOR),lpc17xx)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx $(ROOTDIR)/arch/arm/lpc17xx/Drivers/include
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/Core/CM3/DeviceSupport/NXP/LPC17xx $(ROOTDIR)/arch/arm/lpc17xx/Drivers/include
 LDSCRIPT = $(ROOTDIR)/arch/arm/lpc17xx/ldscript
 TARGET_CPPFLAGS += -DTARGET_LITTLE_ENDIAN
 endif
 
-ifeq ($(CPU_FLAVOR),stm32f10)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/stm32f10x/Core/CM3/DeviceSupport/ST/STM32F10x $(ROOTDIR)/arch/arm/stm32f10x/Drivers/include
+ifeq ($(CPU_FLAVOR),stm32f10x)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/Core/CM3/DeviceSupport/ST/stm32f10x $(ROOTDIR)/arch/arm/stm32f10x/Drivers/include
 LDSCRIPT = $(ROOTDIR)/arch/arm/stm32f10x/ldscript
 TARGET_CPPFLAGS += -DTARGET_LITTLE_ENDIAN
 endif
 
-ifeq ($(CPU_FLAVOR),stm32f4)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/stm32f4xx/Core/CM4F/DeviceSupport/ST/STM32F4xx $(ROOTDIR)/arch/arm/stm32f4xx/Drivers/include
+ifeq ($(CPU_FLAVOR),stm32f4xx)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/Core/CM4F/DeviceSupport/ST/STM32F4xx $(ROOTDIR)/arch/arm/stm32f4xx/Drivers/include
 TARGET_CPPFLAGS += -DTARGET_LITTLE_ENDIAN
 endif
 
-ifeq ($(CPU_FAMILY),CM3)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/src/CM3/CoreSupport
-SPECS = $(ROOTDIR)/arch/arm/src/specs
+ifeq ($(BOARD),mbedlpc1768)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/lpc17xx/mbedlpc1768
 endif
 
-ifeq ($(CPU_FAMILY),CM4F)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/src/CM4F/CoreSupport
-SPECS = $(ROOTDIR)/arch/arm/src/specs
-endif
-
-ifeq ($(BOARD),mbed)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/lpc17xx/mbed
-endif
-
-ifeq ($(BOARD),inemo)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/stm32f10x/inemo
+ifeq ($(BOARD),inemom1)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/stm32f10x/inemom1
 endif
 
 ifeq ($(BOARD),stm32f4discovery)
@@ -43,18 +43,18 @@ TARGET_CPPFLAGS += -DPLL_M=8
 LDSCRIPT = $(ROOTDIR)/arch/arm/stm32f4xx/stm32f40x.ld
 endif
 
-ifeq ($(BOARD),stm32f4discovery2)
-TARGET_INCLUDES += $(ROOTDIR)/arch/arm/stm32f4xx/stm32f4discovery2
+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/stm32f40x.ld
+LDSCRIPT = $(ROOTDIR)/arch/arm/stm32f4xx/stm32f429.ld
 endif
 
 endif
 
-ifeq ($(CPU),mips)
+ifeq ($(CPU_FAMILY),mips)
 TARGET_INCLUDES += $(ROOTDIR)/arch/mips/include
-ifeq ($(CPU_FLAVOR),mips4)
+ifeq ($(CPU_SUBFAMILY),mips4)
 TARGET_INCLUDES += $(ROOTDIR)/arch/mips/mips4
 LDSCRIPT = $(ROOTDIR)/arch/mips/mips4/ldscript
 SPECS = $(ROOTDIR)/arch/mips/mips4/specs

arch/arm/src/CM3/CoreSupport/core_cm3.h renamed to arch/arm/Core/CM3/CoreSupport/core_cm3.h

@@ -0,0 +1,20 @@
+#pragma once
+
+//#define assert_param(x) ((void)0)
+
+#ifdef  USE_FULL_ASSERT
+
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr: If expr is false, it calls assert_failed function
+  *   which reports the name of the source file and the source
+  *   line number of the call that failed. 
+  *   If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0)
+#endif /* USE_FULL_ASSERT */

arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx/LPC17xx.h renamed to arch/arm/Core/CM3/DeviceSupport/NXP/lpc17xx/LPC17xx.h

@@ -1,45 +1,49 @@
-ifeq ($(BOARD),mbed)
-CPU = arm
+ifeq ($(BOARD),mbedlpc1768)
+CPU_FAMILY = arm
+CPU_SUBFAMILY = CM3
 CPU_FLAVOR = lpc17xx
-CPU_FAMILY = CM3
+CPU = lpc1768
 
 TARGET_CPPFLAGS += -DHAS_ETHERNET -DHAS_SEMIFS -DBOARD_MBED
 endif
 
-ifeq ($(BOARD),inemo)
-CPU = arm
-CPU_FLAVOR = stm32f10
-CPU_FAMILY = CM3
+ifeq ($(BOARD),inemom1)
+CPU_FAMILY = arm
+CPU_SUBFAMILY = CM3
+CPU_FLAVOR = stm32f10x
+CPU = stm32f103
 endif
 
 ifeq ($(BOARD),pic32)
-CPU = mips
-CPU_FLAVOR = mips4
+CPU_FAMILY = mips
+CPU_SUBFAMILY = mips4
 endif
 
 ifeq ($(BOARD),stm32f4discovery)
-CPU = arm
-CPU_FLAVOR = stm32f4
-CPU_FAMILY = CM4F
+CPU_FAMILY = arm
+CPU_SUBFAMILY = CM4F
+CPU_FLAVOR = stm32f4xx
+CPU = stm32f407
 
 TARGET_CPPFLAGS += -DBOARD_DISCOVERY_F4
 #TARGET_CPPFLAGS += -DSystemCoreClock=168000000
 endif
 
-ifeq ($(BOARD),stm32f4discovery2)
-CPU = arm
-CPU_FLAVOR = stm32f4
-CPU_FAMILY = CM4F
+ifeq ($(BOARD),stm32f429discovery)
+CPU_FAMILY = arm
+CPU_SUBFAMILY = CM4F
+CPU_FLAVOR = stm32f4xx
+CPU = stm32f429
 
-TARGET_CPPFLAGS += -DBOARD_DISCOVERY_F4
+TARGET_CPPFLAGS += -DBOARD_DISCOVERY_F429
 #TARGET_CPPFLAGS += -DSystemCoreClock=168000000
 endif
 
-ifeq ($(CPU),)
+ifeq ($(CPU_FAMILY),)
 $(info You probably want to compile one of the examples - you can't compile uC-sdk as-it.)
 $(info For example, make -C examples/stm32f4discovery/skel)
 $(error You need at least a CPU definition.)
 endif
 
 
-TARGET_CPPFLAGS += -DPORT_CPU=$(CPU) -DPORT_CPU_FLAVOR=$(CPU_FLAVOR) -DPORT_CPU_FAMILY=$(CPU_FAMILY)
+TARGET_CPPFLAGS += -DPORT_CPU=$(CPU) -DPORT_CPU_FAMILY=$(CPU_FAMILY) -DPORT_CPU_FAMILY_SUBFAMILY=$(CPU_SUBFAMILY) -DPORT_CPU_FLAVOR=$(CPU_FLAVOR)

arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.c renamed to arch/arm/Core/CM3/DeviceSupport/NXP/lpc17xx/system_LPC17xx.c

@@ -1,37 +1,37 @@
-ifeq ($(CPU),arm)
+ifeq ($(CPU_FAMILY),arm)
 TOOLCHAIN = arm-none-eabi
 TARGET_FORMAT = elf32-littlearm
-ifeq ($(CPU_FAMILY),CM3)
+ifeq ($(CPU_SUBFAMILY),CM3)
 TARGET_CPPFLAGS += -mcpu=cortex-m3 -mtune=cortex-m3 -D__thumb2__=1 -march=armv7-m -mfix-cortex-m3-ldrd -mthumb -msoft-float
 TARGET_LDFLAGS += -mcpu=cortex-m3 -mtune=cortex-m3 -march=armv7-m -mthumb
 endif
-ifeq ($(CPU_FAMILY),CM4F)
+ifeq ($(CPU_SUBFAMILY),CM4F)
 TARGET_CPPFLAGS += -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fno-math-errno -mtune=cortex-m4 -D__thumb2__=1 -march=armv7e-m -mthumb
 TARGET_LDFLAGS += -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fno-math-errno -mtune=cortex-m4 -march=armv7e-m -mthumb
 endif
-ifeq ($(CPU_FLAVOR),stm32f10)
+ifeq ($(CPU_FLAVOR),stm32f10x)
 TARGET_CPPFLAGS += -DUSE_STDPERIPH_DRIVER
 endif
-ifeq ($(CPU_FLAVOR),stm32f4)
+ifeq ($(CPU_FLAVOR),stm32f4xx)
 TARGET_CPPFLAGS += -DUSE_STDPERIPH_DRIVER
 endif
-ifeq ($(BOARD),inemo)
+ifeq ($(CPU),stm32f103)
 TARGET_CPPFLAGS += -DSTM32F10X_HD
 endif
-ifeq ($(BOARD),stm32f4discovery)
+ifeq ($(CPU),stm32f407)
 TARGET_CPPFLAGS += -DSTM32F40_41xxx
 endif
-ifeq ($(BOARD),stm32f4discovery2)
+ifeq ($(CPU),stm32f429)
 TARGET_CPPFLAGS += -DSTM32F429_439xx
 endif
 TARGET_CPPFLAGS += -Os -mapcs-frame -mno-sched-prolog -fno-hosted -ffunction-sections -fdata-sections -fshort-wchar -D__LITTLE_ENDIAN
 TARGET_LDFLAGS += -Wl,--no-wchar-size-warning
 endif
 
-ifeq ($(CPU),mips)
+ifeq ($(CPU_FAMILY),mips)
 TOOLCHAIN = mipsel-elf
 TARGET_FORMAT = elf32-littlemips
-ifeq ($(CPU_FLAVOR),mips4)
+ifeq ($(CPU_SUBFAMILY),mips4)
 TARGET_CPPFLAGS += 
 endif
 TARGET_CPPFLAGS += -Os -msoft-float -fno-hosted -ffunction-sections -fdata-sections -fshort-wchar -D__LITTLE_ENDIAN
@@ -45,7 +45,7 @@ TARGET_AR = $(TOOLCHAIN)-ar
 TARGET_AS = $(TOOLCHAIN)-gcc
 TARGET_OBJCOPY = $(TOOLCHAIN)-objcopy
 
-TARGET_OBJCOPY_BIN = $(TARGET_OBJCOPY) -I binary -O $(TARGET_FORMAT) --binary-architecture $(CPU)
+TARGET_OBJCOPY_BIN = $(TARGET_OBJCOPY) -I binary -O $(TARGET_FORMAT) --binary-architecture $(CPU_FAMILY)
 
 
 HOST_CC = gcc

arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.h renamed to arch/arm/Core/CM3/DeviceSupport/NXP/lpc17xx/system_LPC17xx.h

@@ -11,15 +11,15 @@ include $(ROOTDIR)/libc/config.mk
 TARGET_SRCS = \
 src/sdcard.c \
 
-ifeq ($(CPU_FAMILY),CM3)
+ifeq ($(CPU_SUBFAMILY),CM3)
 ifeq ($(CPU_FLAVOR),lpc17xx)
 TARGET_SRCS += src/gpio-lpc17xx.c
 TARGET_SRCS += src/ssp-lpc17xx.c
 endif
 endif
 
-ifeq ($(CPU_FAMILY),CM4F)
-ifeq ($(CPU_FLAVOR),stm32f4)
+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

arch/arm/stm32f10x/Core/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h renamed to arch/arm/Core/CM3/DeviceSupport/ST/stm32f10x/stm32f10x.h

@@ -30,7 +30,7 @@
 #include <decl.h>
 
 BEGIN_DECL
-#if PORT_CPU == arm && PORT_CPU_FAMILY == CM4F
+#if PORT_CPU_FAMILY == arm && PORT_CPU_SUBFAMILY == CM4F
 #define SOFTFLOAT_SQRTF
 static inline float sqrtf(float x) {
     float r;