aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-07-05 14:39:13 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-07-05 14:39:13 +0000
commitf74d16548d4bb98910647c8d6ab2a9198bb32955 (patch)
treeb8ba53f513ef4959cba78396934e2d4aa5852feb /target
parent62e10e70175e71ac7c214b3158b9d20b30539b3b (diff)
downloadupstream-f74d16548d4bb98910647c8d6ab2a9198bb32955.tar.gz
upstream-f74d16548d4bb98910647c8d6ab2a9198bb32955.tar.bz2
upstream-f74d16548d4bb98910647c8d6ab2a9198bb32955.zip
update targets to 2.6.30.1, update patches
SVN-Revision: 16697
Diffstat (limited to 'target')
-rw-r--r--target/linux/avr32/Makefile2
-rw-r--r--target/linux/cobalt/Makefile4
-rw-r--r--target/linux/etrax/Makefile2
-rw-r--r--target/linux/gemini/Makefile2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch18
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch4
-rw-r--r--target/linux/goldfish/Makefile2
-rw-r--r--target/linux/kirkwood/Makefile2
-rw-r--r--target/linux/kirkwood/patches/002-mvsdio_delay.patch14
-rw-r--r--target/linux/octeon/Makefile2
-rw-r--r--target/linux/octeon/patches/105-nb5_fixup.patch2
-rw-r--r--target/linux/rb532/Makefile2
-rw-r--r--target/linux/sibyte/Makefile2
-rw-r--r--target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch10
14 files changed, 19 insertions, 49 deletions
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 8e23fe96f6..26bed1627d 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -10,7 +10,7 @@ ARCH:=avr32
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile
index ece8eb9550..0569e9ab2d 100644
--- a/target/linux/cobalt/Makefile
+++ b/target/linux/cobalt/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
ARCH:=mipsel
BOARD:=cobalt
BOARDNAME:=Cobalt Microservers
-FEATURES:=tgz pci
+FEATURES:=tgz pci ext2
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile
index ec81d9f754..bb8591bf3d 100644
--- a/target/linux/etrax/Makefile
+++ b/target/linux/etrax/Makefile
@@ -10,7 +10,7 @@ ARCH:=cris
BOARD:=etrax
BOARDNAME:=Foxboard (ETRAX 100LX)
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile
index bcc0a4a2b9..bc418b4f1b 100644
--- a/target/linux/gemini/Makefile
+++ b/target/linux/gemini/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cortina Systems CS351x
FEATURES:=squashfs
CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch
index e71bf48f21..ffd0af5f19 100644
--- a/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch
@@ -6,11 +6,9 @@ precious blocks on an embedded system.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 65d3b19..a467ee5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -811,6 +811,17 @@ config I8259
+@@ -791,6 +791,17 @@ config I8259
config MIPS_BONITO64
bool
@@ -28,8 +26,6 @@ index 65d3b19..a467ee5 100644
config MIPS_MSC
bool
-diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile
-index d547efd..7fdef24 100644
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -2,12 +2,14 @@
@@ -49,8 +45,6 @@ index d547efd..7fdef24 100644
+ dp_sqrt.o sp_sqrt.o
EXTRA_CFLAGS += -Werror
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index 890f779..9f4c767 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -56,6 +56,12 @@
@@ -77,7 +71,7 @@ index 890f779..9f4c767 100644
/* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */
-@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
+@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig;
}
@@ -91,11 +85,9 @@ index 890f779..9f4c767 100644
#ifdef CONFIG_DEBUG_FS
extern struct dentry *mips_debugfs_dir;
-diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
-index df7b9d9..9b42bfd 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
+@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
return SIGILL; /* force out of emulation loop */
}
@@ -113,8 +105,6 @@ index df7b9d9..9b42bfd 100644
+ return 0;
+}
+#endif /* CONFIG_MIPS_FPU_EMU */
-diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
-index 52e6c58..211a399 100644
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -29,6 +29,7 @@
@@ -125,7 +115,7 @@ index 52e6c58..211a399 100644
void fpu_emulator_init_fpu(void)
{
static int first = 1;
-@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
+@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struc
return err;
}
diff --git a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch
index 01fa4310b2..8eaead9292 100644
--- a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch
@@ -8,7 +8,7 @@
static int debug;
/* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -857,7 +858,7 @@ int usb_serial_probe(struct usb_interfac
+@@ -864,7 +865,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}
@@ -17,7 +17,7 @@
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1312,3 +1313,5 @@ MODULE_LICENSE("GPL");
+@@ -1309,3 +1310,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/target/linux/goldfish/Makefile b/target/linux/goldfish/Makefile
index 08fdb6b579..78a936596e 100644
--- a/target/linux/goldfish/Makefile
+++ b/target/linux/goldfish/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Goldfish (Android Emulator)
FEATURES:=
CFLAGS:=-O2 -pipe -march=armv5te -mtune=xscale -funit-at-a-time
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
DEVICE_TYPE=phone
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 48c173ab72..e6bbef259b 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -11,7 +11,7 @@ BOARD:=kirkwood
BOARDNAME:=Marvell Kirkwood
FEATURES:=tgz usb
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/kirkwood/patches/002-mvsdio_delay.patch b/target/linux/kirkwood/patches/002-mvsdio_delay.patch
index ee730306aa..3f7c56e032 100644
--- a/target/linux/kirkwood/patches/002-mvsdio_delay.patch
+++ b/target/linux/kirkwood/patches/002-mvsdio_delay.patch
@@ -16,20 +16,6 @@
err = mmc_sd_switch(card, 1, 0, 1, status);
if (err)
goto out;
---- a/drivers/mmc/host/mvsdio.c
-+++ b/drivers/mmc/host/mvsdio.c
-@@ -620,9 +620,11 @@ static void mvsd_set_ios(struct mmc_host
- if (ios->bus_width == MMC_BUS_WIDTH_4)
- ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS;
-
-+#if 0
- if (ios->timing == MMC_TIMING_MMC_HS ||
- ios->timing == MMC_TIMING_SD_HS)
- ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN;
-+#endif
-
- host->ctrl = ctrl_reg;
- mvsd_write(MVSD_HOST_CTRL, ctrl_reg);
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -286,9 +286,9 @@ void mmc_set_data_timeout(struct mmc_dat
diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
index 96a322667e..4c43148e6c 100644
--- a/target/linux/octeon/Makefile
+++ b/target/linux/octeon/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Octeon
FEATURES:=squashfs jffs2 pci
CFLAGS:=-Os -pipe -funit-at-a-time
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/octeon/patches/105-nb5_fixup.patch b/target/linux/octeon/patches/105-nb5_fixup.patch
index c28adf32f1..2165eb0a1b 100644
--- a/target/linux/octeon/patches/105-nb5_fixup.patch
+++ b/target/linux/octeon/patches/105-nb5_fixup.patch
@@ -9,7 +9,7 @@
default:
return "";
}
---- a/drviers/staging/octeon/cvmx-helper-board.c
+--- a/drivers/staging/octeon/cvmx-helper-board.c
+++ b/drivers/staging/octeon/cvmx-helper-board.c
@@ -699,6 +699,7 @@ cvmx_helper_board_usb_clock_types_t __cv
{
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index 638aa2e952..175ed4eecf 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -11,7 +11,7 @@ BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci tgz
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += hostapd-mini kmod-madwifi
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index 018539da3a..934b99e19f 100644
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Broadcom/SiByte SB-1
FEATURES:=fpu
CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch b/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch
index e9d63113fd..2c46ccf66d 100644
--- a/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch
+++ b/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch
@@ -103,7 +103,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
-lib-$(CONFIG_SIBYTE_CFE_CONSOLE) += console.o
--- a/arch/mips/sibyte/cfe/setup.c
+++ /dev/null
-@@ -1,350 +0,0 @@
+@@ -1,344 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002, 2003 Broadcom Corporation
- *
@@ -394,13 +394,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
- */
- cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
- if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, CL_SIZE) < 0) {
-- if (argc < 0) {
-- /*
-- * It's OK for direct boot to not provide a
-- * command line
-- */
-- strcpy(arcs_cmdline, "root=/dev/ram0 ");
-- } else {
+- if (argc >= 0) {
- /* The loader should have set the command line */
- /* too early for panic to do any good */
- printk("LINUX_CMDLINE not defined in cfe.");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:31:55 +0000