diff options
author | John Crispin <john@openwrt.org> | 2007-12-10 20:00:55 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2007-12-10 20:00:55 +0000 |
commit | f02869b17a56881d47f255546f3a1b992e7f0a8a (patch) | |
tree | 2249a427ea9a1cc5c73429040bef05632e7b1967 /target/linux/danube/patches | |
parent | 9b9b83976c64fd220fde833262f6a0c385677d3b (diff) | |
download | master-31e0f0ae-f02869b17a56881d47f255546f3a1b992e7f0a8a.tar.gz master-31e0f0ae-f02869b17a56881d47f255546f3a1b992e7f0a8a.tar.bz2 master-31e0f0ae-f02869b17a56881d47f255546f3a1b992e7f0a8a.zip |
initial merge of danube, pci is still broken and the new dma code still needs to be tested, before the merge
SVN-Revision: 9704
Diffstat (limited to 'target/linux/danube/patches')
-rw-r--r-- | target/linux/danube/patches/100-board.patch | 66 | ||||
-rw-r--r-- | target/linux/danube/patches/110-drivers.patch | 68 | ||||
-rw-r--r-- | target/linux/danube/patches/160-cfi-swap.patch | 15 |
3 files changed, 149 insertions, 0 deletions
diff --git a/target/linux/danube/patches/100-board.patch b/target/linux/danube/patches/100-board.patch new file mode 100644 index 0000000000..c73c4e7fdc --- /dev/null +++ b/target/linux/danube/patches/100-board.patch @@ -0,0 +1,66 @@ +Index: linux-2.6.23/arch/mips/Kconfig +=================================================================== +--- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-16 22:12:19.000000000 +0200 ++++ linux-2.6.23/arch/mips/Kconfig 2007-10-16 22:12:21.000000000 +0200 +@@ -58,6 +58,17 @@ + select SYS_SUPPORTS_LITTLE_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ + ++config DANUBE ++ bool "Danube support" ++ select DMA_NONCOHERENT ++ select IRQ_CPU ++ select SYS_HAS_CPU_MIPS32_R1 ++ select HAVE_STD_PC_SERIAL_PORT ++ select SYS_SUPPORTS_BIG_ENDIAN ++ select SYS_SUPPORTS_32BIT_KERNEL ++ select SYS_HAS_EARLY_PRINTK ++ select HW_HAS_PCI ++ + config MACH_DECSTATION + bool "DECstations" + select BOOT_ELF32 +@@ -605,6 +615,7 @@ + source "arch/mips/tx4927/Kconfig" + source "arch/mips/tx4938/Kconfig" + source "arch/mips/vr41xx/Kconfig" ++source "arch/mips/danube/Kconfig" + + endmenu + +Index: linux-2.6.23/arch/mips/Makefile +=================================================================== +--- linux-2.6.23.orig/arch/mips/Makefile 2007-10-16 22:12:21.000000000 +0200 ++++ linux-2.6.23/arch/mips/Makefile 2007-10-16 22:12:21.000000000 +0200 +@@ -276,6 +276,13 @@ + cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt + load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 + ++# ++# Infineon DANUBE ++# ++core-$(CONFIG_DANUBE) += arch/mips/danube/ ++cflags-$(CONFIG_DANUBE) += -Iinclude/asm-mips/mach-danube ++load-$(CONFIG_DANUBE) += 0xffffffff80002000 ++ + # + # DECstation family + # +Index: linux-2.6.23/include/asm-mips/bootinfo.h +=================================================================== +--- linux-2.6.23.orig/include/asm-mips/bootinfo.h 2007-10-16 22:12:19.000000000 +0200 ++++ linux-2.6.23/include/asm-mips/bootinfo.h 2007-10-16 22:12:21.000000000 +0200 +@@ -208,6 +208,13 @@ + #define MACH_GROUP_WINDRIVER 28 /* Windriver boards */ + #define MACH_WRPPMC 1 + ++/* ++ * Valid machtype for group ATHEROS ++ */ ++#define MACH_GROUP_DANUBE 29 ++#define MACH_INFINEON_DANUBE 0 ++ ++ + #define CL_SIZE COMMAND_LINE_SIZE + + const char *get_system_type(void); diff --git a/target/linux/danube/patches/110-drivers.patch b/target/linux/danube/patches/110-drivers.patch new file mode 100644 index 0000000000..031ece6caa --- /dev/null +++ b/target/linux/danube/patches/110-drivers.patch @@ -0,0 +1,68 @@ +Index: linux-2.6.23/drivers/serial/Kconfig +=================================================================== +--- linux-2.6.23.orig/drivers/serial/Kconfig 2007-11-04 17:29:22.000000000 +0100 ++++ linux-2.6.23/drivers/serial/Kconfig 2007-11-04 17:29:25.000000000 +0100 +@@ -1259,4 +1259,10 @@ + Currently, only 8250 compatible ports are supported, but + others can easily be added. + ++config SERIAL_DANUBE ++ bool "Danube serial driver" ++ depends on DANUBE ++ help ++ Driver for the danubes built in ASC hardware ++ + endmenu +Index: linux-2.6.23/drivers/serial/Makefile +=================================================================== +--- linux-2.6.23.orig/drivers/serial/Makefile 2007-11-04 17:29:22.000000000 +0100 ++++ linux-2.6.23/drivers/serial/Makefile 2007-11-04 17:29:25.000000000 +0100 +@@ -64,3 +64,4 @@ + obj-$(CONFIG_SERIAL_NETX) += netx-serial.o + obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o + obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o ++obj-$(CONFIG_SERIAL_DANUBE) += danube_asc.o +Index: linux-2.6.23/drivers/mtd/maps/Makefile +=================================================================== +--- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-11-04 17:29:22.000000000 +0100 ++++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-11-04 17:29:25.000000000 +0100 +@@ -71,3 +71,4 @@ + obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o + obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o + obj-$(CONFIG_MTD_TQM834x) += tqm834x.o ++obj-$(CONFIG_MTD_DANUBE) += danube.o +Index: linux-2.6.23/drivers/net/Kconfig +=================================================================== +--- linux-2.6.23.orig/drivers/net/Kconfig 2007-11-04 17:29:25.000000000 +0100 ++++ linux-2.6.23/drivers/net/Kconfig 2007-11-11 16:48:24.000000000 +0100 +@@ -339,6 +339,18 @@ + + source "drivers/net/arm/Kconfig" + ++config DANUBE_MII0 ++ tristate "Infineon Danube eth0 driver" ++ depends on DANUBE ++ help ++ Support for the MII0 inside the Danube SOC ++ ++config DANUBE_MII1 ++ tristate "Infineon Danube eth1 driver" ++ depends on DANUBE ++ help ++ Support for the MII1 inside the Danube SOC ++ + config AX88796 + tristate "ASIX AX88796 NE2000 clone support" + depends on ARM || MIPS +Index: linux-2.6.23/drivers/net/Makefile +=================================================================== +--- linux-2.6.23.orig/drivers/net/Makefile 2007-11-04 17:29:25.000000000 +0100 ++++ linux-2.6.23/drivers/net/Makefile 2007-11-11 16:47:14.000000000 +0100 +@@ -208,6 +208,7 @@ + obj-$(CONFIG_FEC_8XX) += fec_8xx/ + obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o + obj-$(CONFIG_MLX4_CORE) += mlx4/ ++obj-$(CONFIG_DANUBE_MII0) += danube_mii0.o + + obj-$(CONFIG_MACB) += macb.o + diff --git a/target/linux/danube/patches/160-cfi-swap.patch b/target/linux/danube/patches/160-cfi-swap.patch new file mode 100644 index 0000000000..ca70928713 --- /dev/null +++ b/target/linux/danube/patches/160-cfi-swap.patch @@ -0,0 +1,15 @@ +Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c +=================================================================== +--- linux-2.6.23.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:02:29.000000000 +0100 ++++ linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:07:15.000000000 +0100 +@@ -1007,7 +1007,9 @@ + int ret = 0; + map_word oldd; + int retry_cnt = 0; +- ++#ifdef CONFIG_DANUBE ++ adr ^= 2; ++#endif + adr += chip->start; + + spin_lock(chip->mutex); |