parent
5074eb5ac7
commit
b2f25e0fcb
@ -0,0 +1,111 @@ |
||||
Index: linux-2.6.21.1/arch/mips/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/arch/mips/Kconfig
|
||||
+++ linux-2.6.21.1/arch/mips/Kconfig
|
||||
@@ -16,6 +16,17 @@ choice
|
||||
prompt "System type"
|
||||
default SGI_IP22
|
||||
|
||||
+config MIPS_ADM5120
|
||||
+ bool "Support for ADM5120 SoC"
|
||||
+ select SYS_HAS_CPU_MIPS32_R1
|
||||
+ select DMA_NONCOHERENT
|
||||
+ select HW_HAS_PCI
|
||||
+ select IRQ_CPU
|
||||
+ select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
+ select SYS_SUPPORTS_BIG_ENDIAN
|
||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||
+ select GENERIC_GPIO
|
||||
+
|
||||
config MIPS_MTX1
|
||||
bool "4G Systems MTX-1 board"
|
||||
select DMA_NONCOHERENT
|
||||
@@ -766,6 +775,7 @@
|
||||
|
||||
endchoice
|
||||
|
||||
+source "arch/mips/adm5120/Kconfig"
|
||||
source "arch/mips/ddb5xxx/Kconfig"
|
||||
source "arch/mips/gt64120/ev64120/Kconfig"
|
||||
source "arch/mips/jazz/Kconfig"
|
||||
Index: linux-2.6.21.1/arch/mips/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/arch/mips/Makefile
|
||||
+++ linux-2.6.21.1/arch/mips/Makefile
|
||||
@@ -165,6 +165,14 @@ cflags-$(CONFIG_MACH_JAZZ) += -Iinclude/
|
||||
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
|
||||
|
||||
#
|
||||
+# ADMtek 5120
|
||||
+#
|
||||
+
|
||||
+core-$(CONFIG_MIPS_ADM5120) += arch/mips/adm5120/
|
||||
+cflags-$(CONFIG_MIPS_ADM5120) += -Iinclude/asm-mips/mach-adm5120
|
||||
+load-$(CONFIG_MIPS_ADM5120) += 0xffffffff80001000
|
||||
+
|
||||
+#
|
||||
# Common Alchemy Au1x00 stuff
|
||||
#
|
||||
core-$(CONFIG_SOC_AU1X00) += arch/mips/au1000/common/
|
||||
Index: linux-2.6.21.1/include/asm-mips/bootinfo.h
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/include/asm-mips/bootinfo.h
|
||||
+++ linux-2.6.21.1/include/asm-mips/bootinfo.h
|
||||
@@ -213,6 +213,57 @@
|
||||
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
|
||||
#define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
|
||||
|
||||
+/*
|
||||
+ * Valid machtype for group ADMtek ADM5120
|
||||
+ */
|
||||
+#define MACH_GROUP_ADM5120 23
|
||||
+#define MACH_ADM5120_UNKNOWN 0 /* Unknown board */
|
||||
+#define MACH_ADM5120_WP54G_WRT 1 /* Compex WP54G-WRT */
|
||||
+#define MACH_ADM5120_WP54G 2 /* Compex WP54G */
|
||||
+#define MACH_ADM5120_WP54AG 3 /* Compex WP54AG */
|
||||
+#define MACH_ADM5120_WPP54G 4 /* Compex WPP54G */
|
||||
+#define MACH_ADM5120_WPP54AG 5 /* Compex WPP54AG */
|
||||
+#define MACH_ADM5120_NP28G 6 /* Compex NP28G */
|
||||
+#define MACH_ADM5120_NP28GHS 7 /* Compex NP28G HotSpot */
|
||||
+#define MACH_ADM5120_NP27G 8 /* Compex NP27G */
|
||||
+#define MACH_ADM5120_WP54Gv1C 9 /* Compex WP54G version 1C */
|
||||
+#define MACH_ADM5120_RB_111 10 /* Mikrotik RouterBOARD 111 */
|
||||
+#define MACH_ADM5120_RB_112 11 /* Mikrotik RouterBOARD 112 */
|
||||
+#define MACH_ADM5120_RB_133 12 /* Mikrotik RouterBOARD 133 */
|
||||
+#define MACH_ADM5120_RB_133C 13 /* Mikrotik RouterBOARD 133c */
|
||||
+#define MACH_ADM5120_RB_150 14 /* Mikrotik RouterBOARD 150 */
|
||||
+#define MACH_ADM5120_RB_153 15 /* Mikrotik RouterBOARD 153 */
|
||||
+#define MACH_ADM5120_HS100 16 /* ZyXEL HomeSafe 100/100W */
|
||||
+#define MACH_ADM5120_P334 17 /* ZyXEL Prestige 334 */
|
||||
+#define MACH_ADM5120_P334U 18 /* ZyXEL Prestige 334U */
|
||||
+#define MACH_ADM5120_P334W 19 /* ZyXEL Prestige 334W */
|
||||
+#define MACH_ADM5120_P334WH 20 /* ZyXEL Prestige 334WH */
|
||||
+#define MACH_ADM5120_P334WHD 21 /* ZyXEL Prestige 334WHD */
|
||||
+#define MACH_ADM5120_P334WT 22 /* ZyXEL Prestige 334WT */
|
||||
+#define MACH_ADM5120_P335 23 /* ZyXEL Prestige 335/335WT */
|
||||
+#define MACH_ADM5120_P335PLUS 24 /* ZyXEL Prestige 335Plus */
|
||||
+#define MACH_ADM5120_P335U 25 /* ZyXEL Prestige 335U */
|
||||
+#define MACH_ADM5120_ES2108 26 /* ZyXEL Ethernet Switch 2108 */
|
||||
+#define MACH_ADM5120_ES2108F 27 /* ZyXEL Ethernet Switch 2108-F */
|
||||
+#define MACH_ADM5120_ES2108G 28 /* ZyXEL Ethernet Switch 2108-G */
|
||||
+#define MACH_ADM5120_ES2108LC 29 /* ZyXEL Ethernet Switch 2108-LC */
|
||||
+#define MACH_ADM5120_ES2108PWR 30 /* ZyXEL Ethernet Switch 2108-PWR */
|
||||
+#define MACH_ADM5120_ES2024A 31 /* ZyXEL Ethernet Switch 2024A */
|
||||
+#define MACH_ADM5120_ES2024PWR 32 /* ZyXEL Ethernet Switch 2024PWR */
|
||||
+#define MACH_ADM5120_CAS630 33 /* Cellvision CAS-630/630W */
|
||||
+#define MACH_ADM5120_CAS670 34 /* Cellvision CAS-670/670W */
|
||||
+#define MACH_ADM5120_CAS700 36 /* Cellvision CAS-700/700W */
|
||||
+#define MACH_ADM5120_CAS771 37 /* Cellvision CAS-771/771W */
|
||||
+#define MACH_ADM5120_CAS790 38 /* Cellvision CAS-790 */
|
||||
+#define MACH_ADM5120_CAS861 39 /* Cellvision CAS-861/861W */
|
||||
+#define MACH_ADM5120_NFS101U 40 /* Cellvision NFS-101U/101WU */
|
||||
+#define MACH_ADM5120_NFS202U 41 /* Cellvision NFS-202U/202WU */
|
||||
+#define MACH_ADM5120_EASY5120 43 /* Infineon EASY 5120 */
|
||||
+#define MACH_ADM5120_EASY5120RT 44 /* Infineon EASY 5120-RT */
|
||||
+#define MACH_ADM5120_EASY5120PATA 45 /* Infineon EASY 5120P-ATA */
|
||||
+#define MACH_ADM5120_EASY83000 46 /* Infineon EASY-83000 */
|
||||
+#define MACH_ADM5120_BR6104K 47 /* Edimax BR-6104K */
|
||||
+
|
||||
#define CL_SIZE COMMAND_LINE_SIZE
|
||||
|
||||
const char *get_system_type(void);
|
@ -0,0 +1,27 @@ |
||||
Index: linux-2.6.21.1/drivers/mtd/maps/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/maps/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/mtd/maps/Kconfig
|
||||
@@ -605,5 +605,10 @@ config MTD_PLATRAM
|
||||
|
||||
This selection automatically selects the map_ram driver.
|
||||
|
||||
+config MTD_ADM5120
|
||||
+ tristate "Map driver for ADMtek ADM5120 boards"
|
||||
+ depends on MIPS_ADM5120
|
||||
+ select MTD_CFI_AMDSTD
|
||||
+
|
||||
endmenu
|
||||
|
||||
Index: linux-2.6.21.1/drivers/mtd/maps/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/maps/Makefile
|
||||
+++ linux-2.6.21.1/drivers/mtd/maps/Makefile
|
||||
@@ -45,6 +45,7 @@ obj-$(CONFIG_MTD_OCELOT) += ocelot.o
|
||||
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
|
||||
obj-$(CONFIG_MTD_PCI) += pci.o
|
||||
obj-$(CONFIG_MTD_ALCHEMY) += alchemy-flash.o
|
||||
+obj-$(CONFIG_MTD_ADM5120) += adm5120_mtd.o
|
||||
obj-$(CONFIG_MTD_LASAT) += lasat.o
|
||||
obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
|
||||
obj-$(CONFIG_MTD_EDB7312) += edb7312.o
|
@ -0,0 +1,27 @@ |
||||
Index: linux-2.6.21.1/drivers/net/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/net/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/net/Kconfig
|
||||
@@ -574,6 +574,10 @@ config MIPS_AU1X00_ENET
|
||||
If you have an Alchemy Semi AU1X00 based system
|
||||
say Y. Otherwise, say N.
|
||||
|
||||
+config MIPS_ADM5120_ENET
|
||||
+ tristate "MIPS ADM5120 Ethernet switch support"
|
||||
+ depends on NET_ETHERNET && MIPS_ADM5120
|
||||
+
|
||||
config NET_SB1250_MAC
|
||||
tristate "SB1250 Ethernet support"
|
||||
depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC
|
||||
Index: linux-2.6.21.1/drivers/net/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/net/Makefile
|
||||
+++ linux-2.6.21.1/drivers/net/Makefile
|
||||
@@ -165,6 +165,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
|
||||
# This is also a 82596 and should probably be merged
|
||||
obj-$(CONFIG_LP486E) += lp486e.o
|
||||
|
||||
+obj-$(CONFIG_MIPS_ADM5120_ENET) += adm5120sw.o
|
||||
obj-$(CONFIG_ETH16I) += eth16i.o
|
||||
obj-$(CONFIG_ZORRO8390) += zorro8390.o
|
||||
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
|
@ -0,0 +1,53 @@ |
||||
Index: linux-2.6.21.1/drivers/serial/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/serial/Makefile
|
||||
+++ linux-2.6.21.1/drivers/serial/Makefile
|
||||
@@ -21,6 +21,7 @@ obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554)
|
||||
obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
|
||||
obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
|
||||
obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
|
||||
+obj-$(CONFIG_SERIAL_ADM5120) += adm5120_uart.o
|
||||
obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
|
||||
obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
|
||||
obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
|
||||
Index: linux-2.6.21.1/include/linux/serial_core.h
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/include/linux/serial_core.h
|
||||
+++ linux-2.6.21.1/include/linux/serial_core.h
|
||||
@@ -135,6 +135,9 @@
|
||||
/* Xilinx uartlite */
|
||||
#define PORT_UARTLITE 74
|
||||
|
||||
+/* ADMtek ADM5120 SoC */
|
||||
+#define PORT_ADM5120 68
|
||||
+
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/compiler.h>
|
||||
Index: linux-2.6.21.1/drivers/serial/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/serial/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/serial/Kconfig
|
||||
@@ -256,6 +256,22 @@ config SERIAL_8250_AU1X00
|
||||
|
||||
comment "Non-8250 serial port support"
|
||||
|
||||
+config SERIAL_ADM5120
|
||||
+ bool "ADM5120 serial port support"
|
||||
+ depends on MIPS_ADM5120
|
||||
+ select SERIAL_CORE
|
||||
+ select SERIAL_CORE_CONSOLE
|
||||
+ help
|
||||
+ Driver for the on chip UARTs on the ADM5120 SoC
|
||||
+
|
||||
+config ADM5120_NR_UARTS
|
||||
+ int "Maximum number of ADM5120 serial ports"
|
||||
+ depends on SERIAL_ADM5120
|
||||
+ default "2"
|
||||
+ ---help---
|
||||
+ Set this to the number of serial ports you want the driver to
|
||||
+ support.
|
||||
+
|
||||
config SERIAL_AMBA_PL010
|
||||
tristate "ARM AMBA PL010 serial port support"
|
||||
depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)
|
@ -0,0 +1,58 @@ |
||||
Index: linux-2.6.21.1/drivers/usb/core/hub.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/usb/core/hub.c
|
||||
+++ linux-2.6.21.1/drivers/usb/core/hub.c
|
||||
@@ -2227,6 +2227,8 @@ hub_port_init (struct usb_hub *hub, stru
|
||||
USB_DT_DEVICE << 8, 0,
|
||||
buf, GET_DESCRIPTOR_BUFSIZE,
|
||||
(i ? USB_CTRL_GET_TIMEOUT : 1000));
|
||||
+printk(KERN_CRIT "usb_control_msg: %d %d %d (%d)\n", r, buf->bMaxPacketSize0,
|
||||
+buf->bDescriptorType, USB_DT_DEVICE);
|
||||
switch (buf->bMaxPacketSize0) {
|
||||
case 8: case 16: case 32: case 64: case 255:
|
||||
if (buf->bDescriptorType ==
|
||||
Index: linux-2.6.21.1/drivers/usb/host/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/usb/host/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/usb/host/Kconfig
|
||||
@@ -224,3 +224,6 @@ config USB_SL811_CS
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called "sl811_cs".
|
||||
|
||||
+config USB_ADM5120_HCD
|
||||
+ tristate "ADM5120 HCD support"
|
||||
+ depends on USB && MIPS_ADM5120
|
||||
Index: linux-2.6.21.1/drivers/usb/host/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/usb/host/Makefile
|
||||
+++ linux-2.6.21.1/drivers/usb/host/Makefile
|
||||
@@ -16,3 +16,4 @@ obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd
|
||||
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
|
||||
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
|
||||
obj-$(CONFIG_ETRAX_ARCH_V10) += hc_crisv10.o
|
||||
+obj-$(CONFIG_USB_ADM5120_HCD) += adm5120-hcd.o
|
||||
Index: linux-2.6.21.1/drivers/usb/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/usb/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/usb/Kconfig
|
||||
@@ -91,8 +91,6 @@ source "drivers/usb/image/Kconfig"
|
||||
|
||||
source "drivers/usb/net/Kconfig"
|
||||
|
||||
-source "drivers/usb/mon/Kconfig"
|
||||
-
|
||||
comment "USB port drivers"
|
||||
depends on USB
|
||||
|
||||
Index: linux-2.6.21.1/drivers/usb/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/usb/Makefile
|
||||
+++ linux-2.6.21.1/drivers/usb/Makefile
|
||||
@@ -17,6 +17,7 @@ obj-$(CONFIG_USB_SL811_HCD) += host/
|
||||
obj-$(CONFIG_USB_U132_HCD) += host/
|
||||
obj-$(CONFIG_ETRAX_USB_HOST) += host/
|
||||
obj-$(CONFIG_USB_OHCI_AT91) += host/
|
||||
+obj-$(CONFIG_USB_ADM5120_HCD) += host/
|
||||
|
||||
obj-$(CONFIG_USB_ACM) += class/
|
||||
obj-$(CONFIG_USB_PRINTER) += class/
|
@ -0,0 +1,45 @@ |
||||
Index: linux-2.6.21.1/drivers/leds/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/leds/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/leds/Kconfig
|
||||
@@ -19,6 +19,27 @@ config LEDS_CLASS
|
||||
|
||||
comment "LED drivers"
|
||||
|
||||
+config LEDS_GPIO
|
||||
+ tristate "LED support for LEDS on GPIO lines"
|
||||
+ depends on LEDS_CLASS && GENERIC_GPIO
|
||||
+ help
|
||||
+ This option enables support for LEDs connected to GPIO lines
|
||||
+
|
||||
+config LEDS_ADM5120
|
||||
+ tristate "LED Support for ADM5120 GPIO LEDs"
|
||||
+ depends on LEDS_GPIO && MIPS_ADM5120
|
||||
+ help
|
||||
+ This option enables support for LEDs connected to GPIO lines
|
||||
+ on ADM5120 SoC based platforms.
|
||||
+
|
||||
+config LEDS_ADM5120_EXPERIMENTAL
|
||||
+ bool "Enable ADM5120 LEDs experimental code"
|
||||
+ depends on LEDS_ADM5120
|
||||
+
|
||||
+config LEDS_ADM5120_DIAG
|
||||
+ bool "Enable ADM5120 LEDs diagnostic mode"
|
||||
+ depends on LEDS_ADM5120
|
||||
+
|
||||
config LEDS_CORGI
|
||||
tristate "LED Support for the Sharp SL-C7x0 series"
|
||||
depends on LEDS_CLASS && PXA_SHARP_C7xx
|
||||
Index: linux-2.6.21.1/drivers/leds/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/leds/Makefile
|
||||
+++ linux-2.6.21.1/drivers/leds/Makefile
|
||||
@@ -5,6 +5,8 @@ obj-$(CONFIG_LEDS_CLASS) += led-class.o
|
||||
obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o
|
||||
|
||||
# LED Platform Drivers
|
||||
+obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
|
||||
+obj-$(CONFIG_LEDS_ADM5120) += leds-adm5120.o
|
||||
obj-$(CONFIG_LEDS_CORGI) += leds-corgi.o
|
||||
obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o
|
||||
obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o
|
@ -0,0 +1,23 @@ |
||||
Index: linux-2.6.21.1/arch/mips/pci/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/arch/mips/pci/Makefile
|
||||
+++ linux-2.6.21.1/arch/mips/pci/Makefile
|
||||
@@ -53,3 +53,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-
|
||||
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
|
||||
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
|
||||
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
|
||||
+obj-$(CONFIG_PCI_ADM5120) += fixup-adm5120.o ops-adm5120.o pci-adm5120.o
|
||||
Index: linux-2.6.21.1/include/linux/pci_ids.h
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/include/linux/pci_ids.h
|
||||
+++ linux-2.6.21.1/include/linux/pci_ids.h
|
||||
@@ -1701,6 +1701,9 @@
|
||||
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
||||
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
||||
|
||||
+#define PCI_VENDOR_ID_ADMTEK 0x1317
|
||||
+#define PCI_DEVICE_ID_ADMTEK_ADM5120 0x5120
|
||||
+
|
||||
#define PCI_VENDOR_ID_SIIG 0x131f
|
||||
#define PCI_SUBVENDOR_ID_SIIG 0x131f
|
||||
#define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000
|
@ -0,0 +1,38 @@ |
||||
--- linux-2.6.19.2/include/asm-mips/byteorder.h 2007-01-10 20:10:37.000000000 +0100
|
||||
+++ linux-2.6.19.2.new/include/asm-mips/byteorder.h 2007-05-16 21:14:47.000000000 +0200
|
||||
@@ -58,6 +58,35 @@
|
||||
|
||||
#endif /* CONFIG_CPU_MIPSR2 */
|
||||
|
||||
+#ifdef CONFIG_ADM5120_HARDWARE_SWAB
|
||||
+
|
||||
+static __inline__ __attribute_const__ __u16 ___adm5120__swab16(__u16 x)
|
||||
+{
|
||||
+ __asm__ (
|
||||
+ " sh %2, 0xCA(%1) \n"
|
||||
+ " lhu %0, 0xCC(%1) \n"
|
||||
+ : "=r" (x)
|
||||
+ : "r" (0xB2000000), "r" (x));
|
||||
+
|
||||
+ return x;
|
||||
+}
|
||||
+
|
||||
+static __inline__ __attribute_const__ __u32 ___adm5120__swab32(__u32 x)
|
||||
+{
|
||||
+ __asm__ (
|
||||
+ " sw %2, 0xC8(%1) \n"
|
||||
+ " lw %0, 0xCC(%1) \n"
|
||||
+ : "=r" (x)
|
||||
+ : "r" (0xB2000000), "r" (x));
|
||||
+
|
||||
+ return x;
|
||||
+}
|
||||
+
|
||||
+#define __arch__swab16(x) ___adm5120__swab16(x)
|
||||
+#define __arch__swab32(x) ___adm5120__swab32(x)
|
||||
+
|
||||
+#endif /* CONFIG_ADM5120_HARDWARE_SWAB */
|
||||
+
|
||||
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
|
||||
# define __BYTEORDER_HAS_U64__
|
||||
# define __SWAB_64_THRU_32__
|
@ -0,0 +1,39 @@ |
||||
Index: linux-2.6.21.1/drivers/mtd/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/mtd/Kconfig
|
||||
@@ -157,6 +157,22 @@ config MTD_AFS_PARTS
|
||||
for your particular device. It won't happen automatically. The
|
||||
'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
|
||||
|
||||
+config MTD_MYLOADER_PARTS
|
||||
+ tristate "MyLoader partition parsing"
|
||||
+ depends on MIPS_ADM5120 && MTD_PARTITIONS
|
||||
+ ---help---
|
||||
+ MyLoader is a bootloader which allows the user to define partitions
|
||||
+ in flash devices, by putting a table in the second erase block
|
||||
+ on the device, similar to a partition table. This table gives the
|
||||
+ offsets and lengths of the user defined partitions.
|
||||
+
|
||||
+ If you need code which can detect and parse these tables, and
|
||||
+ register MTD 'partitions' corresponding to each image detected,
|
||||
+ enable this option.
|
||||
+
|
||||
+ You will still need the parsing functions to be called by the driver
|
||||
+ for your particular device. It won't happen automatically.
|
||||
+
|
||||
comment "User Modules And Translation Layers"
|
||||
depends on MTD
|
||||
|
||||
Index: linux-2.6.21.1/drivers/mtd/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/Makefile
|
||||
+++ linux-2.6.21.1/drivers/mtd/Makefile
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
|
||||
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
|
||||
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
|
||||
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
||||
+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
|
||||
|
||||
# 'Users' - code which presents functionality to userspace.
|
||||
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
|
@ -0,0 +1,87 @@ |
||||
Index: linux-2.6.21.1/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ linux-2.6.21.1/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
@@ -47,12 +47,17 @@
|
||||
#define MANUFACTURER_AMD 0x0001
|
||||
#define MANUFACTURER_ATMEL 0x001F
|
||||
#define MANUFACTURER_SST 0x00BF
|
||||
+#define MANUFACTURER_MACRONIX 0x00C2
|
||||
#define SST49LF004B 0x0060
|
||||
#define SST49LF040B 0x0050
|
||||
#define SST49LF008A 0x005a
|
||||
#define AT49BV6416 0x00d6
|
||||
#define MANUFACTURER_SAMSUNG 0x00ec
|
||||
|
||||
+/* Macronix */
|
||||
+#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */
|
||||
+#define MX29LV320B 0x22A8 /* MX29LV320 Bottom-boot chip */
|
||||
+
|
||||
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
||||
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||
@@ -217,6 +222,35 @@ static void fixup_use_atmel_lock(struct
|
||||
mtd->flags |= MTD_STUPID_LOCK;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
|
||||
+/*
|
||||
+ * Some Macronix chips has bad bootblock information in the CFI table
|
||||
+ */
|
||||
+static void fixup_macronix_bootloc(struct mtd_info *mtd, void* param)
|
||||
+{
|
||||
+ struct map_info *map = mtd->priv;
|
||||
+ struct cfi_private *cfi = map->fldrv_priv;
|
||||
+ struct cfi_pri_amdstd *extp = cfi->cmdset_priv;
|
||||
+ __u8 major = extp->MajorVersion;
|
||||
+ __u8 minor = extp->MinorVersion;
|
||||
+
|
||||
+ switch (cfi->id) {
|
||||
+ /* TODO: put affected chip ids here */
|
||||
+ case MX29LV160B:
|
||||
+ case MX29LV320B:
|
||||
+ if (((major << 8) | minor) != 0x3131)
|
||||
+ break;
|
||||
+
|
||||
+ if (extp->TopBottom == 2)
|
||||
+ break;
|
||||
+
|
||||
+ extp->TopBottom = 2; /* Bottom boot */
|
||||
+ printk("%s: weird Macronix chip detected, id:0x%04X, boot location "
|
||||
+ "forced to bottom\n", map->name, cfi->id);
|
||||
+ }
|
||||
+}
|
||||
+#endif /* CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC */
|
||||
+
|
||||
static struct cfi_fixup cfi_fixup_table[] = {
|
||||
#ifdef AMD_BOOTLOC_BUG
|
||||
{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
|
||||
@@ -231,6 +265,9 @@ static struct cfi_fixup cfi_fixup_table[
|
||||
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
|
||||
#endif
|
||||
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
|
||||
+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
|
||||
+ { MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_macronix_bootloc, NULL, },
|
||||
+#endif
|
||||
{ 0, 0, NULL, NULL }
|
||||
};
|
||||
static struct cfi_fixup jedec_fixup_table[] = {
|
||||
Index: linux-2.6.21.1/drivers/mtd/chips/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/chips/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/mtd/chips/Kconfig
|
||||
@@ -199,6 +199,14 @@ config MTD_CFI_AMDSTD
|
||||
provides support for one of those command sets, used on chips
|
||||
including the AMD Am29LV320.
|
||||
|
||||
+config MTD_CFI_FIXUP_MACRONIX_BOOTLOC
|
||||
+ bool "Force bottom boot for Macronix flash chips"
|
||||
+ depends on MTD_CFI_AMDSTD
|
||||
+ help
|
||||
+ Some Macronix flash chips have wrong boot-block location in the
|
||||
+ CFI table, and the driver may detect the type incorrectly. Select
|
||||
+ this if your board has such chip.
|
||||
+
|
||||
config MTD_CFI_STAA
|
||||
tristate "Support for ST (Advanced Architecture) flash chips"
|
||||
depends on MTD_GEN_PROBE
|
@ -0,0 +1,26 @@ |
||||
Index: linux-2.6.21.1/arch/mips/kernel/head.S
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/arch/mips/kernel/head.S
|
||||
+++ linux-2.6.21.1/arch/mips/kernel/head.S
|
||||
@@ -129,14 +129,19 @@
|
||||
#endif
|
||||
.endm
|
||||
|
||||
-
|
||||
j kernel_entry
|
||||
nop
|
||||
-
|
||||
+ nop
|
||||
+
|
||||
/*
|
||||
* Reserved space for exception handlers.
|
||||
* Necessary for machines which link their kernels at KSEG0.
|
||||
+ * Use as temporary storage for the kernel command line, so that it
|
||||
+ * can be updated easily without having to relink the kernel.
|
||||
*/
|
||||
+
|
||||
+EXPORT(_image_cmdline)
|
||||
+ .ascii "CMDLINE:"
|
||||
.align 10
|
||||
|
||||
EXPORT(stext) # used for profiling
|
@ -0,0 +1,29 @@ |
||||
Index: linux-2.6.21.1/drivers/mtd/nand/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/nand/Kconfig
|
||||
+++ linux-2.6.21.1/drivers/mtd/nand/Kconfig
|
||||
@@ -75,6 +75,12 @@ config MTD_NAND_TS7250
|
||||
help
|
||||
Support for NAND flash on Technologic Systems TS-7250 platform.
|
||||
|
||||
+config MTD_NAND_RB100
|
||||
+ tristate "NAND Flash device on RB100 board"
|
||||
+ depends on MTD_NAND
|
||||
+ help
|
||||
+ Support for NAND flash on RB100 platform.
|
||||
+
|
||||
config MTD_NAND_IDS
|
||||
tristate
|
||||
|
||||
Index: linux-2.6.21.1/drivers/mtd/nand/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.21.1.orig/drivers/mtd/nand/Makefile
|
||||
+++ linux-2.6.21.1/drivers/mtd/nand/Makefile
|
||||
@@ -10,6 +10,7 @@ obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nan
|
||||
obj-$(CONFIG_MTD_NAND_SPIA) += spia.o
|
||||
obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
|
||||
obj-$(CONFIG_MTD_NAND_TOTO) += toto.o
|
||||
+obj-$(CONFIG_MTD_NAND_RB100) += rbmipsnand.o
|
||||
obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o
|
||||
obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
|
||||
obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o
|
Loading…
Reference in new issue