From f5be9f5ec391ee19a442c5db5f1ebb6660ce685d Mon Sep 17 00:00:00 2001 From: gkostka Date: Wed, 9 Dec 2015 21:23:31 +0100 Subject: [PATCH] Convert to linux line endings in multiple files --- CHANGELOG | 112 +++++++++++++-------------- blockdev/CMakeLists.txt | 24 +++--- toolchain/arm-sim.cmake | 18 ++--- toolchain/avrxmega7.cmake | 12 +-- toolchain/bf518.cmake | 12 +-- toolchain/common/arm-none-eabi.cmake | 44 +++++------ toolchain/common/avr-gcc.cmake | 42 +++++----- toolchain/common/bfin-elf.cmake | 42 +++++----- toolchain/cortex-m0.cmake | 16 ++-- toolchain/cortex-m3.cmake | 18 ++--- toolchain/cortex-m4.cmake | 16 ++-- 11 files changed, 178 insertions(+), 178 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 03ff97d..2b386e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,56 +1,56 @@ -lwext4-0.8.0 -============ -* improve ext4_dir_entry_next -* clang code format based on config file -* ChibiOS demo for some stm32 boards -* Improve includes in lwext4 dir -* Add some const keyword where should be used - - -lwext4-0.7.0 -============ -* features supported: flex_bg, uninit_bg, dir_nlink -* config file improvements, 3 basic build modes: - * feature set ext2 - small footprint (~20KB .text) - * feature set ext3 - htree directory indexing (~25KB .text) - * feature set ext4 - all supported features enabled (~30KB .text) -* IO timing stats in stm32f429_demo -* more advanced cases in test suite -* support for meta_bg feature (unstable) -* crc32c module for meta_csum feature (not supported yet) -* small demo application improvments (readability) - - -lwext4-0.6.0 -============ -* Fixed stm32429demo enumerating issues -* Comb sort for directory indexing -* Cmake toolchain files for msp430 - -lwext4-0.5.0 -============ -* Build system refactoring -* Pedantic warning check for lwext4 files -* New toolchain files for cortex-m0, avexmega7, arm-sim -* Merge bugfixes from HelenOS mainline -* OS locks setup function - -lwext4-0.4.0 -============ -* Client-server based automatic test suite - -lwext4-0.3.0 -============ -* STM32F429 demo - -lwext4-0.2.0 -============ -* Full extents support -* Doxygen comments -* Bug fixing -* Demo app improvments - - -lwext4-0.1.1 -============ -* First version of the lwext4 filesystem library. +lwext4-0.8.0 +============ +* improve ext4_dir_entry_next +* clang code format based on config file +* ChibiOS demo for some stm32 boards +* Improve includes in lwext4 dir +* Add some const keyword where should be used + + +lwext4-0.7.0 +============ +* features supported: flex_bg, uninit_bg, dir_nlink +* config file improvements, 3 basic build modes: + * feature set ext2 - small footprint (~20KB .text) + * feature set ext3 - htree directory indexing (~25KB .text) + * feature set ext4 - all supported features enabled (~30KB .text) +* IO timing stats in stm32f429_demo +* more advanced cases in test suite +* support for meta_bg feature (unstable) +* crc32c module for meta_csum feature (not supported yet) +* small demo application improvments (readability) + + +lwext4-0.6.0 +============ +* Fixed stm32429demo enumerating issues +* Comb sort for directory indexing +* Cmake toolchain files for msp430 + +lwext4-0.5.0 +============ +* Build system refactoring +* Pedantic warning check for lwext4 files +* New toolchain files for cortex-m0, avexmega7, arm-sim +* Merge bugfixes from HelenOS mainline +* OS locks setup function + +lwext4-0.4.0 +============ +* Client-server based automatic test suite + +lwext4-0.3.0 +============ +* STM32F429 demo + +lwext4-0.2.0 +============ +* Full extents support +* Doxygen comments +* Bug fixing +* Demo app improvments + + +lwext4-0.1.1 +============ +* First version of the lwext4 filesystem library. diff --git a/blockdev/CMakeLists.txt b/blockdev/CMakeLists.txt index 9f195af..1da4447 100644 --- a/blockdev/CMakeLists.txt +++ b/blockdev/CMakeLists.txt @@ -1,12 +1,12 @@ -#Blockdev library - -if (BLOCKDEV_TYPE STREQUAL linux) -aux_source_directory(linux BLOCKDEV_SRC) -elseif (BLOCKDEV_TYPE STREQUAL windows) -aux_source_directory(windows BLOCKDEV_SRC) -else() -endif() - -aux_source_directory(. BLOCKDEV_SRC) -add_library(blockdev ${BLOCKDEV_SRC}) - +#Blockdev library + +if (BLOCKDEV_TYPE STREQUAL linux) +aux_source_directory(linux BLOCKDEV_SRC) +elseif (BLOCKDEV_TYPE STREQUAL windows) +aux_source_directory(windows BLOCKDEV_SRC) +else() +endif() + +aux_source_directory(. BLOCKDEV_SRC) +add_library(blockdev ${BLOCKDEV_SRC}) + diff --git a/toolchain/arm-sim.cmake b/toolchain/arm-sim.cmake index 1c372f3..0b3c944 100644 --- a/toolchain/arm-sim.cmake +++ b/toolchain/arm-sim.cmake @@ -1,9 +1,9 @@ -# Name of the target -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR arm-sim) - -set(MCPU_FLAGS "") -set(VFP_FLAGS "") -set(LD_FLAGS "--specs=rdimon.specs -Wl,--start-group -lgcc -lc -lm -lrdimon -Wl,--end-group") - -include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) +# Name of the target +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR arm-sim) + +set(MCPU_FLAGS "") +set(VFP_FLAGS "") +set(LD_FLAGS "--specs=rdimon.specs -Wl,--start-group -lgcc -lc -lm -lrdimon -Wl,--end-group") + +include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) diff --git a/toolchain/avrxmega7.cmake b/toolchain/avrxmega7.cmake index e79a3c4..3ace0cc 100644 --- a/toolchain/avrxmega7.cmake +++ b/toolchain/avrxmega7.cmake @@ -1,7 +1,7 @@ -# Name of the target -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR avrxmega7) - -set(MCPU_FLAGS "-mmcu=avrxmega7") - +# Name of the target +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR avrxmega7) + +set(MCPU_FLAGS "-mmcu=avrxmega7") + include(${CMAKE_CURRENT_LIST_DIR}/common/avr-gcc.cmake) \ No newline at end of file diff --git a/toolchain/bf518.cmake b/toolchain/bf518.cmake index cc70862..53bdf93 100644 --- a/toolchain/bf518.cmake +++ b/toolchain/bf518.cmake @@ -1,7 +1,7 @@ -# Name of the target -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR bf518) - -set(MCPU_FLAGS "-mcpu=bf518") - +# Name of the target +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR bf518) + +set(MCPU_FLAGS "-mcpu=bf518") + include(${CMAKE_CURRENT_LIST_DIR}/common/bfin-elf.cmake) \ No newline at end of file diff --git a/toolchain/common/arm-none-eabi.cmake b/toolchain/common/arm-none-eabi.cmake index dd5b396..53af920 100644 --- a/toolchain/common/arm-none-eabi.cmake +++ b/toolchain/common/arm-none-eabi.cmake @@ -1,23 +1,23 @@ -# Toolchain settings -set(CMAKE_C_COMPILER arm-none-eabi-gcc) -set(CMAKE_CXX_COMPILER arm-none-eabi-g++) -set(AS arm-none-eabi-as) -set(AR arm-none-eabi-ar) -set(OBJCOPY arm-none-eabi-objcopy) -set(OBJDUMP arm-none-eabi-objdump) -set(SIZE arm-none-eabi-size) - -set(CMAKE_C_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -std=gnu11 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags") -set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags") -set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags") -set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} ${LD_FLAGS} -Wl,--gc-sections" CACHE INTERNAL "exe link flags") - - - -SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags") -SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags") - -SET(CMAKE_C_FLAGS_RELEASE "-O2 -g -ggdb3" CACHE INTERNAL "c release compiler flags") -SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -ggdb3" CACHE INTERNAL "cxx release compiler flags") +# Toolchain settings +set(CMAKE_C_COMPILER arm-none-eabi-gcc) +set(CMAKE_CXX_COMPILER arm-none-eabi-g++) +set(AS arm-none-eabi-as) +set(AR arm-none-eabi-ar) +set(OBJCOPY arm-none-eabi-objcopy) +set(OBJDUMP arm-none-eabi-objdump) +set(SIZE arm-none-eabi-size) + +set(CMAKE_C_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -std=gnu11 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags") +set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags") +set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags") +set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} ${LD_FLAGS} -Wl,--gc-sections" CACHE INTERNAL "exe link flags") + + + +SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags") +SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags") + +SET(CMAKE_C_FLAGS_RELEASE "-O2 -g -ggdb3" CACHE INTERNAL "c release compiler flags") +SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -ggdb3" CACHE INTERNAL "cxx release compiler flags") SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm release compiler flags") \ No newline at end of file diff --git a/toolchain/common/avr-gcc.cmake b/toolchain/common/avr-gcc.cmake index 41a92e7..523ce5e 100644 --- a/toolchain/common/avr-gcc.cmake +++ b/toolchain/common/avr-gcc.cmake @@ -1,22 +1,22 @@ -# Toolchain settings -set(CMAKE_C_COMPILER avr-gcc) -set(CMAKE_CXX_COMPILER avr-g++) -set(AS avr--gcc) -set(AR avr-ar) -set(OBJCOPY avr-objcopy) -set(OBJDUMP avr-objdump) -set(SIZE avr-size) - -set(CMAKE_C_FLAGS "${MCPU_FLAGS} -Wall -std=gnu11 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags") -set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} -Wall -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags") -set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags") -set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} -nostartfiles -Wl,--gc-sections" CACHE INTERNAL "exe link flags") - - -SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags") -SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags") - -SET(CMAKE_C_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "c release compiler flags") -SET(CMAKE_CXX_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "cxx release compiler flags") +# Toolchain settings +set(CMAKE_C_COMPILER avr-gcc) +set(CMAKE_CXX_COMPILER avr-g++) +set(AS avr--gcc) +set(AR avr-ar) +set(OBJCOPY avr-objcopy) +set(OBJDUMP avr-objdump) +set(SIZE avr-size) + +set(CMAKE_C_FLAGS "${MCPU_FLAGS} -Wall -std=gnu11 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags") +set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} -Wall -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags") +set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags") +set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} -nostartfiles -Wl,--gc-sections" CACHE INTERNAL "exe link flags") + + +SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags") +SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags") + +SET(CMAKE_C_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "c release compiler flags") +SET(CMAKE_CXX_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "cxx release compiler flags") SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm release compiler flags") \ No newline at end of file diff --git a/toolchain/common/bfin-elf.cmake b/toolchain/common/bfin-elf.cmake index 070b188..8b1bcf9 100644 --- a/toolchain/common/bfin-elf.cmake +++ b/toolchain/common/bfin-elf.cmake @@ -1,22 +1,22 @@ -# Toolchain settings -set(CMAKE_C_COMPILER bfin-elf-gcc) -set(CMAKE_CXX_COMPILER bfin-elf-g++) -set(AS bfin-elf--gcc) -set(AR bfin-elf-ar) -set(OBJCOPY bfin-elf-objcopy) -set(OBJDUMP bfin-elf-objdump) -set(SIZE bfin-elf-size) - -set(CMAKE_C_FLAGS "${MCPU_FLAGS} -Wall -std=gnu11 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags") -set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} -Wall -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags") -set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags") -set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} -nostartfiles -Wl,--gc-sections" CACHE INTERNAL "exe link flags") - - -SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags") -SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags") - -SET(CMAKE_C_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "c release compiler flags") -SET(CMAKE_CXX_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "cxx release compiler flags") +# Toolchain settings +set(CMAKE_C_COMPILER bfin-elf-gcc) +set(CMAKE_CXX_COMPILER bfin-elf-g++) +set(AS bfin-elf--gcc) +set(AR bfin-elf-ar) +set(OBJCOPY bfin-elf-objcopy) +set(OBJDUMP bfin-elf-objdump) +set(SIZE bfin-elf-size) + +set(CMAKE_C_FLAGS "${MCPU_FLAGS} -Wall -std=gnu11 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags") +set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} -Wall -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags") +set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags") +set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} -nostartfiles -Wl,--gc-sections" CACHE INTERNAL "exe link flags") + + +SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags") +SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags") + +SET(CMAKE_C_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "c release compiler flags") +SET(CMAKE_CXX_FLAGS_RELEASE "-Os -g -ggdb3" CACHE INTERNAL "cxx release compiler flags") SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm release compiler flags") \ No newline at end of file diff --git a/toolchain/cortex-m0.cmake b/toolchain/cortex-m0.cmake index ed702a0..0ad3d56 100644 --- a/toolchain/cortex-m0.cmake +++ b/toolchain/cortex-m0.cmake @@ -1,9 +1,9 @@ -# Name of the target -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR cortex-m0) - -set(MCPU_FLAGS "-mthumb -mcpu=cortex-m0") -set(VFP_FLAGS "") -set(LD_FLAGS "-nostartfiles") - +# Name of the target +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR cortex-m0) + +set(MCPU_FLAGS "-mthumb -mcpu=cortex-m0") +set(VFP_FLAGS "") +set(LD_FLAGS "-nostartfiles") + include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) \ No newline at end of file diff --git a/toolchain/cortex-m3.cmake b/toolchain/cortex-m3.cmake index 1376b5c..69c514d 100644 --- a/toolchain/cortex-m3.cmake +++ b/toolchain/cortex-m3.cmake @@ -1,9 +1,9 @@ -# Name of the target -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR cortex-m3) - -set(MCPU_FLAGS "-mthumb -mcpu=cortex-m3") -set(VFP_FLAGS "") -set(LD_FLAGS "-nostartfiles") - -include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) +# Name of the target +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR cortex-m3) + +set(MCPU_FLAGS "-mthumb -mcpu=cortex-m3") +set(VFP_FLAGS "") +set(LD_FLAGS "-nostartfiles") + +include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) diff --git a/toolchain/cortex-m4.cmake b/toolchain/cortex-m4.cmake index cc32aa6..fef16ed 100644 --- a/toolchain/cortex-m4.cmake +++ b/toolchain/cortex-m4.cmake @@ -1,9 +1,9 @@ -# Name of the target -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR cortex-m4) - -set(MCPU_FLAGS "-mthumb -mcpu=cortex-m4") -set(VFP_FLAGS "-mfloat-abi=hard -mfpu=fpv4-sp-d16") -set(LD_FLAGS "-nostartfiles") - +# Name of the target +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR cortex-m4) + +set(MCPU_FLAGS "-mthumb -mcpu=cortex-m4") +set(VFP_FLAGS "-mfloat-abi=hard -mfpu=fpv4-sp-d16") +set(LD_FLAGS "-nostartfiles") + include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) \ No newline at end of file -- 2.30.2