X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2FCMakeLists.txt;h=8647a759d3e17a89d5883420a75c1c3b4ace1c30;hp=fe6857263a68d30f6a6ad10fb0d781e534a4c33f;hb=6598140e430d622be926aed43ec19fec8326cd11;hpb=11c1064a307a661df20e237e3623e1b5d88641fa

diff --git a/carlfw/CMakeLists.txt b/carlfw/CMakeLists.txt
index fe68572..8647a75 100644
--- a/carlfw/CMakeLists.txt
+++ b/carlfw/CMakeLists.txt
@@ -7,7 +7,7 @@ include("../config.cmake")
 
 set(CARL9170_FW_ELF carl9170.elf)
 set(CARLFW_CFLAGS_WARNING "-W -Wall -Wextra -Wunreachable-code -Winline -Wlogical-op -Wno-packed-bitfield-compat -Winit-self -Wshadow -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wformat=2 -Wcast-align -Wmissing-format-attribute -Wmissing-prototypes -Wtype-limits -Wmissing-declarations -Wmissing-noreturn -Wredundant-decls -Wnested-externs -Wdisabled-optimization -Wpointer-arith -Wvolatile-register-var -Waddress -Wbad-function-cast -Wunsafe-loop-optimizations")
-set(CARLFW_CFLAGS_EXTRA "-mbitops -std=gnu99 -ffunction-sections -Wframe-larger-than=128 -Werror")
+set(CARLFW_CFLAGS_EXTRA "-mbitops -ffunction-sections -Wframe-larger-than=128 -Werror")
 set(CARLFW_CFLAGS_DEF "-D__CARL9170FW__")
 if (CONFIG_CARL9170FW_AGGRESSIVE_CFLAGS)
 	set(CARLFW_CFLAGS_AGGRESSIVE "-fomit-frame-pointer -fsee -frename-registers -ftree-vectorize -flto -fstrict-volatile-bitfields -fmodulo-sched -fwhole-program")
@@ -21,12 +21,12 @@ set(carl9170_main_src src/main.c src/wlan.c src/wlanrx.c src/wlantx.c
 		      src/uart.c src/dma.c src/hostif.c src/reboot.S
 		      src/printf.c src/rf.c src/cam.c src/wol.c)
 
-set(carl9170_lib_src src/ashlsi3.S src/memcpy.S src/memset.S src/udivsi3_i4i-Os.S)
+set(carl9170_lib_src src/memcpy.S src/memset.S src/udivsi3_i4i-Os.S)
 set(carl9170_usb_src usb/main.c usb/usb.c usb/fifo.c)
 
 set(carl9170_src ${carl9170_main_src} ${carl9170_lib_src} ${carl9170_usb_src})
 
-set_source_files_properties(src/ashlsi3.S PROPERTIES LANGUAGE C)
+#set_source_files_properties(src/ashlsi3.S PROPERTIES LANGUAGE C)
 set_source_files_properties(src/memcpy.S PROPERTIES LANGUAGE C)
 set_source_files_properties(src/memset.S PROPERTIES LANGUAGE C)
 set_source_files_properties(src/reboot.S PROPERTIES LANGUAGE C)
@@ -42,21 +42,21 @@ set_target_properties(carl9170.elf PROPERTIES LINK_FLAGS "${CARLFW_CFLAGS} -Wl,-
 add_custom_target(firmware ALL)
 
 add_custom_command(
-	SOURCE carl9170.elf
+	DEPENDS carl9170.elf
 	COMMAND ${OBJCOPY}
 	ARGS --strip-unneeded -O binary -R .sram -R .eeprom -R .fwdsc carl9170.elf carl9170.bin
 	TARGET firmware
 	OUTPUTS carl9170.bin)
 
 add_custom_command(
-	SOURCE carl9170.elf
+	DEPENDS carl9170.elf
 	COMMAND ${OBJCOPY}
 	ARGS --strip-unneeded -O binary -j .fwdsc carl9170.elf carl9170.dsc
 	TARGET firmware
 	OUTPUTS carl9170.dsc)
 
 add_custom_command(
-	SOURCE firmware
+	DEPENDS firmware
 	TARGET firmware
 	COMMAND cat
 	ARGS "carl9170.bin" "carl9170.dsc" > "carl9170.fw"