X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2FCMakeLists.txt;h=56e486a781228a7f7da609e16ef3ed6900dde92d;hb=3ab79b4a8e895983a5701b08e767c1e9ff9f622a;hp=193399eae3aa4d21526aa04a1c27309cbe2fb04e;hpb=5255978e8fde402a0ab372f12741edc44fe4faee;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/CMakeLists.txt b/target_firmware/CMakeLists.txt
index 193399e..56e486a 100644
--- a/target_firmware/CMakeLists.txt
+++ b/target_firmware/CMakeLists.txt
@@ -27,6 +27,7 @@ SET(SOURCES
 	magpie_fw_dev/target/buf_pool/buf_pool_static.c
 	magpie_fw_dev/target/cmnos/dbg_api.c
 	magpie_fw_dev/target/cmnos/cmnos_sflash.c
+	magpie_fw_dev/target/hif/usb_api_main_patch.c
 	wlan/ah.c
 	wlan/ah_osdep.c
 	wlan/ar5416Phy.c
@@ -45,7 +46,7 @@ SET(SOURCES
 IF(TARGET_K2)
 	SET(SOURCES ${SOURCES}
 		magpie_fw_dev/target/hif/k2_HIF_usb_patch.c
-		magpie_fw_dev/target/hif/k2_fw_usb_api.c
+		magpie_fw_dev/target/hif/usb_api_k2_patch.c
 	)
 	SET(LIBS ${LIBS} hif)
 	ADD_DEFINITIONS(-DPROJECT_K2)
@@ -62,14 +63,12 @@ ELSEIF(TARGET_MAGPIE)
 		-DMAGPIE_MERLIN
 	)
 	SET(SOURCES ${SOURCES}
+		magpie_fw_dev/target/hif/usb_api_magpie_patch.c
 		magpie_fw_dev/target/rompatch/cmnos_clock_patch.c
-		magpie_fw_dev/target/rompatch/usb_api_patch.c
 		magpie_fw_dev/target/rompatch/HIF_usb_patch.c
 	)
 	INCLUDE_DIRECTORIES(
 		${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/adf
-		magpie_fw_dev/build/magpie_1_1/inc
-		magpie_fw_dev/build/magpie_1_1/inc/magpie
 	)
 	SET(PLATFORM_NAME magpie)
 	SET(FIRMWARE_NAME htc_7010.fw)
@@ -78,9 +77,8 @@ ELSE()
 ENDIF()
 
 INCLUDE_DIRECTORIES(
-	${CMAKE_SOURCE_DIR}/magpie_fw_dev/build/include
-	${CMAKE_SOURCE_DIR}/magpie_fw_dev/build/include/xtensa-elf
 	${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc
+	${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc/xtensa-elf
 	${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc/${PLATFORM_NAME}
 	${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc/${PLATFORM_NAME}/${PLATFORM_NAME}
 	${CMAKE_SOURCE_DIR}/wlan
@@ -112,6 +110,8 @@ ADD_CUSTOM_COMMAND(
 	OUTPUT fw.bin
 	DEPENDS fw.elf
 	COMMAND ${CMAKE_OBJCOPY}
+		--change-section-lma .boot-0x400000
+		--change-section-vma .boot-0x400000
 		--change-section-lma .text-0x400000
 		--change-section-vma .text-0x400000
 		-O binary fw.elf fw.bin