Subject: Add ar6003 firmware number control by firmware folder
Signed-off-by: Samuel Chang <[email protected]>
diff -ruN
kernel-2.6.37.6-11.5/drivers/staging/ar6003/os/linux/include/ar6000_drv.h
kernel-2.6.37.6-11.5_ar6003_fw_path/drivers/staging/ar6003/os/linux/include/ar6000_drv.h
--- kernel-2.6.37.6-11.5/drivers/staging/ar6003/os/linux/include/ar6000_drv.h
2011-05-27 06:17:00.000000000 +0800
+++
kernel-2.6.37.6-11.5_ar6003_fw_path/drivers/staging/ar6003/os/linux/include/ar6000_drv.h
2011-06-08 05:58:18.968762956 +0800
@@ -315,40 +315,43 @@
} \
} while (0)
+#define AR6003_FW_VER_BUILD 1
+#define AR6003_FW_PATH "ath6k/AR6003."
__stringify(AR6003_FW_VER_BUILD)
+
/* AR6003 2.0 definitions */
#define AR6003_REV2_VERSION 0x30000384
-#define AR6003_REV2_OTP_FILE "ath6k/AR6003/hw2.0/otp.bin.z77"
-#define AR6003_REV2_FIRMWARE_FILE
"ath6k/AR6003/hw2.0/athwlan.bin.z77"
-#define AR6003_REV2_TCMD_FIRMWARE_FILE
"ath6k/AR6003/hw2.0/athtcmd_ram.bin"
-#define AR6003_REV2_ART_FIRMWARE_FILE "ath6k/AR6003/hw2.0/device.bin"
-#define AR6003_REV2_PATCH_FILE "ath6k/AR6003/hw2.0/data.patch.bin"
-#define AR6003_REV2_EPPING_FIRMWARE_FILE
"ath6k/AR6003/hw2.0/endpointping.bin"
+#define AR6003_REV2_OTP_FILE AR6003_FW_PATH "/hw2.0/otp.bin.z77"
+#define AR6003_REV2_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.0/athwlan.bin.z77"
+#define AR6003_REV2_TCMD_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.0/athtcmd_ram.bin"
+#define AR6003_REV2_ART_FIRMWARE_FILE AR6003_FW_PATH "/hw2.0/device.bin"
+#define AR6003_REV2_PATCH_FILE AR6003_FW_PATH
"/hw2.0/data.patch.bin"
+#define AR6003_REV2_EPPING_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.0/endpointping.bin"
#ifdef AR600x_SD31_XXX
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD31.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.0/bdata.SD31.bin"
#elif defined(AR600x_SD32_XXX)
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD32.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.0/bdata.SD32.bin"
#elif defined(AR600x_WB31_XXX)
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.WB31.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.0/bdata.WB31.bin"
#else
-#define AR6003_REV2_BOARD_DATA_FILE
"ath6k/AR6003/hw2.0/bdata.CUSTOM.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.0/bdata.CUSTOM.bin"
#endif /* Board Data File */
/* AR6003 3.0 definitions */
#define AR6003_REV3_VERSION 0x30000582
-#define AR6003_REV3_OTP_FILE "ath6k/AR6003/hw2.1.1/otp.bin"
-#define AR6003_REV3_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/athwlan.bin"
-#define AR6003_REV3_TCMD_FIRMWARE_FILE
"ath6k/AR6003/hw2.1.1/athtcmd_ram.bin"
-#define AR6003_REV3_ART_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/device.bin"
-#define AR6003_REV3_PATCH_FILE
"ath6k/AR6003/hw2.1.1/data.patch.bin"
-#define AR6003_REV3_EPPING_FIRMWARE_FILE
"ath6k/AR6003/hw2.1.1/endpointping.bin"
+#define AR6003_REV3_OTP_FILE AR6003_FW_PATH "/hw2.1.1/otp.bin"
+#define AR6003_REV3_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.1.1/athwlan.bin"
+#define AR6003_REV3_TCMD_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.1.1/athtcmd_ram.bin"
+#define AR6003_REV3_ART_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.1.1/device.bin"
+#define AR6003_REV3_PATCH_FILE AR6003_FW_PATH
"/hw2.1.1/data.patch.bin"
+#define AR6003_REV3_EPPING_FIRMWARE_FILE AR6003_FW_PATH
"/hw2.1.1/endpointping.bin"
#ifdef AR600x_SD31_XXX
-#define AR6003_REV3_BOARD_DATA_FILE
"ath6k/AR6003/hw2.1.1/bdata.SD31.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.1.1/bdata.SD31.bin"
#elif defined(AR600x_SD32_XXX)
-#define AR6003_REV3_BOARD_DATA_FILE
"ath6k/AR6003/hw2.1.1/bdata.SD32.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.1.1/bdata.SD32.bin"
#elif defined(AR600x_WB31_XXX)
-#define AR6003_REV3_BOARD_DATA_FILE
"ath6k/AR6003/hw2.1.1/bdata.WB31.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.1.1/bdata.WB31.bin"
#else
-#define AR6003_REV3_BOARD_DATA_FILE
"ath6k/AR6003/hw2.1.1/bdata.CUSTOM.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH
"/hw2.1.1/bdata.CUSTOM.bin"
#endif /* Board Data File */
/* AP-STA Concurrency */
Subject: Add ar6003 firmware number control by firmware folder
Signed-off-by: Samuel Chang <[email protected]>
diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/os/linux/include/ar6000_drv.h kernel-2.6.37.6-11.5_ar6003_fw_path/drivers/staging/ar6003/os/linux/include/ar6000_drv.h
--- kernel-2.6.37.6-11.5/drivers/staging/ar6003/os/linux/include/ar6000_drv.h 2011-05-27 06:17:00.000000000 +0800
+++ kernel-2.6.37.6-11.5_ar6003_fw_path/drivers/staging/ar6003/os/linux/include/ar6000_drv.h 2011-06-08 05:58:18.968762956 +0800
@@ -315,40 +315,43 @@
} \
} while (0)
+#define AR6003_FW_VER_BUILD 1
+#define AR6003_FW_PATH "ath6k/AR6003." __stringify(AR6003_FW_VER_BUILD)
+
/* AR6003 2.0 definitions */
#define AR6003_REV2_VERSION 0x30000384
-#define AR6003_REV2_OTP_FILE "ath6k/AR6003/hw2.0/otp.bin.z77"
-#define AR6003_REV2_FIRMWARE_FILE "ath6k/AR6003/hw2.0/athwlan.bin.z77"
-#define AR6003_REV2_TCMD_FIRMWARE_FILE "ath6k/AR6003/hw2.0/athtcmd_ram.bin"
-#define AR6003_REV2_ART_FIRMWARE_FILE "ath6k/AR6003/hw2.0/device.bin"
-#define AR6003_REV2_PATCH_FILE "ath6k/AR6003/hw2.0/data.patch.bin"
-#define AR6003_REV2_EPPING_FIRMWARE_FILE "ath6k/AR6003/hw2.0/endpointping.bin"
+#define AR6003_REV2_OTP_FILE AR6003_FW_PATH "/hw2.0/otp.bin.z77"
+#define AR6003_REV2_FIRMWARE_FILE AR6003_FW_PATH "/hw2.0/athwlan.bin.z77"
+#define AR6003_REV2_TCMD_FIRMWARE_FILE AR6003_FW_PATH "/hw2.0/athtcmd_ram.bin"
+#define AR6003_REV2_ART_FIRMWARE_FILE AR6003_FW_PATH "/hw2.0/device.bin"
+#define AR6003_REV2_PATCH_FILE AR6003_FW_PATH "/hw2.0/data.patch.bin"
+#define AR6003_REV2_EPPING_FIRMWARE_FILE AR6003_FW_PATH "/hw2.0/endpointping.bin"
#ifdef AR600x_SD31_XXX
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD31.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.0/bdata.SD31.bin"
#elif defined(AR600x_SD32_XXX)
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD32.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.0/bdata.SD32.bin"
#elif defined(AR600x_WB31_XXX)
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.WB31.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.0/bdata.WB31.bin"
#else
-#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.CUSTOM.bin"
+#define AR6003_REV2_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.0/bdata.CUSTOM.bin"
#endif /* Board Data File */
/* AR6003 3.0 definitions */
#define AR6003_REV3_VERSION 0x30000582
-#define AR6003_REV3_OTP_FILE "ath6k/AR6003/hw2.1.1/otp.bin"
-#define AR6003_REV3_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/athwlan.bin"
-#define AR6003_REV3_TCMD_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/athtcmd_ram.bin"
-#define AR6003_REV3_ART_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/device.bin"
-#define AR6003_REV3_PATCH_FILE "ath6k/AR6003/hw2.1.1/data.patch.bin"
-#define AR6003_REV3_EPPING_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/endpointping.bin"
+#define AR6003_REV3_OTP_FILE AR6003_FW_PATH "/hw2.1.1/otp.bin"
+#define AR6003_REV3_FIRMWARE_FILE AR6003_FW_PATH "/hw2.1.1/athwlan.bin"
+#define AR6003_REV3_TCMD_FIRMWARE_FILE AR6003_FW_PATH "/hw2.1.1/athtcmd_ram.bin"
+#define AR6003_REV3_ART_FIRMWARE_FILE AR6003_FW_PATH "/hw2.1.1/device.bin"
+#define AR6003_REV3_PATCH_FILE AR6003_FW_PATH "/hw2.1.1/data.patch.bin"
+#define AR6003_REV3_EPPING_FIRMWARE_FILE AR6003_FW_PATH "/hw2.1.1/endpointping.bin"
#ifdef AR600x_SD31_XXX
-#define AR6003_REV3_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.SD31.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.1.1/bdata.SD31.bin"
#elif defined(AR600x_SD32_XXX)
-#define AR6003_REV3_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.SD32.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.1.1/bdata.SD32.bin"
#elif defined(AR600x_WB31_XXX)
-#define AR6003_REV3_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.WB31.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.1.1/bdata.WB31.bin"
#else
-#define AR6003_REV3_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.CUSTOM.bin"
+#define AR6003_REV3_BOARD_DATA_FILE AR6003_FW_PATH "/hw2.1.1/bdata.CUSTOM.bin"
#endif /* Board Data File */
/* AP-STA Concurrency */
_______________________________________________
MeeGo-kernel mailing list
[email protected]
http://lists.meego.com/listinfo/meego-kernel
