From ba30e23bbc9ab366184e8738847a45bc5cf05dba Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 17 May 2010 22:05:07 +0000 Subject: [PATCH] Add checksum for 2.6.34, refresh 2.6.34 patches and update targets from 2.6.34-rcX to 2.6.34 SVN-Revision: 21498 --- include/kernel-version.mk | 5 +++-- .../patches-2.6.34/021-mips_image_cmdline_hack.patch | 2 +- .../generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch | 6 +++--- .../generic-2.6/patches-2.6.34/150-netfilter_imq.patch | 8 ++++---- .../generic-2.6/patches-2.6.34/620-phy_adm6996.patch | 4 ++-- .../generic-2.6/patches-2.6.34/660-phy_mvswitch.patch | 2 +- .../linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch | 2 +- .../linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch | 2 +- .../generic-2.6/patches-2.6.34/690-phy_rtl8306.patch | 2 +- .../generic-2.6/patches-2.6.34/691-phy_rtl8366.patch | 2 +- target/linux/mx2/Makefile | 2 +- target/linux/xburst/Makefile | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index fbf934ae67..2e6d141115 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -26,10 +26,11 @@ endif ifeq ($(LINUX_VERSION),2.6.33.3) LINUX_KERNEL_MD5SUM:=f651e9aafb2f910812257a63bcd639f2 endif -ifeq ($(LINUX_VERSION),2.6.34-rc5) - LINUX_KERNEL_MD5SUM:=c09ea93cd4e2684ebb506866c65a4c9f +ifeq ($(LINUX_VERSION),2.6.34) + LINUX_KERNEL_MD5SUM:=10eebcb0178fb4540e2165bfd7efc7ad endif + # disable the md5sum check for unknown kernel versions LINUX_KERNEL_MD5SUM?=x diff --git a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch index 00de8d5450..a304f0bcc7 100644 --- a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -854,6 +854,10 @@ config SYNC_R4K +@@ -856,6 +856,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch index e6b764e2df..a65be6f2cf 100644 --- a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch +++ b/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch @@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli -- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -839,6 +839,17 @@ config I8259 +@@ -841,6 +841,17 @@ config I8259 config MIPS_BONITO64 bool @@ -70,7 +70,7 @@ Signed-off-by: Florian Fainelli /* Control registers */ #define FPCREG_RID 0 /* $0 = revision id */ -@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r +@@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r return sig; } @@ -78,7 +78,7 @@ Signed-off-by: Florian Fainelli #ifdef CONFIG_DEBUG_FS static int fpuemu_stat_get(void *data, u64 *val) -@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void) +@@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void) return 0; } __initcall(debugfs_fpuemu); diff --git a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch index 71554d1d3f..8a0507fa01 100644 --- a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch @@ -945,7 +945,7 @@ #include #include #include -@@ -1860,7 +1863,11 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -1859,7 +1862,11 @@ int dev_hard_start_xmit(struct sk_buff * int rc = NETDEV_TX_OK; if (likely(!skb->next)) { @@ -958,7 +958,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1970,8 +1977,7 @@ static inline u16 dev_cap_txqueue(struct +@@ -1969,8 +1976,7 @@ static inline u16 dev_cap_txqueue(struct return queue_index; } @@ -968,7 +968,7 @@ { u16 queue_index; struct sock *sk = skb->sk; -@@ -2001,6 +2007,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -2000,6 +2006,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } @@ -1183,7 +1183,7 @@ /* return EBUSY when somebody else is registered, return EEXIST if the * same handler is registered, return 0 in case of success. */ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh) -@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const +@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const } EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers); diff --git a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch index b3e469a8d6..86bab7a1eb 100644 --- a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch +++ b/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY +@@ -93,6 +93,11 @@ config MICREL_PHY ---help--- - Supports the LSI ET1011C PHY. + Supports the KSZ9021, VSC8201, KS8001 PHYs. +config ADM6996_PHY + tristate "Driver for ADM6996 switches" diff --git a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch index 36551fd570..f5ff558b0f 100644 --- a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch +++ b/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -99,6 +99,9 @@ config ADM6996_PHY +@@ -104,6 +104,9 @@ config ADM6996_PHY ---help--- Currently supports the ADM6996F switch diff --git a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch index 862868c8d1..e8c57cada0 100644 --- a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch +++ b/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -102,6 +102,10 @@ config ADM6996_PHY +@@ -107,6 +107,10 @@ config ADM6996_PHY config MVSWITCH_PHY tristate "Driver for Marvell 88E6060 switches" diff --git a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch index 00372aae0e..2bc9d6754d 100644 --- a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch +++ b/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -106,6 +106,10 @@ config IP175C_PHY +@@ -111,6 +111,10 @@ config IP175C_PHY tristate "Driver for IC+ IP175C/IP178C switches" select SWCONFIG diff --git a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch index a4793cb63b..9e86748a86 100644 --- a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch +++ b/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -110,6 +110,10 @@ config AR8216_PHY +@@ -115,6 +115,10 @@ config AR8216_PHY tristate "Driver for Atheros AR8216 switches" select SWCONFIG diff --git a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch index 0963bd81be..ec07636308 100644 --- a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch +++ b/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -152,4 +152,29 @@ config MDIO_OCTEON +@@ -157,4 +157,29 @@ config MDIO_OCTEON If in doubt, say Y. diff --git a/target/linux/mx2/Makefile b/target/linux/mx2/Makefile index 9ccf2cbed6..7690e4e504 100644 --- a/target/linux/mx2/Makefile +++ b/target/linux/mx2/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Freescale MX2 FEATURES:=jffs2 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time -LINUX_VERSION:=2.6.34-rc5 +LINUX_VERSION:=2.6.34 DEVICE_TYPE=phone diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 3a68cabe95..05b41da62d 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst FEATURES:=jffs2 targz ubifs audio SUBTARGETS:=qi_lb60 n516 n526 -LINUX_VERSION:=2.6.34-rc7 +LINUX_VERSION:=2.6.34 DEVICE_TYPE=other -- 2.25.1