summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-08-12 16:40:34 +0000
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-08-12 16:40:34 +0000
commit6c6bf818df3770d5fbe1f10432339d6f841148c5 (patch)
tree5b65eaac0359fd7abd863154e9c7bfbd7572108f
parent20bcdee75725341792ea72eeacec54202dddf4e8 (diff)
parentb348d71be248a6c92fbeaae30dddcba303221444 (diff)
merge of '41f08fea37c410bb9ff7093f2c2d35572c69171c'
and 'b2242c9c486da6354ad533ce32c14a76e3ef9b69'
-rw-r--r--packages/madwifi/files/10-xscale-be-elf-copts.patch10
-rw-r--r--packages/madwifi/files/10-xscale-le-elf-copts.patch6
-rw-r--r--packages/madwifi/madwifi-ng_r1692-20060723.bb2
3 files changed, 10 insertions, 8 deletions
diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch
index e3158c045c..84915e03e2 100644
--- a/packages/madwifi/files/10-xscale-be-elf-copts.patch
+++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch
@@ -1,8 +1,10 @@
--- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030
+++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930
-@@ -73,4 +73,4 @@
+@@ -77,5 +77,5 @@
+
LDOPTS= -EB
- COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC
- COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
+ COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
- -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2
-+ -mtune=xscale -malignment-traps -msoft-float -mfp=2
++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \
++ -mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch
index 393167c165..7ab46e16b3 100644
--- a/packages/madwifi/files/10-xscale-le-elf-copts.patch
+++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch
@@ -1,8 +1,8 @@
--- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930
+++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930
-@@ -74,4 +74,4 @@
+@@ -79,4 +79,4 @@
LDOPTS= -EL
- COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN -DAH_REGOPS_FUNC
+ COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
- -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2
-+ -mapcs-32 -mtune=xscale -malignment-traps -msoft-float -mfp=2
++ -mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb
index 84af37257d..6268f2b78f 100644
--- a/packages/madwifi/madwifi-ng_r1692-20060723.bb
+++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb
@@ -1,2 +1,2 @@
require madwifi-ng_r.inc
-PR="r0"
+PR="r1"