X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2FCMakeLists.txt;h=db31dc471eef82763e13f312999e501fb5bff6c9;hb=61d9719602f505dcdd10cbba0cb957f636400763;hp=193399eae3aa4d21526aa04a1c27309cbe2fb04e;hpb=152ea02e7d85983c1db0b1c84a8f082dc4ec1610;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/CMakeLists.txt b/target_firmware/CMakeLists.txt
index 193399e..db31dc4 100644
--- a/target_firmware/CMakeLists.txt
+++ b/target_firmware/CMakeLists.txt
@@ -1,3 +1,39 @@
+##
+ # Copyright (c) 2013 Qualcomm Atheros, Inc.
+ #
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted (subject to the limitations in the
+ # disclaimer below) provided that the following conditions are met:
+ #
+ #  * Redistributions of source code must retain the above copyright
+ #    notice, this list of conditions and the following disclaimer.
+ #
+ #  * Redistributions in binary form must reproduce the above copyright
+ #    notice, this list of conditions and the following disclaimer in the
+ #    documentation and/or other materials provided with the
+ #    distribution.
+ #
+ #  * Neither the name of Qualcomm Atheros nor the names of its
+ #    contributors may be used to endorse or promote products derived
+ #    from this software without specific prior written permission.
+ #
+ # NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ # GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ # HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ##
+
 SET(CMAKE_C_COMPILER_WORKS 1)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
@@ -27,6 +63,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 +82,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 +99,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 +113,10 @@ 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}/include
+	${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/
 	${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
@@ -101,6 +137,7 @@ ADD_CUSTOM_COMMAND(
 	DEPENDS firmware
 	COMMAND ${CMAKE_C_COMPILER}
 		-nostdlib
+		-fno-lto
 		-Wl,--start-group
 		${CMAKE_BINARY_DIR}/libfirmware.a
 		-Wl,--end-group
@@ -112,6 +149,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