From 51214d11d0a062ff04b411fa23f68af255d5aa8d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 22 Dec 2007 00:17:22 +0000 Subject: change danube 2 ifxmips git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9821 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ifxmips/patches/100-board.patch | 14 ++++++------- target/linux/ifxmips/patches/110-drivers.patch | 28 ++++++++++++------------- target/linux/ifxmips/patches/160-cfi-swap.patch | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'target/linux/ifxmips/patches') diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch index c73c4e7fdc..10b49e83e5 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -6,7 +6,7 @@ Index: linux-2.6.23/arch/mips/Kconfig select SYS_SUPPORTS_LITTLE_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ -+config DANUBE ++config IFXMIPS + bool "Danube support" + select DMA_NONCOHERENT + select IRQ_CPU @@ -37,11 +37,11 @@ Index: linux-2.6.23/arch/mips/Makefile load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 +# -+# Infineon DANUBE ++# Infineon IFXMIPS +# -+core-$(CONFIG_DANUBE) += arch/mips/danube/ -+cflags-$(CONFIG_DANUBE) += -Iinclude/asm-mips/mach-danube -+load-$(CONFIG_DANUBE) += 0xffffffff80002000 ++core-$(CONFIG_IFXMIPS) += arch/mips/danube/ ++cflags-$(CONFIG_IFXMIPS) += -Iinclude/asm-mips/mach-danube ++load-$(CONFIG_IFXMIPS) += 0xffffffff80002000 + # # DECstation family @@ -57,8 +57,8 @@ Index: linux-2.6.23/include/asm-mips/bootinfo.h +/* + * Valid machtype for group ATHEROS + */ -+#define MACH_GROUP_DANUBE 29 -+#define MACH_INFINEON_DANUBE 0 ++#define MACH_GROUP_IFXMIPS 29 ++#define MACH_INFINEON_IFXMIPS 0 + + #define CL_SIZE COMMAND_LINE_SIZE diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch index 35a2024bb6..7119392655 100644 --- a/target/linux/ifxmips/patches/110-drivers.patch +++ b/target/linux/ifxmips/patches/110-drivers.patch @@ -6,9 +6,9 @@ Index: linux-2.6.23/drivers/serial/Kconfig Currently, only 8250 compatible ports are supported, but others can easily be added. -+config SERIAL_DANUBE ++config SERIAL_IFXMIPS + bool "Danube serial driver" -+ depends on DANUBE ++ depends on IFXMIPS + help + Driver for the danubes built in ASC hardware + @@ -21,7 +21,7 @@ Index: linux-2.6.23/drivers/serial/Makefile 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 ++obj-$(CONFIG_SERIAL_IFXMIPS) += danube_asc.o Index: linux-2.6.23/drivers/mtd/maps/Makefile =================================================================== --- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-12-13 20:41:42.000000000 +0100 @@ -30,7 +30,7 @@ Index: linux-2.6.23/drivers/mtd/maps/Makefile 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 ++obj-$(CONFIG_MTD_IFXMIPS) += danube.o Index: linux-2.6.23/drivers/net/Kconfig =================================================================== --- linux-2.6.23.orig/drivers/net/Kconfig 2007-12-13 20:41:42.000000000 +0100 @@ -39,15 +39,15 @@ Index: linux-2.6.23/drivers/net/Kconfig source "drivers/net/arm/Kconfig" -+config DANUBE_MII0 ++config IFXMIPS_MII0 + tristate "Infineon Danube eth0 driver" -+ depends on DANUBE ++ depends on IFXMIPS + help + Support for the MII0 inside the Danube SOC + -+config DANUBE_MII1 ++config IFXMIPS_MII1 + tristate "Infineon Danube eth1 driver" -+ depends on DANUBE ++ depends on IFXMIPS + help + Support for the MII1 inside the Danube SOC + @@ -62,7 +62,7 @@ Index: linux-2.6.23/drivers/net/Makefile 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_IFXMIPS_MII0) += danube_mii0.o obj-$(CONFIG_MACB) += macb.o @@ -74,7 +74,7 @@ Index: linux-2.6.23/drivers/char/watchdog/Makefile obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o -+obj-$(CONFIG_DANUBE_WDT) += danube_wdt.o ++obj-$(CONFIG_IFXMIPS_WDT) += danube_wdt.o # PARISC Architecture @@ -87,7 +87,7 @@ Index: linux-2.6.23/drivers/char/Makefile endif + -+obj-$(CONFIG_DANUBE_LED) += danube_led.o -+obj-$(CONFIG_DANUBE_GPIO) += danube_gpio.o -+obj-$(CONFIG_DANUBE_SSC) += danube_ssc.o -+obj-$(CONFIG_DANUBE_EEPROM) += danube_eeprom.o ++obj-$(CONFIG_IFXMIPS_LED) += danube_led.o ++obj-$(CONFIG_IFXMIPS_GPIO) += danube_gpio.o ++obj-$(CONFIG_IFXMIPS_SSC) += danube_ssc.o ++obj-$(CONFIG_IFXMIPS_EEPROM) += danube_eeprom.o diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch index ca70928713..116503f65d 100644 --- a/target/linux/ifxmips/patches/160-cfi-swap.patch +++ b/target/linux/ifxmips/patches/160-cfi-swap.patch @@ -7,7 +7,7 @@ Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c map_word oldd; int retry_cnt = 0; - -+#ifdef CONFIG_DANUBE ++#ifdef CONFIG_IFXMIPS + adr ^= 2; +#endif adr += chip->start; -- cgit v1.2.3