aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2006-10-27 10:26:00 +0000
committerImre Kaloz <kaloz@openwrt.org>2006-10-27 10:26:00 +0000
commit2d2179f503930a0f04673205a97161f015cf42c9 (patch)
treeaec3aa108729cf194c136832fe37ae219dcff795
parent5d434d99598e0f50e031102dc7618849f2f4bc19 (diff)
downloadupstream-2d2179f503930a0f04673205a97161f015cf42c9.tar.gz
upstream-2d2179f503930a0f04673205a97161f015cf42c9.tar.bz2
upstream-2d2179f503930a0f04673205a97161f015cf42c9.zip
rename the xscale target to ixp4xx for the forthcoming iop target, add gcc 4.1 patch for arm
SVN-Revision: 5310
-rw-r--r--include/target.mk2
-rw-r--r--target/Config.in4
-rw-r--r--target/image/ixp4xx/Makefile (renamed from target/image/xscale/Makefile)0
-rw-r--r--target/linux/ixp4xx-2.6/Makefile (renamed from target/linux/xscale-2.6/Makefile)0
-rw-r--r--target/linux/ixp4xx-2.6/config (renamed from target/linux/xscale-2.6/config)0
-rw-r--r--target/linux/ixp4xx-2.6/patches/001-gateway_7001.patch (renamed from target/linux/xscale-2.6/patches/001-gateway_7001.patch)0
-rw-r--r--toolchain/gcc/Config.version4
-rw-r--r--toolchain/uClibc/patches/170-arm_gcc41.patch13
8 files changed, 17 insertions, 6 deletions
diff --git a/include/target.mk b/include/target.mk
index 55b6364289..614ab06df8 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -22,7 +22,7 @@ $(eval $(call kernel_template,2.6,uml,2_6_UML))
$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
-$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
+$(eval $(call kernel_template,2.6,ixp4xx,2_6_IXP4XX))
$(eval $(call kernel_template,2.6,magicbox,2_6_MAGICBOX))
$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
diff --git a/target/Config.in b/target/Config.in
index a69c2249fe..647aa12b36 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -78,8 +78,8 @@ config LINUX_2_6_BRCM63XX
Build firmware images for Broadcom based xDSL/routers
(e.g. Inventel Livebox, Siemens SE515)
-config LINUX_2_6_XSCALE
- bool "Intel XScale [2.6]"
+config LINUX_2_6_IXP4XX
+ bool "Intel XScale IXP4xx [2.6]"
select armeb
select LINUX_2_6
select PCI_SUPPORT
diff --git a/target/image/xscale/Makefile b/target/image/ixp4xx/Makefile
index 23a0644338..23a0644338 100644
--- a/target/image/xscale/Makefile
+++ b/target/image/ixp4xx/Makefile
diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/ixp4xx-2.6/Makefile
index 323eb2c3f4..323eb2c3f4 100644
--- a/target/linux/xscale-2.6/Makefile
+++ b/target/linux/ixp4xx-2.6/Makefile
diff --git a/target/linux/xscale-2.6/config b/target/linux/ixp4xx-2.6/config
index f28ecef50e..f28ecef50e 100644
--- a/target/linux/xscale-2.6/config
+++ b/target/linux/ixp4xx-2.6/config
diff --git a/target/linux/xscale-2.6/patches/001-gateway_7001.patch b/target/linux/ixp4xx-2.6/patches/001-gateway_7001.patch
index d144758b24..d144758b24 100644
--- a/target/linux/xscale-2.6/patches/001-gateway_7001.patch
+++ b/target/linux/ixp4xx-2.6/patches/001-gateway_7001.patch
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index af5e102807..f4d71971a6 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -12,9 +12,7 @@ config GCC_VERSION
if !TOOLCHAINOPTS
config GCC_VERSION_4_1_1
- default y if LINUX_2_6_ARUBA || LINUX_2_6_X86 || LINUX_2_6_RB532
- config GCC_VERSION_4_0_3
- default y if LINUX_2_6_XSCALE
+ default y if LINUX_2_6_ARUBA || LINUX_2_6_X86 || LINUX_2_6_RB532 || LINUX_2_6_IXP4XX
endif
diff --git a/toolchain/uClibc/patches/170-arm_gcc41.patch b/toolchain/uClibc/patches/170-arm_gcc41.patch
new file mode 100644
index 0000000000..795efbd2df
--- /dev/null
+++ b/toolchain/uClibc/patches/170-arm_gcc41.patch
@@ -0,0 +1,13 @@
+diff -ur uClibc-0.9.28/ldso/include/dl-string.h uClibc-0.9.28-owrt/ldso/include/dl-string.h
+--- uClibc-0.9.28/ldso/include/dl-string.h 2005-08-18 00:49:41.000000000 +0200
++++ uClibc-0.9.28-owrt/ldso/include/dl-string.h 2006-09-11 11:42:08.000000000 +0200
+@@ -228,7 +228,8 @@
+ char temp;
+ do_rem(temp, i, 10);
+ *--p = '0' + temp;
+- i /= 10;
++ i /= 2;
++ i *= -(-1ul / 5ul);
+ } while (i > 0);
+ return p;
+ }