1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 07:48:59 +02:00

[AR7] Update kernel to 2.6.24

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10421 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
matteo 2008-02-08 17:17:45 +00:00
parent 6517ef0aa1
commit b5a8de15ed
4 changed files with 10 additions and 1306 deletions

View File

@ -1,4 +1,4 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@ -11,7 +11,7 @@ BOARD:=ar7
BOARDNAME:=TI AR7
FEATURES:=squashfs jffs2 atm
LINUX_VERSION:=2.6.23.1
LINUX_VERSION:=2.6.24
include $(INCLUDE_DIR)/target.mk

View File

@ -15,8 +15,8 @@ CONFIG_BITREVERSE=y
CONFIG_BOOT_ELF32=y
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BT is not set
CONFIG_CEVT_R4K=y
CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
CONFIG_CPMAC=y
# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_PREFETCH=y
@ -47,6 +47,7 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
# CONFIG_CRYPTO_HW is not set
CONFIG_CSRC_R4K=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
@ -151,7 +152,6 @@ CONFIG_PHYLIB=y
CONFIG_RTC_LIB=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_WAIT_SCAN=m
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SGI_IP22 is not set

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +1,16 @@
--- linux-2.6.24/drivers/net/Kconfig 2008-02-07 02:29:04.000000000 +0100
+++ linux-2.6.24/drivers/net/Kconfig 2008-02-07 02:29:35.000000000 +0100
@@ -1830,10 +1830,8 @@
config CPMAC
--- linux-2.6.24/drivers/net/Kconfig 2008-01-25 02:20:37.000000000 +0100
+++ linux-2.6.24/drivers/net/Kconfig 2008-02-08 18:12:02.000000000 +0100
@@ -1709,8 +1709,6 @@
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
- depends on NET_ETHERNET && EXPERIMENTAL && AR7
+ depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
depends on NET_ETHERNET && EXPERIMENTAL && AR7
select PHYLIB
- select FIXED_PHY
- select FIXED_MII_100_FDX
help
TI AR7 CPMAC Ethernet support
--- linux-2.6.24/drivers/net/cpmac.c 2008-01-24 23:58:37.000000000 +0100
+++ linux-2.6.24/drivers/net/cpmac.c 2008-02-07 02:32:57.000000000 +0100
--- linux-2.6.24/drivers/net/cpmac.c 2008-01-25 02:20:37.000000000 +0100
+++ linux-2.6.24/drivers/net/cpmac.c 2008-02-08 18:05:35.000000000 +0100
@@ -661,9 +661,6 @@
int queue;
u32 status;