From 17c7b6c3fdc48301e50d22cc6138ede16bd1be24 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 6 Sep 2007 16:27:37 +0000 Subject: strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX__ becomes CONFIG_TARGET_, same for profiles. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8653 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/amazon/patches/017-wdt-driver.patch | 10 ++++ target/linux/amazon/patches/100-board.patch | 63 ++++++++++++++++++++++ target/linux/amazon/patches/110-char_drivers.patch | 12 +++++ target/linux/amazon/patches/130-mtd_drivers.patch | 9 ++++ target/linux/amazon/patches/140-net_drivers.patch | 10 ++++ .../linux/amazon/patches/150-serial_driver.patch | 12 +++++ target/linux/amazon/patches/160-cfi-swap.patch | 14 +++++ 7 files changed, 130 insertions(+) create mode 100644 target/linux/amazon/patches/017-wdt-driver.patch create mode 100644 target/linux/amazon/patches/100-board.patch create mode 100644 target/linux/amazon/patches/110-char_drivers.patch create mode 100644 target/linux/amazon/patches/130-mtd_drivers.patch create mode 100644 target/linux/amazon/patches/140-net_drivers.patch create mode 100644 target/linux/amazon/patches/150-serial_driver.patch create mode 100644 target/linux/amazon/patches/160-cfi-swap.patch (limited to 'target/linux/amazon/patches') diff --git a/target/linux/amazon/patches/017-wdt-driver.patch b/target/linux/amazon/patches/017-wdt-driver.patch new file mode 100644 index 000000000..b915ebe51 --- /dev/null +++ b/target/linux/amazon/patches/017-wdt-driver.patch @@ -0,0 +1,10 @@ +--- linux-2.6.21.5/drivers/char/watchdog/Makefile.orig 2007-08-05 11:13:29.177013987 +0200 ++++ linux-2.6.21.5/drivers/char/watchdog/Makefile 2007-08-05 11:13:52.190325445 +0200 +@@ -74,6 +74,7 @@ + # MIPS Architecture + obj-$(CONFIG_INDYDOG) += indydog.o + obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o ++obj-$(CONFIG_AMAZON_WDT) += amazon_wdt.o + + # S390 Architecture + diff --git a/target/linux/amazon/patches/100-board.patch b/target/linux/amazon/patches/100-board.patch new file mode 100644 index 000000000..9b2914123 --- /dev/null +++ b/target/linux/amazon/patches/100-board.patch @@ -0,0 +1,63 @@ +diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig +--- linux.old/arch/mips/Kconfig 2007-02-02 23:55:52.912446784 +0100 ++++ linux.dev/arch/mips/Kconfig 2007-02-03 21:50:25.262027104 +0100 +@@ -145,6 +145,17 @@ + note that a kernel built with this option selected will not be + able to run on normal units. + ++config AMAZON ++ bool "Amazon support (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ 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 ++ + config MIPS_COBALT + bool "Cobalt Server" + select DMA_NONCOHERENT +@@ -766,6 +776,7 @@ + + endchoice + ++source "arch/mips/amazon/Kconfig" + source "arch/mips/ddb5xxx/Kconfig" + source "arch/mips/gt64120/ev64120/Kconfig" + source "arch/mips/jazz/Kconfig" +diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile +--- linux.old/arch/mips/Makefile 2007-02-02 23:55:52.913446632 +0100 ++++ linux.dev/arch/mips/Makefile 2007-02-03 17:40:29.193776000 +0100 +@@ -267,6 +267,13 @@ + load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 + + # ++# Infineon AMAZON ++# ++core-$(CONFIG_AMAZON) += arch/mips/amazon/ ++cflags-$(CONFIG_AMAZON) += -Iinclude/asm-mips/mach-amazon ++load-$(CONFIG_AMAZON) += 0xffffffff80002000 ++ ++# + # Cobalt Server + # + core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ +diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h +--- linux.old/include/asm-mips/bootinfo.h 2007-02-02 23:55:52.913446632 +0100 ++++ linux.dev/include/asm-mips/bootinfo.h 2007-02-03 17:51:02.531494032 +0100 +@@ -212,6 +212,12 @@ + #define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */ + #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */ + ++/* ++ * Valid machtype for group ATHEROS ++ */ ++#define MACH_GROUP_INFINEON 27 ++#define MACH_INFINEON_AMAZON 0 ++ + #define CL_SIZE COMMAND_LINE_SIZE + + const char *get_system_type(void); + diff --git a/target/linux/amazon/patches/110-char_drivers.patch b/target/linux/amazon/patches/110-char_drivers.patch new file mode 100644 index 000000000..73949646f --- /dev/null +++ b/target/linux/amazon/patches/110-char_drivers.patch @@ -0,0 +1,12 @@ +Index: linux-2.6.21.5/drivers/char/Makefile +=================================================================== +--- linux-2.6.21.5.orig/drivers/char/Makefile 2007-06-24 07:44:10.606341712 +0200 ++++ linux-2.6.21.5/drivers/char/Makefile 2007-06-24 07:44:46.633864696 +0200 +@@ -103,6 +103,7 @@ + + obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o + obj-$(CONFIG_TCG_TPM) += tpm/ ++obj-$(CONFIG_AMAZONE_WDT) += amazone_wdt.o + + # Files generated that shall be removed upon make clean + clean-files := consolemap_deftbl.c defkeymap.c diff --git a/target/linux/amazon/patches/130-mtd_drivers.patch b/target/linux/amazon/patches/130-mtd_drivers.patch new file mode 100644 index 000000000..31f81640d --- /dev/null +++ b/target/linux/amazon/patches/130-mtd_drivers.patch @@ -0,0 +1,9 @@ +Index: linux-2.6.21.5/drivers/mtd/maps/Makefile +=================================================================== +--- linux-2.6.21.5.orig/drivers/mtd/maps/Makefile 2007-06-24 07:55:22.138253344 +0200 ++++ linux-2.6.21.5/drivers/mtd/maps/Makefile 2007-06-24 07:56:58.207648576 +0200 +@@ -72,3 +72,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_AMAZON_MTD) += amazon.o diff --git a/target/linux/amazon/patches/140-net_drivers.patch b/target/linux/amazon/patches/140-net_drivers.patch new file mode 100644 index 000000000..65a0e446e --- /dev/null +++ b/target/linux/amazon/patches/140-net_drivers.patch @@ -0,0 +1,10 @@ +Index: linux-2.6.21.5/drivers/net/Makefile +=================================================================== +--- linux-2.6.21.5.orig/drivers/net/Makefile 2007-06-24 09:03:20.308277264 +0200 ++++ linux-2.6.21.5/drivers/net/Makefile 2007-06-24 09:05:13.560060376 +0200 +@@ -219,3 +219,5 @@ + obj-$(CONFIG_FS_ENET) += fs_enet/ + + obj-$(CONFIG_NETXEN_NIC) += netxen/ ++ ++obj-$(CONFIG_AMAZON_NET_SW) += amazon_sw.o diff --git a/target/linux/amazon/patches/150-serial_driver.patch b/target/linux/amazon/patches/150-serial_driver.patch new file mode 100644 index 000000000..802c5c2a5 --- /dev/null +++ b/target/linux/amazon/patches/150-serial_driver.patch @@ -0,0 +1,12 @@ +Index: linux-2.6.21.5/drivers/serial/Makefile +=================================================================== +--- linux-2.6.21.5.orig/drivers/serial/Makefile 2007-06-24 10:51:45.005412992 +0200 ++++ linux-2.6.21.5/drivers/serial/Makefile 2007-06-24 10:51:54.885910928 +0200 +@@ -5,6 +5,7 @@ + # + + obj-$(CONFIG_SERIAL_CORE) += serial_core.o ++obj-$(CONFIG_AMAZON_ASC_UART) += amazon_asc.o + obj-$(CONFIG_SERIAL_21285) += 21285.o + obj-$(CONFIG_SERIAL_8250) += 8250.o + obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o diff --git a/target/linux/amazon/patches/160-cfi-swap.patch b/target/linux/amazon/patches/160-cfi-swap.patch new file mode 100644 index 000000000..9e20f0560 --- /dev/null +++ b/target/linux/amazon/patches/160-cfi-swap.patch @@ -0,0 +1,14 @@ +--- linux-2.6.21.5/drivers/mtd/chips/cfi_cmdset_0002.c 2007-07-23 23:15:50.403369508 +0200 ++++ linux-2.6.21.5.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-07-23 23:26:43.028560499 +0200 +@@ -1007,7 +1007,9 @@ + int ret = 0; + map_word oldd; + int retry_cnt = 0; +- ++#ifdef CONFIG_AMAZON ++ adr ^= 2; ++#endif + adr += chip->start; + + spin_lock(chip->mutex); + -- cgit v1.2.3