Przeglądaj źródła

ChibiOS scripts updated to match latest changes in ChibiOS's master.

Konstantin Oblaukhov 10 lat temu
rodzic
commit
0a590479b0

+ 3 - 1
cmake/ChibiOS3.cmake

@@ -40,7 +40,9 @@ ELSE()
   INCLUDE(ChibiOS3_NIL)
   INCLUDE(ChibiOS3_NIL)
 ENDIF()
 ENDIF()
 
 
-SET(CHIBIOS_COMPONENTS nil rt hal ${CHIBIOS_HAL_MODULES})
+INCLUDE(ChibiOS3_Various)
+
+SET(CHIBIOS_COMPONENTS nil rt hal ${CHIBIOS_HAL_MODULES} ${CHIBIOS_HAL_LIB_MODULES} ${CHIBIOS_VARIOUS_MODULES})
 
 
 IF(NOT ChibiOS_LINKER_SCRIPT)
 IF(NOT ChibiOS_LINKER_SCRIPT)
     MESSAGE(STATUS "ChibiOS doesn't have linker script for your chip, please specify it directly using ChibiOS_LINKER_SCRIPT variable.")
     MESSAGE(STATUS "ChibiOS doesn't have linker script for your chip, please specify it directly using ChibiOS_LINKER_SCRIPT variable.")

+ 8 - 0
cmake/ChibiOS3_HAL.cmake

@@ -1,3 +1,4 @@
+SET(CHIBIOS_HAL_LIB_MODULES chprintf memstreams nullstreams)
 SET(CHIBIOS_HAL_MODULES adc can dac ext gpt i2c i2s icu mac mmc_spi mmcsd pal pwm rtc sdc serial serial_usb spi st uart usb)
 SET(CHIBIOS_HAL_MODULES adc can dac ext gpt i2c i2s icu mac mmc_spi mmcsd pal pwm rtc sdc serial serial_usb spi st uart usb)
 
 
 IF(${CHIBIOS_KERNEL} STREQUAL nil)
 IF(${CHIBIOS_KERNEL} STREQUAL nil)
@@ -20,6 +21,12 @@ FOREACH(module ${CHIBIOS_HAL_MODULES})
   ENDIF()
   ENDIF()
 ENDFOREACH()
 ENDFOREACH()
 
 
+FOREACH(module ${CHIBIOS_HAL_LIB_MODULES})
+  SET(CHIBIOS_${module}_SEARCH_PATH ${CHIBIOS_ROOT}/os/hal/lib/streams)
+  SET(CHIBIOS_${module}_SOURCES ${module}.c)
+  SET(CHIBIOS_${module}_SEARCH_HEADERS ${module}.h)
+ENDFOREACH()
+
 IF(STM32_FAMILY STREQUAL "F1")
 IF(STM32_FAMILY STREQUAL "F1")
     SET(CHIBIOS_HAL_PLATFORM_MODULES adc can ext gpt i2c i2s icu mac pal pwm rtc sdc serial spi st uart usb)
     SET(CHIBIOS_HAL_PLATFORM_MODULES adc can ext gpt i2c i2s icu mac pal pwm rtc sdc serial spi st uart usb)
     SET(CHIBIOS_HAL_PLATFORM_MODULES_PATHES 
     SET(CHIBIOS_HAL_PLATFORM_MODULES_PATHES 
@@ -84,6 +91,7 @@ ELSEIF(STM32_FAMILY STREQUAL "F4")
         ${CHIBIOS_ROOT}/os/hal/ports/common/ARMCMx
         ${CHIBIOS_ROOT}/os/hal/ports/common/ARMCMx
         ${CHIBIOS_ROOT}/os/hal/ports/STM32/STM32F4xx
         ${CHIBIOS_ROOT}/os/hal/ports/STM32/STM32F4xx
         ${CHIBIOS_ROOT}/os/hal/ports/STM32
         ${CHIBIOS_ROOT}/os/hal/ports/STM32
+        ${CHIBIOS_ROOT}/os/hal/ports/STM32/LLD/DMAv2
     )
     )
     SET(CHIBIOS_hal_PLATFORM_SEARCH_HEADERS
     SET(CHIBIOS_hal_PLATFORM_SEARCH_HEADERS
         hal_lld.h
         hal_lld.h

+ 1 - 0
cmake/ChibiOS3_LD.cmake

@@ -31,6 +31,7 @@ IF(NOT ChibiOS_LINKER_SCRIPT)
       "REGION_ALIAS(\"PROCESS_STACK_RAM\", ram0);\n"
       "REGION_ALIAS(\"PROCESS_STACK_RAM\", ram0);\n"
       "REGION_ALIAS(\"DATA_RAM\", ram0);\n"
       "REGION_ALIAS(\"DATA_RAM\", ram0);\n"
       "REGION_ALIAS(\"BSS_RAM\", ram0);\n"
       "REGION_ALIAS(\"BSS_RAM\", ram0);\n"
+      "REGION_ALIAS(\"HEAP_RAM\", ram0);\n"
       "INCLUDE rules.ld\n"      
       "INCLUDE rules.ld\n"      
     )
     )
     SET(ChibiOS_LINKER_SCRIPT ${CMAKE_BINARY_DIR}/chibios_link.ld.in)
     SET(ChibiOS_LINKER_SCRIPT ${CMAKE_BINARY_DIR}/chibios_link.ld.in)

+ 12 - 0
cmake/ChibiOS3_Various.cmake

@@ -0,0 +1,12 @@
+SET(CHIBIOS_VARIOUS_MODULES evtimer shell syscalls) 
+
+SET(CHIBIOS_evtimer_SEARCH_PATH ${CHIBIOS_ROOT}/os/various)
+SET(CHIBIOS_evtimer_SOURCES evtimer.c)
+SET(CHIBIOS_evtimer_SEARCH_HEADERS evtimer.h)
+
+SET(CHIBIOS_shell_SEARCH_PATH ${CHIBIOS_ROOT}/os/various)
+SET(CHIBIOS_shell_SOURCES shell.c)
+SET(CHIBIOS_shell_SEARCH_HEADERS shell.h)
+
+SET(CHIBIOS_syscalls_SEARCH_PATH ${CHIBIOS_ROOT}/os/various)
+SET(CHIBIOS_syscalls_SOURCES syscalls.c)