X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/518b748f5f32f38f884fdacab607662d9eef67a3..fdb67f01dfbe2d6c79f7433f55baef1786d74d0c:/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch

diff --git a/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch
index 95811694d..33be31383 100644
--- a/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch
@@ -1,9 +1,7 @@
-Index: linux-2.6.33/arch/mips/Makefile
-===================================================================
---- linux-2.6.33.orig/arch/mips/Makefile	2010-02-28 16:43:15.000000000 +0100
-+++ linux-2.6.33/arch/mips/Makefile	2010-02-28 16:45:56.397211344 +0100
-@@ -637,6 +637,13 @@
- load-$(CONFIG_CPU_CAVIUM_OCTEON) 	+= 0xffffffff81100000
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -168,6 +168,13 @@ ifeq (,$(findstring march=octeon, $(cfla
+ cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
  endif
  
 +#
@@ -13,14 +11,12 @@ Index: linux-2.6.33/arch/mips/Makefile
 +cflags-$(CONFIG_ATHEROS_AR71XX)	+= -I$(srctree)/arch/mips/include/asm/mach-ar71xx
 +load-$(CONFIG_ATHEROS_AR71XX)	+= 0xffffffff80060000
 +
- # temporary until string.h is fixed
- cflags-y += -ffreestanding
- 
-Index: linux-2.6.33/arch/mips/Kconfig
-===================================================================
---- linux-2.6.33.orig/arch/mips/Kconfig	2010-02-28 16:43:15.000000000 +0100
-+++ linux-2.6.33/arch/mips/Kconfig	2010-02-28 16:46:56.150331076 +0100
-@@ -48,6 +48,23 @@
+ cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)
+ cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)
+ cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS)	+= $(call cc-option,-mno-daddi,)
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -48,6 +48,23 @@ config AR7
  	  Support for the Texas Instruments AR7 System-on-a-Chip
  	  family: TNETD7100, 7200 and 7300.
  
@@ -44,7 +40,7 @@ Index: linux-2.6.33/arch/mips/Kconfig
  config BCM47XX
  	bool "BCM47XX based boards"
  	select CEVT_R4K
-@@ -682,6 +699,7 @@
+@@ -682,6 +699,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
  endchoice
  
  source "arch/mips/alchemy/Kconfig"