From 1ea0811e40a4d58713740bba234fa6cba02c1c86 Mon Sep 17 00:00:00 2001 From: rajkosto Date: Wed, 29 Sep 2010 08:44:20 +0200 Subject: [PATCH 1/2] specialize htcleo build for cortex a8 --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index cea78efc..dd9f0cbc 100644 --- a/Makefile +++ b/Makefile @@ -522,6 +522,10 @@ endif # $(dot-config) # Defaults vmlinux but it is usually overridden in the arch makefile all: vmlinux +#ifdef CONFIG_MACH_HTCLEO +KBUILD_CFLAGS += -mcpu=cortex-a8 -march=armv7-a -mtune=cortex-a8 -mfpu=vfpv3 +#endif + ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os else From 71d0534681d277aaf6f457d81d24a95f4ed7bd08 Mon Sep 17 00:00:00 2001 From: rajkosto Date: Wed, 29 Sep 2010 08:47:30 +0200 Subject: [PATCH 2/2] fix gcc compiler warning in wifi driver --- drivers/net/wireless/bcm4329/linux_osl.c | 3 ++- drivers/net/wireless/bcm4329_204/linux_osl.c | 3 ++- drivers/net/wireless/bcm4329_245/linux_osl.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/bcm4329/linux_osl.c b/drivers/net/wireless/bcm4329/linux_osl.c index 6383e004..bb4d817a 100644 --- a/drivers/net/wireless/bcm4329/linux_osl.c +++ b/drivers/net/wireless/bcm4329/linux_osl.c @@ -360,7 +360,8 @@ osl_pktfree_static(osl_t *osh, void *p, bool send) for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++) { - if (p == bcm_static_skb->skb_4k[i]) + if ( (i < MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_4k[i]) || + (i >= MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_8k[i-MAX_STATIC_PKT_NUM]) ) { down(&bcm_static_skb->osl_pkt_sem); bcm_static_skb->pkt_use[i] = 0; diff --git a/drivers/net/wireless/bcm4329_204/linux_osl.c b/drivers/net/wireless/bcm4329_204/linux_osl.c index 9d5f19c5..25a6a14a 100644 --- a/drivers/net/wireless/bcm4329_204/linux_osl.c +++ b/drivers/net/wireless/bcm4329_204/linux_osl.c @@ -360,7 +360,8 @@ osl_pktfree_static(osl_t *osh, void *p, bool send) for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++) { - if (p == bcm_static_skb->skb_4k[i]) + if ( (i < MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_4k[i]) || + (i >= MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_8k[i-MAX_STATIC_PKT_NUM]) ) { down(&bcm_static_skb->osl_pkt_sem); bcm_static_skb->pkt_use[i] = 0; diff --git a/drivers/net/wireless/bcm4329_245/linux_osl.c b/drivers/net/wireless/bcm4329_245/linux_osl.c index 242af39e..1cd70861 100644 --- a/drivers/net/wireless/bcm4329_245/linux_osl.c +++ b/drivers/net/wireless/bcm4329_245/linux_osl.c @@ -360,7 +360,8 @@ osl_pktfree_static(osl_t *osh, void *p, bool send) for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++) { - if (p == bcm_static_skb->skb_4k[i]) + if ( (i < MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_4k[i]) || + (i >= MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_8k[i-MAX_STATIC_PKT_NUM]) ) { down(&bcm_static_skb->osl_pkt_sem); bcm_static_skb->pkt_use[i] = 0;