X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2FCMakeLists.txt;h=02c80bf138badd45cb9611e1eddb5b4f5a806869;hp=81b1346ec9fc0005e0f095737b10e7c9328f94a1;hb=58c57a78909bcbbd4d44db4240fb544e80d6eb54;hpb=1a2fbaf4f621cbb37f36637b1d4101f453474f7a

diff --git a/carlfw/CMakeLists.txt b/carlfw/CMakeLists.txt
index 81b1346..02c80bf 100644
--- a/carlfw/CMakeLists.txt
+++ b/carlfw/CMakeLists.txt
@@ -16,16 +16,17 @@ set(CARLFW_CFLAGS "${CARLFW_CFLAGS_DEF} ${CARLFW_CFLAGS_EXTRA} ${CARLFW_CFLAGS_A
 
 include_directories (../include/linux ../include/shared ../include include)
 
-set(carl9170_main_src src/main.c src/wlan.c src/fw.c src/gpio.c
-		      src/cmd.c src/uart.c src/dma.c src/hostif.c src/reboot.S
+set(carl9170_main_src src/main.c src/wlan.c src/wlanrx.c src/wlantx.c
+		      src/fw.c src/gpio.c src/timer.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)
@@ -41,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"