mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-17 23:34:07 +00:00
removed core/linux-omap
This commit is contained in:
Kevin Mihelich
parent
6cf479f2f3
commit
58f5e5f5ea
13 changed files with 0 additions and 5695 deletions
|
|
@ -1,155 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
|
||||
index dadf1db..0b11029 100644
|
||||
--- a/drivers/net/wireless/ti/wl12xx/main.c
|
||||
+++ b/drivers/net/wireless/ti/wl12xx/main.c
|
||||
@@ -601,7 +601,7 @@ static int wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
- if (wl->chip.id != CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id != CHIP_ID_128X_PG20) {
|
||||
struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
|
||||
struct wl127x_rx_mem_pool_addr rx_mem_addr;
|
||||
|
||||
@@ -631,7 +631,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
int ret = 0;
|
||||
|
||||
switch (wl->chip.id) {
|
||||
- case CHIP_ID_1271_PG10:
|
||||
+ case CHIP_ID_127X_PG10:
|
||||
wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
|
||||
wl->chip.id);
|
||||
|
||||
@@ -651,7 +651,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
WL127X_MINOR_VER);
|
||||
break;
|
||||
|
||||
- case CHIP_ID_1271_PG20:
|
||||
+ case CHIP_ID_127X_PG20:
|
||||
wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
|
||||
wl->chip.id);
|
||||
|
||||
@@ -672,7 +672,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
WL127X_MINOR_VER);
|
||||
break;
|
||||
|
||||
- case CHIP_ID_1283_PG20:
|
||||
+ case CHIP_ID_128X_PG20:
|
||||
wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)",
|
||||
wl->chip.id);
|
||||
wl->plt_fw_name = WL128X_PLT_FW_NAME;
|
||||
@@ -688,7 +688,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
WL128X_MAJOR_VER, WL128X_SUBTYPE_VER,
|
||||
WL128X_MINOR_VER);
|
||||
break;
|
||||
- case CHIP_ID_1283_PG10:
|
||||
+ case CHIP_ID_128X_PG10:
|
||||
default:
|
||||
wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
|
||||
ret = -ENODEV;
|
||||
@@ -1067,7 +1067,7 @@ static int wl12xx_pre_boot(struct wl1271 *wl)
|
||||
u32 clk;
|
||||
int selected_clock = -1;
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20) {
|
||||
ret = wl128x_boot_clk(wl, &selected_clock);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
@@ -1098,7 +1098,7 @@ static int wl12xx_pre_boot(struct wl1271 *wl)
|
||||
|
||||
wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20)
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20)
|
||||
clk |= ((selected_clock & 0x3) << 1) << 4;
|
||||
else
|
||||
clk |= (priv->ref_clock << 1) << 4;
|
||||
@@ -1152,7 +1152,7 @@ static int wl12xx_pre_upload(struct wl1271 *wl)
|
||||
/* WL1271: The reference driver skips steps 7 to 10 (jumps directly
|
||||
* to upload_fw) */
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20) {
|
||||
ret = wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
@@ -1261,7 +1261,7 @@ static void
|
||||
wl12xx_set_tx_desc_blocks(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
|
||||
u32 blks, u32 spare_blks)
|
||||
{
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20) {
|
||||
desc->wl128x_mem.total_mem_blocks = blks;
|
||||
} else {
|
||||
desc->wl127x_mem.extra_blocks = spare_blks;
|
||||
@@ -1275,7 +1275,7 @@ wl12xx_set_tx_desc_data_len(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
|
||||
{
|
||||
u32 aligned_len = wlcore_calc_packet_alignment(wl, skb->len);
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20) {
|
||||
desc->wl128x_mem.extra_bytes = aligned_len - skb->len;
|
||||
desc->length = cpu_to_le16(aligned_len >> 2);
|
||||
|
||||
@@ -1339,7 +1339,7 @@ static int wl12xx_hw_init(struct wl1271 *wl)
|
||||
{
|
||||
int ret;
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20) {
|
||||
u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;
|
||||
|
||||
ret = wl128x_cmd_general_parms(wl);
|
||||
@@ -1426,7 +1426,7 @@ static bool wl12xx_mac_in_fuse(struct wl1271 *wl)
|
||||
bool supported = false;
|
||||
u8 major, minor;
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20) {
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20) {
|
||||
major = WL128X_PG_GET_MAJOR(wl->hw_pg_ver);
|
||||
minor = WL128X_PG_GET_MINOR(wl->hw_pg_ver);
|
||||
|
||||
@@ -1482,7 +1482,7 @@ static int wl12xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
|
||||
u16 die_info;
|
||||
int ret;
|
||||
|
||||
- if (wl->chip.id == CHIP_ID_1283_PG20)
|
||||
+ if (wl->chip.id == CHIP_ID_128X_PG20)
|
||||
ret = wl12xx_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1,
|
||||
&die_info);
|
||||
else
|
||||
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
index 7182bbf..634ad00 100644
|
||||
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
@@ -24,6 +24,12 @@
|
||||
|
||||
#include "conf.h"
|
||||
|
||||
+/* WiLink 6/7 chip IDs */
|
||||
+#define CHIP_ID_127X_PG10 (0x04030101)
|
||||
+#define CHIP_ID_127X_PG20 (0x04030111)
|
||||
+#define CHIP_ID_128X_PG10 (0x05030101)
|
||||
+#define CHIP_ID_128X_PG20 (0x05030111)
|
||||
+
|
||||
/* minimum FW required for driver for wl127x */
|
||||
#define WL127X_CHIP_VER 6
|
||||
#define WL127X_IFTYPE_VER 3
|
||||
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
index 68584aa..96af4a1 100644
|
||||
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
@@ -477,12 +477,6 @@ wlcore_set_min_fw_ver(struct wl1271 *wl, unsigned int chip,
|
||||
/* separate probe response templates for one-shot and sched scans */
|
||||
#define WLCORE_QUIRK_DUAL_PROBE_TMPL BIT(10)
|
||||
|
||||
-/* TODO: move to the lower drivers when all usages are abstracted */
|
||||
-#define CHIP_ID_1271_PG10 (0x4030101)
|
||||
-#define CHIP_ID_1271_PG20 (0x4030111)
|
||||
-#define CHIP_ID_1283_PG10 (0x05030101)
|
||||
-#define CHIP_ID_1283_PG20 (0x05030111)
|
||||
-
|
||||
/* TODO: move all these common registers and values elsewhere */
|
||||
#define HW_ACCESS_ELP_CTRL_REG 0x1FFFC
|
||||
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
|
||||
index 0b11029..cadd7f3 100644
|
||||
--- a/drivers/net/wireless/ti/wl12xx/main.c
|
||||
+++ b/drivers/net/wireless/ti/wl12xx/main.c
|
||||
@@ -1394,22 +1394,6 @@ static u32 wl12xx_sta_get_ap_rate_mask(struct wl1271 *wl,
|
||||
return wlvif->rate_set;
|
||||
}
|
||||
|
||||
-static int wl12xx_identify_fw(struct wl1271 *wl)
|
||||
-{
|
||||
- unsigned int *fw_ver = wl->chip.fw_ver;
|
||||
-
|
||||
- /* Only new station firmwares support routing fw logs to the host */
|
||||
- if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&
|
||||
- (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))
|
||||
- wl->quirks |= WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED;
|
||||
-
|
||||
- /* This feature is not yet supported for AP mode */
|
||||
- if (fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP)
|
||||
- wl->quirks |= WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED;
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
static void wl12xx_conf_init(struct wl1271 *wl)
|
||||
{
|
||||
struct wl12xx_priv *priv = wl->priv;
|
||||
@@ -1594,7 +1578,6 @@ static int wl12xx_setup(struct wl1271 *wl);
|
||||
static struct wlcore_ops wl12xx_ops = {
|
||||
.setup = wl12xx_setup,
|
||||
.identify_chip = wl12xx_identify_chip,
|
||||
- .identify_fw = wl12xx_identify_fw,
|
||||
.boot = wl12xx_boot,
|
||||
.plt_init = wl12xx_plt_init,
|
||||
.trigger_cmd = wl12xx_trigger_cmd,
|
||||
diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
|
||||
index 6678d4b..dbbfca1 100644
|
||||
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
|
||||
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
|
||||
@@ -109,17 +109,6 @@ enum {
|
||||
NUM_FW_VER
|
||||
};
|
||||
|
||||
-#define FW_VER_CHIP_WL127X 6
|
||||
-#define FW_VER_CHIP_WL128X 7
|
||||
-
|
||||
-#define FW_VER_IF_TYPE_STA 1
|
||||
-#define FW_VER_IF_TYPE_AP 2
|
||||
-
|
||||
-#define FW_VER_MINOR_1_SPARE_STA_MIN 58
|
||||
-#define FW_VER_MINOR_1_SPARE_AP_MIN 47
|
||||
-
|
||||
-#define FW_VER_MINOR_FWLOG_STA_MIN 70
|
||||
-
|
||||
struct wl1271_chip {
|
||||
u32 id;
|
||||
char fw_ver_str[ETHTOOL_BUSINFO_LEN];
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
|
||||
index 375ea57..be216b8 100644
|
||||
--- a/drivers/net/wireless/ti/wlcore/boot.c
|
||||
+++ b/drivers/net/wireless/ti/wlcore/boot.c
|
||||
@@ -85,46 +85,55 @@ static int wlcore_validate_fw_ver(struct wl1271 *wl)
|
||||
{
|
||||
unsigned int *fw_ver = wl->chip.fw_ver;
|
||||
unsigned int *min_ver = wl->min_fw_ver;
|
||||
+ char min_fw_str[32] = "";
|
||||
+ int i;
|
||||
|
||||
/* the chip must be exactly equal */
|
||||
- if (min_ver[FW_VER_CHIP] != fw_ver[FW_VER_CHIP])
|
||||
+ if ((min_ver[FW_VER_CHIP] != WLCORE_FW_VER_IGNORE) &&
|
||||
+ (min_ver[FW_VER_CHIP] != fw_ver[FW_VER_CHIP]))
|
||||
goto fail;
|
||||
|
||||
- /* always check the next digit if all previous ones are equal */
|
||||
-
|
||||
- if (min_ver[FW_VER_IF_TYPE] < fw_ver[FW_VER_IF_TYPE])
|
||||
- goto out;
|
||||
- else if (min_ver[FW_VER_IF_TYPE] > fw_ver[FW_VER_IF_TYPE])
|
||||
+ /* the firmware type must be equal */
|
||||
+ if ((min_ver[FW_VER_IF_TYPE] != WLCORE_FW_VER_IGNORE) &&
|
||||
+ (min_ver[FW_VER_IF_TYPE] != fw_ver[FW_VER_IF_TYPE]))
|
||||
goto fail;
|
||||
|
||||
- if (min_ver[FW_VER_MAJOR] < fw_ver[FW_VER_MAJOR])
|
||||
- goto out;
|
||||
- else if (min_ver[FW_VER_MAJOR] > fw_ver[FW_VER_MAJOR])
|
||||
+ /* the project number must be equal */
|
||||
+ if ((min_ver[FW_VER_SUBTYPE] != WLCORE_FW_VER_IGNORE) &&
|
||||
+ (min_ver[FW_VER_SUBTYPE] != fw_ver[FW_VER_SUBTYPE]))
|
||||
goto fail;
|
||||
|
||||
- if (min_ver[FW_VER_SUBTYPE] < fw_ver[FW_VER_SUBTYPE])
|
||||
- goto out;
|
||||
- else if (min_ver[FW_VER_SUBTYPE] > fw_ver[FW_VER_SUBTYPE])
|
||||
+ /* the API version must be greater or equal */
|
||||
+ if ((min_ver[FW_VER_MAJOR] != WLCORE_FW_VER_IGNORE) &&
|
||||
+ (min_ver[FW_VER_MAJOR] > fw_ver[FW_VER_MAJOR]))
|
||||
goto fail;
|
||||
|
||||
- if (min_ver[FW_VER_MINOR] < fw_ver[FW_VER_MINOR])
|
||||
- goto out;
|
||||
- else if (min_ver[FW_VER_MINOR] > fw_ver[FW_VER_MINOR])
|
||||
+ /* if the API version is equal... */
|
||||
+ if (((min_ver[FW_VER_MAJOR] == WLCORE_FW_VER_IGNORE) ||
|
||||
+ (min_ver[FW_VER_MAJOR] == fw_ver[FW_VER_MAJOR])) &&
|
||||
+ /* ...the minor must be greater or equal */
|
||||
+ ((min_ver[FW_VER_MINOR] != WLCORE_FW_VER_IGNORE) &&
|
||||
+ (min_ver[FW_VER_MINOR] > fw_ver[FW_VER_MINOR])))
|
||||
goto fail;
|
||||
|
||||
-out:
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
- wl1271_error("Your WiFi FW version (%u.%u.%u.%u.%u) is outdated.\n"
|
||||
- "Please use at least FW %u.%u.%u.%u.%u.\n"
|
||||
- "You can get more information at:\n"
|
||||
- "http://wireless.kernel.org/en/users/Drivers/wl12xx",
|
||||
+ for (i = 0; i < NUM_FW_VER; i++)
|
||||
+ if (min_ver[i] == WLCORE_FW_VER_IGNORE)
|
||||
+ snprintf(min_fw_str, sizeof(min_fw_str),
|
||||
+ "%s*.", min_fw_str);
|
||||
+ else
|
||||
+ snprintf(min_fw_str, sizeof(min_fw_str),
|
||||
+ "%s%u.", min_fw_str, min_ver[i]);
|
||||
+
|
||||
+ wl1271_error("Your WiFi FW version (%u.%u.%u.%u.%u) is invalid.\n"
|
||||
+ "Please use at least FW %s\n"
|
||||
+ "You can get the latest firmwares at:\n"
|
||||
+ "git://github.com/TI-OpenLink/firmwares.git",
|
||||
fw_ver[FW_VER_CHIP], fw_ver[FW_VER_IF_TYPE],
|
||||
fw_ver[FW_VER_MAJOR], fw_ver[FW_VER_SUBTYPE],
|
||||
- fw_ver[FW_VER_MINOR], min_ver[FW_VER_CHIP],
|
||||
- min_ver[FW_VER_IF_TYPE], min_ver[FW_VER_MAJOR],
|
||||
- min_ver[FW_VER_SUBTYPE], min_ver[FW_VER_MINOR]);
|
||||
+ fw_ver[FW_VER_MINOR], min_fw_str);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
index 96af4a1..6184f53 100644
|
||||
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
@@ -430,6 +430,9 @@ wlcore_set_ht_cap(struct wl1271 *wl, enum ieee80211_band band,
|
||||
memcpy(&wl->ht_cap[band], ht_cap, sizeof(*ht_cap));
|
||||
}
|
||||
|
||||
+/* Tell wlcore not to care about this element when checking the version */
|
||||
+#define WLCORE_FW_VER_IGNORE -1
|
||||
+
|
||||
static inline void
|
||||
wlcore_set_min_fw_ver(struct wl1271 *wl, unsigned int chip,
|
||||
unsigned int iftype, unsigned int major,
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
index 634ad00..310df52 100644
|
||||
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
@@ -32,16 +32,16 @@
|
||||
|
||||
/* minimum FW required for driver for wl127x */
|
||||
#define WL127X_CHIP_VER 6
|
||||
-#define WL127X_IFTYPE_VER 3
|
||||
+#define WL127X_IFTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
#define WL127X_MAJOR_VER 10
|
||||
-#define WL127X_SUBTYPE_VER 2
|
||||
+#define WL127X_SUBTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
#define WL127X_MINOR_VER 115
|
||||
|
||||
/* minimum FW required for driver for wl128x */
|
||||
#define WL128X_CHIP_VER 7
|
||||
-#define WL128X_IFTYPE_VER 3
|
||||
+#define WL128X_IFTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
#define WL128X_MAJOR_VER 10
|
||||
-#define WL128X_SUBTYPE_VER 2
|
||||
+#define WL128X_SUBTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
#define WL128X_MINOR_VER 115
|
||||
|
||||
#define WL12XX_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
|
||||
index cadd7f3..31f8367 100644
|
||||
--- a/drivers/net/wireless/ti/wl12xx/main.c
|
||||
+++ b/drivers/net/wireless/ti/wl12xx/main.c
|
||||
@@ -646,9 +646,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
/* read data preparation is only needed by wl127x */
|
||||
wl->ops->prepare_read = wl127x_prepare_read;
|
||||
|
||||
- wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER, WL127X_IFTYPE_VER,
|
||||
- WL127X_MAJOR_VER, WL127X_SUBTYPE_VER,
|
||||
- WL127X_MINOR_VER);
|
||||
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
|
||||
+ WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
|
||||
+ WL127X_SUBTYPE_SR_VER, WL127X_MINOR_SR_VER,
|
||||
+ WL127X_IFTYPE_MR_VER, WL127X_MAJOR_MR_VER,
|
||||
+ WL127X_SUBTYPE_MR_VER, WL127X_MINOR_MR_VER);
|
||||
break;
|
||||
|
||||
case CHIP_ID_127X_PG20:
|
||||
@@ -667,9 +669,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
/* read data preparation is only needed by wl127x */
|
||||
wl->ops->prepare_read = wl127x_prepare_read;
|
||||
|
||||
- wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER, WL127X_IFTYPE_VER,
|
||||
- WL127X_MAJOR_VER, WL127X_SUBTYPE_VER,
|
||||
- WL127X_MINOR_VER);
|
||||
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
|
||||
+ WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
|
||||
+ WL127X_SUBTYPE_SR_VER, WL127X_MINOR_SR_VER,
|
||||
+ WL127X_IFTYPE_MR_VER, WL127X_MAJOR_MR_VER,
|
||||
+ WL127X_SUBTYPE_MR_VER, WL127X_MINOR_MR_VER);
|
||||
break;
|
||||
|
||||
case CHIP_ID_128X_PG20:
|
||||
@@ -684,9 +688,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
WLCORE_QUIRK_DUAL_PROBE_TMPL |
|
||||
WLCORE_QUIRK_TKIP_HEADER_SPACE;
|
||||
|
||||
- wlcore_set_min_fw_ver(wl, WL128X_CHIP_VER, WL128X_IFTYPE_VER,
|
||||
- WL128X_MAJOR_VER, WL128X_SUBTYPE_VER,
|
||||
- WL128X_MINOR_VER);
|
||||
+ wlcore_set_min_fw_ver(wl, WL128X_CHIP_VER,
|
||||
+ WL128X_IFTYPE_SR_VER, WL128X_MAJOR_SR_VER,
|
||||
+ WL128X_SUBTYPE_SR_VER, WL128X_MINOR_SR_VER,
|
||||
+ WL128X_IFTYPE_MR_VER, WL128X_MAJOR_MR_VER,
|
||||
+ WL128X_SUBTYPE_MR_VER, WL128X_MINOR_MR_VER);
|
||||
break;
|
||||
case CHIP_ID_128X_PG10:
|
||||
default:
|
||||
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
index 310df52..a07be5e 100644
|
||||
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
|
||||
@@ -30,19 +30,31 @@
|
||||
#define CHIP_ID_128X_PG10 (0x05030101)
|
||||
#define CHIP_ID_128X_PG20 (0x05030111)
|
||||
|
||||
-/* minimum FW required for driver for wl127x */
|
||||
+/* FW chip version for wl127x */
|
||||
#define WL127X_CHIP_VER 6
|
||||
-#define WL127X_IFTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
-#define WL127X_MAJOR_VER 10
|
||||
-#define WL127X_SUBTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
-#define WL127X_MINOR_VER 115
|
||||
+/* minimum single-role FW version for wl127x */
|
||||
+#define WL127X_IFTYPE_SR_VER 3
|
||||
+#define WL127X_MAJOR_SR_VER 10
|
||||
+#define WL127X_SUBTYPE_SR_VER WLCORE_FW_VER_IGNORE
|
||||
+#define WL127X_MINOR_SR_VER 115
|
||||
+/* minimum multi-role FW version for wl127x */
|
||||
+#define WL127X_IFTYPE_MR_VER 5
|
||||
+#define WL127X_MAJOR_MR_VER 7
|
||||
+#define WL127X_SUBTYPE_MR_VER WLCORE_FW_VER_IGNORE
|
||||
+#define WL127X_MINOR_MR_VER 115
|
||||
|
||||
-/* minimum FW required for driver for wl128x */
|
||||
+/* FW chip version for wl128x */
|
||||
#define WL128X_CHIP_VER 7
|
||||
-#define WL128X_IFTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
-#define WL128X_MAJOR_VER 10
|
||||
-#define WL128X_SUBTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
-#define WL128X_MINOR_VER 115
|
||||
+/* minimum single-role FW version for wl128x */
|
||||
+#define WL128X_IFTYPE_SR_VER 3
|
||||
+#define WL128X_MAJOR_SR_VER 10
|
||||
+#define WL128X_SUBTYPE_SR_VER WLCORE_FW_VER_IGNORE
|
||||
+#define WL128X_MINOR_SR_VER 115
|
||||
+/* minimum multi-role FW version for wl128x */
|
||||
+#define WL128X_IFTYPE_MR_VER 5
|
||||
+#define WL128X_MAJOR_MR_VER 7
|
||||
+#define WL128X_SUBTYPE_MR_VER WLCORE_FW_VER_IGNORE
|
||||
+#define WL128X_MINOR_MR_VER 42
|
||||
|
||||
#define WL12XX_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
|
||||
|
||||
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
|
||||
index a39682a..5864ef0 100644
|
||||
--- a/drivers/net/wireless/ti/wl18xx/main.c
|
||||
+++ b/drivers/net/wireless/ti/wl18xx/main.c
|
||||
@@ -614,9 +614,11 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
|
||||
WLCORE_QUIRK_NO_SCHED_SCAN_WHILE_CONN |
|
||||
WLCORE_QUIRK_TX_PAD_LAST_FRAME;
|
||||
|
||||
- wlcore_set_min_fw_ver(wl, WL18XX_CHIP_VER, WL18XX_IFTYPE_VER,
|
||||
- WL18XX_MAJOR_VER, WL18XX_SUBTYPE_VER,
|
||||
- WL18XX_MINOR_VER);
|
||||
+ wlcore_set_min_fw_ver(wl, WL18XX_CHIP_VER,
|
||||
+ WL18XX_IFTYPE_VER, WL18XX_MAJOR_VER,
|
||||
+ WL18XX_SUBTYPE_VER, WL18XX_MINOR_VER,
|
||||
+ /* there's no separate multi-role FW */
|
||||
+ 0, 0, 0, 0);
|
||||
break;
|
||||
case CHIP_ID_185x_PG10:
|
||||
wl1271_warning("chip id 0x%x (185x PG10) is deprecated",
|
||||
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
|
||||
index be216b8..b92e572 100644
|
||||
--- a/drivers/net/wireless/ti/wlcore/boot.c
|
||||
+++ b/drivers/net/wireless/ti/wlcore/boot.c
|
||||
@@ -84,7 +84,8 @@ out:
|
||||
static int wlcore_validate_fw_ver(struct wl1271 *wl)
|
||||
{
|
||||
unsigned int *fw_ver = wl->chip.fw_ver;
|
||||
- unsigned int *min_ver = wl->min_fw_ver;
|
||||
+ unsigned int *min_ver = (wl->fw_type == WL12XX_FW_TYPE_NORMAL) ?
|
||||
+ wl->min_sr_fw_ver : wl->min_mr_fw_ver;
|
||||
char min_fw_str[32] = "";
|
||||
int i;
|
||||
|
||||
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
index 6184f53..fc6ba49 100644
|
||||
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
|
||||
@@ -408,8 +408,11 @@ struct wl1271 {
|
||||
/* the number of allocated MAC addresses in this chip */
|
||||
int num_mac_addr;
|
||||
|
||||
- /* the minimum FW version required for the driver to work */
|
||||
- unsigned int min_fw_ver[NUM_FW_VER];
|
||||
+ /* minimum FW version required for the driver to work in single-role */
|
||||
+ unsigned int min_sr_fw_ver[NUM_FW_VER];
|
||||
+
|
||||
+ /* minimum FW version required for the driver to work in multi-role */
|
||||
+ unsigned int min_mr_fw_ver[NUM_FW_VER];
|
||||
|
||||
struct completion nvs_loading_complete;
|
||||
};
|
||||
@@ -435,14 +438,22 @@ wlcore_set_ht_cap(struct wl1271 *wl, enum ieee80211_band band,
|
||||
|
||||
static inline void
|
||||
wlcore_set_min_fw_ver(struct wl1271 *wl, unsigned int chip,
|
||||
- unsigned int iftype, unsigned int major,
|
||||
- unsigned int subtype, unsigned int minor)
|
||||
+ unsigned int iftype_sr, unsigned int major_sr,
|
||||
+ unsigned int subtype_sr, unsigned int minor_sr,
|
||||
+ unsigned int iftype_mr, unsigned int major_mr,
|
||||
+ unsigned int subtype_mr, unsigned int minor_mr)
|
||||
{
|
||||
- wl->min_fw_ver[FW_VER_CHIP] = chip;
|
||||
- wl->min_fw_ver[FW_VER_IF_TYPE] = iftype;
|
||||
- wl->min_fw_ver[FW_VER_MAJOR] = major;
|
||||
- wl->min_fw_ver[FW_VER_SUBTYPE] = subtype;
|
||||
- wl->min_fw_ver[FW_VER_MINOR] = minor;
|
||||
+ wl->min_sr_fw_ver[FW_VER_CHIP] = chip;
|
||||
+ wl->min_sr_fw_ver[FW_VER_IF_TYPE] = iftype_sr;
|
||||
+ wl->min_sr_fw_ver[FW_VER_MAJOR] = major_sr;
|
||||
+ wl->min_sr_fw_ver[FW_VER_SUBTYPE] = subtype_sr;
|
||||
+ wl->min_sr_fw_ver[FW_VER_MINOR] = minor_sr;
|
||||
+
|
||||
+ wl->min_mr_fw_ver[FW_VER_CHIP] = chip;
|
||||
+ wl->min_mr_fw_ver[FW_VER_IF_TYPE] = iftype_mr;
|
||||
+ wl->min_mr_fw_ver[FW_VER_MAJOR] = major_mr;
|
||||
+ wl->min_mr_fw_ver[FW_VER_SUBTYPE] = subtype_mr;
|
||||
+ wl->min_mr_fw_ver[FW_VER_MINOR] = minor_mr;
|
||||
}
|
||||
|
||||
/* Firmware image load chunk size */
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- drivers/net/wireless/ti/wl18xx/wl18xx.h.orig 2013-06-08 00:09:45.979268733 -0600
|
||||
+++ drivers/net/wireless/ti/wl18xx/wl18xx.h 2013-06-08 00:10:03.334181254 -0600
|
||||
@@ -27,8 +27,8 @@
|
||||
/* minimum FW required for driver */
|
||||
#define WL18XX_CHIP_VER 8
|
||||
#define WL18XX_IFTYPE_VER 5
|
||||
-#define WL18XX_MAJOR_VER 0
|
||||
-#define WL18XX_SUBTYPE_VER 0
|
||||
+#define WL18XX_MAJOR_VER WLCORE_FW_VER_IGNORE
|
||||
+#define WL18XX_SUBTYPE_VER WLCORE_FW_VER_IGNORE
|
||||
#define WL18XX_MINOR_VER 28
|
||||
|
||||
#define WL18XX_CMD_MAX_SIZE 740
|
||||
|
|
@ -1,304 +0,0 @@
|
|||
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
|
||||
# OMAP 3/4 kernel and headers
|
||||
# - note: any other kernel packages should include headers for that march
|
||||
# - there will be no v7 kernel26 package, each march will be tagged individually
|
||||
|
||||
buildarch=4
|
||||
|
||||
pkgbase=linux-omap
|
||||
pkgname=('linux-omap' 'linux-headers-omap')
|
||||
# pkgname=linux-custom # Build kernel with a different name
|
||||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.7
|
||||
pkgver=${_basekernel}.10
|
||||
pkgrel=9
|
||||
rcnrel=x13
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git')
|
||||
options=('!strip')
|
||||
source=("http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.xz"
|
||||
"ftp://ftp.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.bz2"
|
||||
"http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver}-${rcnrel}.diff.gz"
|
||||
'config'
|
||||
'change-default-console-loglevel.patch'
|
||||
'aufs3-3.7.patch.xz'
|
||||
'1-6-wlcore-wl12xx-move-wl12xx-chip-ID-defines-to-the-lower-driver.patch'
|
||||
'2-6-wlcore-wl12xx-remove-deprecated-FW-version-check.patch'
|
||||
'3-6-wlcore-change-way-of-checking-the-firmware-version.patch'
|
||||
'4-6-wl12xx-ignore-some-of-the-firmware-version-fields.patch'
|
||||
'5-6-wlcore-wl12xx-wl18xx-verify-multi-role-and-single-role-fw-versions.patch'
|
||||
'6-6-wl18xx-ignore-irrelevant-firmware-version-fields.patch'
|
||||
'wl18xx.diff'
|
||||
'memset.patch')
|
||||
md5sums=('21223369d682bcf44bcdfe1521095983'
|
||||
'5545033e0ce84a7f343f79530ebe94ab'
|
||||
'3a7000371e8d3d31ef4c0fa802c52a0d'
|
||||
'a024158aa219adabf1c03e0587529c28'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'961e19a119443158f104a68ea4d0d9f1'
|
||||
'58475df6313a9a26b024b2aa808ad000'
|
||||
'87a7a995733f337d0e481547068dda28'
|
||||
'130c8f9f2e6577080c445f091588a08d'
|
||||
'bfc2c5beb7f920cd39a1a54c3f1fa5a4'
|
||||
'aa9076eac94335c8f3490eb6a54c67f6'
|
||||
'0889fb9192f8471028688aec66bb47b9'
|
||||
'687cb8f3469e7397715e4c174dd23868'
|
||||
'39be2896f0b968d61a19b33da75ce6e0')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
|
||||
patch -p1 -i "${srcdir}/patch-${pkgver}"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
||||
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
|
||||
# remove this when a Kconfig knob is made available by upstream
|
||||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
|
||||
|
||||
# ALARM patches
|
||||
git apply "${srcdir}/patch-${pkgver}-${rcnrel}.diff"
|
||||
patch -Np1 -F10 -i "${srcdir}/aufs3-3.7.patch"
|
||||
patch -Np1 -i "${srcdir}/1-6-wlcore-wl12xx-move-wl12xx-chip-ID-defines-to-the-lower-driver.patch"
|
||||
patch -Np1 -i "${srcdir}/2-6-wlcore-wl12xx-remove-deprecated-FW-version-check.patch"
|
||||
#patch -Np1 -i "${srcdir}/3-6-wlcore-change-way-of-checking-the-firmware-version.patch"
|
||||
#patch -Np1 -i "${srcdir}/4-6-wl12xx-ignore-some-of-the-firmware-version-fields.patch"
|
||||
patch -Np1 -i "${srcdir}/5-6-wlcore-wl12xx-wl18xx-verify-multi-role-and-single-role-fw-versions.patch"
|
||||
patch -Np1 -i "${srcdir}/wl18xx.diff"
|
||||
patch -Np0 -i "${srcdir}/6-6-wl18xx-ignore-irrelevant-firmware-version-fields.patch"
|
||||
patch -Np1 -i "${srcdir}/memset.patch"
|
||||
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
# add pkgrel to extraversion
|
||||
sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile
|
||||
|
||||
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
|
||||
# get kernel version
|
||||
make prepare
|
||||
|
||||
# load configuration
|
||||
# Configure the kernel. Replace the line below with one of your choice.
|
||||
#make menuconfig # CLI menu for configuration
|
||||
#make nconfig # new CLI menu for configuration
|
||||
#make xconfig # X-based configuration
|
||||
#make oldconfig # using old config from previous kernel version
|
||||
# ... or manually edit .config
|
||||
|
||||
# Copy back our configuration (use with new kernel version)
|
||||
#cp ./.config ../${_basekernel}.config
|
||||
|
||||
####################
|
||||
# stop here
|
||||
# this is useful to configure the kernel
|
||||
#msg "Stopping build"
|
||||
#return 1
|
||||
####################
|
||||
|
||||
#yes "" | make config
|
||||
|
||||
# build!
|
||||
make ${MAKEFLAGS} uImage modules
|
||||
}
|
||||
|
||||
package_linux-omap() {
|
||||
pkgdesc="The Linux Kernel and modules - OMAP3/4 processors"
|
||||
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
|
||||
optdepends=('crda: to set the correct wireless channels of your country')
|
||||
provides=('kernel26' 'kernel26-omap' 'linux=${pkgver}' 'aufs_friendly')
|
||||
conflicts=('kernel26-omap' 'linux-tegra')
|
||||
replaces=('kernel26-omap')
|
||||
backup=("etc/mkinitcpio.d/${pkgname}.preset")
|
||||
install=${pkgname}.install
|
||||
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
|
||||
KARCH=arm
|
||||
|
||||
# get kernel version
|
||||
_kernver="$(make kernelrelease)"
|
||||
|
||||
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
|
||||
make INSTALL_MOD_PATH="${pkgdir}" modules_install
|
||||
cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
|
||||
|
||||
# set correct depmod command for install
|
||||
sed \
|
||||
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
|
||||
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
|
||||
-i "${startdir}/${pkgname}.install"
|
||||
|
||||
# remove build and source links
|
||||
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
|
||||
# remove the firmware
|
||||
rm -rf "${pkgdir}/lib/firmware"
|
||||
# gzip -9 all modules to save 100MB of space
|
||||
find "${pkgdir}" -name '*.ko' |xargs -P 2 -n 1 gzip -9
|
||||
# make room for external modules
|
||||
ln -s "../extramodules-${_basekernel}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
|
||||
# add real version for building modules and running depmod from post_install/upgrade
|
||||
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}"
|
||||
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version"
|
||||
|
||||
# Now we call depmod...
|
||||
depmod -b "$pkgdir" -F System.map "$_kernver"
|
||||
|
||||
# move module tree /lib -> /usr/lib
|
||||
mkdir -p "${pkgdir}/usr"
|
||||
mv "$pkgdir/lib" "$pkgdir/usr"
|
||||
}
|
||||
|
||||
package_linux-headers-omap() {
|
||||
pkgdesc="Header files and scripts for building modules for linux kernel - OMAP3/4 processors"
|
||||
provides=('kernel26-headers-omap' 'linux-headers=${pkgver}')
|
||||
conflicts=('kernel26-headers-omap' 'linux-headers-tegra')
|
||||
replaces=('kernel26-headers-omap')
|
||||
|
||||
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
|
||||
|
||||
cd "${pkgdir}/usr/lib/modules/${_kernver}"
|
||||
ln -sf ../../../src/linux-${_kernver} build
|
||||
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
install -D -m644 Makefile \
|
||||
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
|
||||
install -D -m644 kernel/Makefile \
|
||||
"${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
|
||||
install -D -m644 .config \
|
||||
"${pkgdir}/usr/src/linux-${_kernver}/.config"
|
||||
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
|
||||
done
|
||||
|
||||
# copy arch includes for external modules
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
|
||||
cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-omap2
|
||||
cp -a arch/$KARCH/mach-omap2/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-omap2/
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-omap
|
||||
cp -a arch/$KARCH/plat-omap/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-omap/
|
||||
|
||||
# copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
|
||||
cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
|
||||
|
||||
# fix permissions on scripts dir
|
||||
chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
|
||||
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
|
||||
|
||||
cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
||||
|
||||
if [ "${CARCH}" = "i686" ]; then
|
||||
cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
||||
fi
|
||||
|
||||
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
|
||||
cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc sn9c102; do
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
|
||||
cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
|
||||
done
|
||||
# i2c
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
|
||||
cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
|
||||
for i in cx25840; do
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
|
||||
cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
|
||||
done
|
||||
|
||||
# add docbook makefile
|
||||
install -D -m644 Documentation/DocBook/Makefile \
|
||||
"${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
|
||||
|
||||
# add dm headers
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
||||
cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
||||
|
||||
# add inotify.h
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
|
||||
cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
|
||||
|
||||
# add wireless headers
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
||||
cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
||||
|
||||
# add dvb headers for external modules
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/9912
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
|
||||
cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
|
||||
# and...
|
||||
# http://bugs.archlinux.org/task/11194
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
||||
cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/13146
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
|
||||
cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
|
||||
|
||||
# add dvb headers
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/20402
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
|
||||
cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
|
||||
cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
|
||||
cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
|
||||
|
||||
# add xfs and shmem for aufs building
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
|
||||
cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
|
||||
|
||||
# copy in Kconfig files
|
||||
for i in `find . -name "Kconfig*"`; do
|
||||
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
|
||||
cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
|
||||
done
|
||||
|
||||
chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
|
||||
find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
|
||||
|
||||
# strip scripts directory
|
||||
find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
|
||||
case "$(file -bi "${binary}")" in
|
||||
*application/x-sharedlib*) # Libraries (.so)
|
||||
/usr/bin/strip ${STRIP_SHARED} "${binary}";;
|
||||
*application/x-archive*) # Libraries (.a)
|
||||
/usr/bin/strip ${STRIP_STATIC} "${binary}";;
|
||||
*application/x-executable*) # Binaries
|
||||
/usr/bin/strip ${STRIP_BINARIES} "${binary}";;
|
||||
esac
|
||||
done
|
||||
|
||||
# remove unneeded architectures
|
||||
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1,12 +0,0 @@
|
|||
diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
|
||||
--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300
|
||||
+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300
|
||||
@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
|
||||
|
||||
/* We show everything that is MORE important than this.. */
|
||||
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
|
||||
-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
|
||||
+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
|
||||
|
||||
DECLARE_WAIT_QUEUE_HEAD(log_wait);
|
||||
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,31 +0,0 @@
|
|||
# arg 1: the new package version
|
||||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-omap
|
||||
KERNEL_VERSION=3.7.10-5-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
echo ">>> Updating module dependencies. Please wait ..."
|
||||
depmod ${KERNEL_VERSION}
|
||||
|
||||
echo "NOTE: You will probably need to copy /boot/uImage to the first partition"
|
||||
echo " of your SD card."
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
|
||||
if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
|
||||
echo "WARNING: /boot appears to be a seperate partition but is not mounted"
|
||||
echo " This is most likely not what you want. Please mount your /boot"
|
||||
echo " partition and reinstall the kernel unless you are sure this is OK"
|
||||
fi
|
||||
fi
|
||||
|
||||
# updating module dependencies
|
||||
echo ">>> Updating module dependencies. Please wait ..."
|
||||
depmod ${KERNEL_VERSION}
|
||||
|
||||
echo "NOTE: You will probably need to copy /boot/uImage to the first partition"
|
||||
echo " of your SD card."
|
||||
}
|
||||
|
|
@ -1,204 +0,0 @@
|
|||
--- a/arch/arm/lib/memset.S
|
||||
+++ b/arch/arm/lib/memset.S
|
||||
@@ -19,9 +19,9 @@
|
||||
1: subs r2, r2, #4 @ 1 do we have enough
|
||||
blt 5f @ 1 bytes to align with?
|
||||
cmp r3, #2 @ 1
|
||||
- strltb r1, [r0], #1 @ 1
|
||||
- strleb r1, [r0], #1 @ 1
|
||||
- strb r1, [r0], #1 @ 1
|
||||
+ strltb r1, [ip], #1 @ 1
|
||||
+ strleb r1, [ip], #1 @ 1
|
||||
+ strb r1, [ip], #1 @ 1
|
||||
add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
|
||||
/*
|
||||
* The pointer is now aligned and the length is adjusted. Try doing the
|
||||
@@ -29,10 +29,14 @@
|
||||
*/
|
||||
|
||||
ENTRY(memset)
|
||||
- ands r3, r0, #3 @ 1 unaligned?
|
||||
+/*
|
||||
+ * Preserve the contents of r0 for the return value.
|
||||
+ */
|
||||
+ mov ip, r0
|
||||
+ ands r3, ip, #3 @ 1 unaligned?
|
||||
bne 1b @ 1
|
||||
/*
|
||||
- * we know that the pointer in r0 is aligned to a word boundary.
|
||||
+ * we know that the pointer in ip is aligned to a word boundary.
|
||||
*/
|
||||
orr r1, r1, r1, lsl #8
|
||||
orr r1, r1, r1, lsl #16
|
||||
@@ -43,29 +47,28 @@ ENTRY(memset)
|
||||
#if ! CALGN(1)+0
|
||||
|
||||
/*
|
||||
- * We need an extra register for this loop - save the return address and
|
||||
- * use the LR
|
||||
+ * We need 2 extra registers for this loop - use r8 and the LR
|
||||
*/
|
||||
- str lr, [sp, #-4]!
|
||||
- mov ip, r1
|
||||
+ stmfd sp!, {r8, lr}
|
||||
+ mov r8, r1
|
||||
mov lr, r1
|
||||
|
||||
2: subs r2, r2, #64
|
||||
- stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time.
|
||||
- stmgeia r0!, {r1, r3, ip, lr}
|
||||
- stmgeia r0!, {r1, r3, ip, lr}
|
||||
- stmgeia r0!, {r1, r3, ip, lr}
|
||||
+ stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time.
|
||||
+ stmgeia ip!, {r1, r3, r8, lr}
|
||||
+ stmgeia ip!, {r1, r3, r8, lr}
|
||||
+ stmgeia ip!, {r1, r3, r8, lr}
|
||||
bgt 2b
|
||||
- ldmeqfd sp!, {pc} @ Now <64 bytes to go.
|
||||
+ ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go.
|
||||
/*
|
||||
* No need to correct the count; we're only testing bits from now on
|
||||
*/
|
||||
tst r2, #32
|
||||
- stmneia r0!, {r1, r3, ip, lr}
|
||||
- stmneia r0!, {r1, r3, ip, lr}
|
||||
+ stmneia ip!, {r1, r3, r8, lr}
|
||||
+ stmneia ip!, {r1, r3, r8, lr}
|
||||
tst r2, #16
|
||||
- stmneia r0!, {r1, r3, ip, lr}
|
||||
- ldr lr, [sp], #4
|
||||
+ stmneia ip!, {r1, r3, r8, lr}
|
||||
+ ldmfd sp!, {r8, lr}
|
||||
|
||||
#else
|
||||
|
||||
@@ -74,54 +77,54 @@ ENTRY(memset)
|
||||
* whole cache lines at once.
|
||||
*/
|
||||
|
||||
- stmfd sp!, {r4-r7, lr}
|
||||
+ stmfd sp!, {r4-r8, lr}
|
||||
mov r4, r1
|
||||
mov r5, r1
|
||||
mov r6, r1
|
||||
mov r7, r1
|
||||
- mov ip, r1
|
||||
+ mov r8, r1
|
||||
mov lr, r1
|
||||
|
||||
cmp r2, #96
|
||||
- tstgt r0, #31
|
||||
+ tstgt ip, #31
|
||||
ble 3f
|
||||
|
||||
- and ip, r0, #31
|
||||
- rsb ip, ip, #32
|
||||
- sub r2, r2, ip
|
||||
- movs ip, ip, lsl #(32 - 4)
|
||||
- stmcsia r0!, {r4, r5, r6, r7}
|
||||
- stmmiia r0!, {r4, r5}
|
||||
- tst ip, #(1 << 30)
|
||||
- mov ip, r1
|
||||
- strne r1, [r0], #4
|
||||
+ and r8, ip, #31
|
||||
+ rsb r8, r8, #32
|
||||
+ sub r2, r2, r8
|
||||
+ movs r8, r8, lsl #(32 - 4)
|
||||
+ stmcsia ip!, {r4, r5, r6, r7}
|
||||
+ stmmiia ip!, {r4, r5}
|
||||
+ tst r8, #(1 << 30)
|
||||
+ mov r8, r1
|
||||
+ strne r1, [ip], #4
|
||||
|
||||
3: subs r2, r2, #64
|
||||
- stmgeia r0!, {r1, r3-r7, ip, lr}
|
||||
- stmgeia r0!, {r1, r3-r7, ip, lr}
|
||||
+ stmgeia ip!, {r1, r3-r8, lr}
|
||||
+ stmgeia ip!, {r1, r3-r8, lr}
|
||||
bgt 3b
|
||||
- ldmeqfd sp!, {r4-r7, pc}
|
||||
+ ldmeqfd sp!, {r4-r8, pc}
|
||||
|
||||
tst r2, #32
|
||||
- stmneia r0!, {r1, r3-r7, ip, lr}
|
||||
+ stmneia ip!, {r1, r3-r8, lr}
|
||||
tst r2, #16
|
||||
- stmneia r0!, {r4-r7}
|
||||
- ldmfd sp!, {r4-r7, lr}
|
||||
+ stmneia ip!, {r4-r7}
|
||||
+ ldmfd sp!, {r4-r8, lr}
|
||||
|
||||
#endif
|
||||
|
||||
4: tst r2, #8
|
||||
- stmneia r0!, {r1, r3}
|
||||
+ stmneia ip!, {r1, r3}
|
||||
tst r2, #4
|
||||
- strne r1, [r0], #4
|
||||
+ strne r1, [ip], #4
|
||||
/*
|
||||
* When we get here, we've got less than 4 bytes to zero. We
|
||||
* may have an unaligned pointer as well.
|
||||
*/
|
||||
5: tst r2, #2
|
||||
- strneb r1, [r0], #1
|
||||
- strneb r1, [r0], #1
|
||||
+ strneb r1, [ip], #1
|
||||
+ strneb r1, [ip], #1
|
||||
tst r2, #1
|
||||
- strneb r1, [r0], #1
|
||||
+ strneb r1, [ip], #1
|
||||
mov pc, lr
|
||||
ENDPROC(memset)
|
||||
--- a/arch/arm/lib/memset.S
|
||||
+++ b/arch/arm/lib/memset.S
|
||||
@@ -14,31 +14,15 @@
|
||||
|
||||
.text
|
||||
.align 5
|
||||
- .word 0
|
||||
-
|
||||
-1: subs r2, r2, #4 @ 1 do we have enough
|
||||
- blt 5f @ 1 bytes to align with?
|
||||
- cmp r3, #2 @ 1
|
||||
- strltb r1, [ip], #1 @ 1
|
||||
- strleb r1, [ip], #1 @ 1
|
||||
- strb r1, [ip], #1 @ 1
|
||||
- add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
|
||||
-/*
|
||||
- * The pointer is now aligned and the length is adjusted. Try doing the
|
||||
- * memset again.
|
||||
- */
|
||||
|
||||
ENTRY(memset)
|
||||
-/*
|
||||
- * Preserve the contents of r0 for the return value.
|
||||
- */
|
||||
- mov ip, r0
|
||||
- ands r3, ip, #3 @ 1 unaligned?
|
||||
- bne 1b @ 1
|
||||
+ ands r3, r0, #3 @ 1 unaligned?
|
||||
+ mov ip, r0 @ preserve r0 as return value
|
||||
+ bne 6f @ 1
|
||||
/*
|
||||
* we know that the pointer in ip is aligned to a word boundary.
|
||||
*/
|
||||
- orr r1, r1, r1, lsl #8
|
||||
+1: orr r1, r1, r1, lsl #8
|
||||
orr r1, r1, r1, lsl #16
|
||||
mov r3, r1
|
||||
cmp r2, #16
|
||||
@@ -127,4 +111,13 @@ ENTRY(memset)
|
||||
tst r2, #1
|
||||
strneb r1, [ip], #1
|
||||
mov pc, lr
|
||||
+
|
||||
+6: subs r2, r2, #4 @ 1 do we have enough
|
||||
+ blt 5b @ 1 bytes to align with?
|
||||
+ cmp r3, #2 @ 1
|
||||
+ strltb r1, [ip], #1 @ 1
|
||||
+ strleb r1, [ip], #1 @ 1
|
||||
+ strb r1, [ip], #1 @ 1
|
||||
+ add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
|
||||
+ b 1b
|
||||
ENDPROC(memset)
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h
|
||||
index 96a1e43..4d295a5 100644
|
||||
--- a/drivers/net/wireless/ti/wl18xx/wl18xx.h
|
||||
+++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h
|
||||
@@ -26,10 +26,10 @@
|
||||
|
||||
/* minimum FW required for driver */
|
||||
#define WL18XX_CHIP_VER 8
|
||||
-#define WL18XX_IFTYPE_VER 2
|
||||
+#define WL18XX_IFTYPE_VER 5
|
||||
#define WL18XX_MAJOR_VER 0
|
||||
#define WL18XX_SUBTYPE_VER 0
|
||||
-#define WL18XX_MINOR_VER 100
|
||||
+#define WL18XX_MINOR_VER 28
|
||||
|
||||
#define WL18XX_CMD_MAX_SIZE 740
|
||||
Loading…
Reference in a new issue