Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

f7d02ae7 · Linus Torvalds <[email protected]> · 2007-05-12 18:11:33 -07:00

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  [ARM] Use new get_irqnr_preamble
  [ARM] Ensure machine class menu is sorted alphabetically
  [ARM] 4333/2: KS8695: Micrel Development board
  [ARM] 4332/2: KS8695: Serial driver
  [ARM] 4331/3: Support for Micrel/Kendin KS8695 processor
  [ARM] 4371/1: AT91: Support for Atmel AT91SAM9RL-EK development board
  [ARM] 4372/1: Define byte sizes in asm-arm/sizes.h
  [ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors.
  [ARM] Update mach-types
  [ARM] export symbol csum_partial_copy_from_user
  [ARM] iop13xx: msi support
  [ARM] stacktrace fix
  [ARM] Spinlock initializer cleanup
  [ARM] remove useless config option GENERIC_BUST_SPINLOCK
  [ARM] 4303/3: base kernel support for TI DaVinci
  [ARM] 4369/1: AT91: Fix circular dependency in header files
  [ARM] 4368/1: S3C24xx: build fix
  [ARM] 4364/1: AT91: LEDS on AT91SAM9261-EK
  [ARM] Fix iop32x/iop33x build
  [ARM] EBSA110: fix build errors caused by missing "const"
  ...

Commit: f7d02ae76ebbf5b8a9531fe150c49e126a397704
Parents: 78db2ad6 · 158304ef

Merge commit. Changes below are compared with the first parent: 78db2ad6.

Changes

139 files changed · +8624 −548

File	Status	Add	Del	Content
arch/arm/Kconfig	modified	+38	−24	View file
arch/arm/Makefile	modified	+2	−0	View file
arch/arm/configs/at91sam9rlek_defconfig	added	+957	−0	View file
arch/arm/configs/ks8695_defconfig	added	+880	−0	View file
arch/arm/configs/trizeps4_defconfig	modified	+329	−203	View file
arch/arm/kernel/armksyms.c	modified	+1	−0	View file
arch/arm/kernel/ecard.c	modified	+34	−1	View file
arch/arm/kernel/stacktrace.c	modified	+3	−9	View file
arch/arm/kernel/time.c	modified	+1	−1	View file
arch/arm/mach-at91/Kconfig	modified	+17	−0	View file
arch/arm/mach-at91/Makefile	modified	+5	−0	View file
arch/arm/mach-at91/at91rm9200_devices.c	modified	+0	−3	View file
arch/arm/mach-at91/at91sam9260_devices.c	modified	+0	−3	View file
arch/arm/mach-at91/at91sam9261_devices.c	modified	+0	−3	View file
arch/arm/mach-at91/at91sam9263_devices.c	modified	+0	−3	View file
arch/arm/mach-at91/at91sam9rl.c	added	+341	−0	View file
arch/arm/mach-at91/at91sam9rl_devices.c	added	+630	−0	View file
arch/arm/mach-at91/board-sam9261ek.c	modified	+3	−0	View file
arch/arm/mach-at91/board-sam9rlek.c	added	+204	−0	View file
arch/arm/mach-at91/generic.h	modified	+2	−0	View file
arch/arm/mach-davinci/Kconfig	added	+23	−0	View file
arch/arm/mach-davinci/Makefile	added	+10	−0	View file
arch/arm/mach-davinci/Makefile.boot	added	+3	−0	View file
arch/arm/mach-davinci/board-evm.c	added	+131	−0	View file
arch/arm/mach-davinci/id.c	added	+94	−0	View file
arch/arm/mach-davinci/io.c	added	+51	−0	View file
arch/arm/mach-davinci/irq.c	added	+226	−0	View file
arch/arm/mach-davinci/psc.c	added	+113	−0	View file
arch/arm/mach-davinci/serial.c	added	+96	−0	View file
arch/arm/mach-davinci/time.c	added	+372	−0	View file
arch/arm/mach-ebsa110/io.c	modified	+4	−4	View file
arch/arm/mach-iop13xx/Makefile	modified	+1	−0	View file
arch/arm/mach-iop13xx/irq.c	modified	+4	−1	View file
arch/arm/mach-iop13xx/msi.c	added	+194	−0	View file
arch/arm/mach-iop13xx/pci.c	modified	+16	−0	View file
arch/arm/mach-ks8695/Kconfig	added	+13	−0	View file
arch/arm/mach-ks8695/Makefile	added	+15	−0	View file
arch/arm/mach-ks8695/Makefile.boot	added	+8	−0	View file
arch/arm/mach-ks8695/board-micrel.c	added	+60	−0	View file
arch/arm/mach-ks8695/cpu.c	added	+73	−0	View file
arch/arm/mach-ks8695/devices.c	added	+191	−0	View file
arch/arm/mach-ks8695/generic.h	added	+15	−0	View file
arch/arm/mach-ks8695/irq.c	added	+175	−0	View file
arch/arm/mach-ks8695/time.c	added	+114	−0	View file
arch/arm/mach-omap1/board-h2.c	modified	+1	−1	View file
arch/arm/mach-omap1/pm.c	modified	+1	−10	View file
arch/arm/mach-omap2/gpmc.c	modified	+1	−1	View file
arch/arm/mach-omap2/mux.c	modified	+31	−2	View file
arch/arm/mach-pnx4008/dma.c	modified	+2	−2	View file
arch/arm/mach-pxa/trizeps4.c	modified	+49	−13	View file
arch/arm/mach-s3c2410/Makefile	modified	+1	−1	View file
arch/arm/mach-s3c2410/h1940-bluetooth.c	added	+142	−0	View file
arch/arm/mach-s3c2410/mach-h1940.c	modified	+6	−0	View file
arch/arm/mach-s3c2443/clock.c	modified	+4	−0	View file
arch/arm/mm/Kconfig	modified	+5	−5	View file
arch/arm/plat-omap/dma.c	modified	+2	−2	View file
arch/arm/plat-omap/mux.c	modified	+15	−4	View file
arch/arm/tools/mach-types	modified	+33	−1	View file
drivers/ata/pata_icside.c	modified	+96	−88	View file
drivers/ide/arm/icside.c	modified	+11	−30	View file
drivers/ide/arm/rapide.c	modified	+1	−4	View file
drivers/net/arm/ether1.c	modified	+1	−5	View file
drivers/net/arm/ether3.c	modified	+1	−5	View file
drivers/net/arm/etherh.c	modified	+3	−14	View file
drivers/scsi/arm/arxescsi.c	modified	+2	−10	View file
drivers/scsi/arm/cumana_2.c	modified	+4	−12	View file
drivers/scsi/arm/eesox.c	modified	+4	−12	View file
drivers/scsi/arm/powertec.c	modified	+4	−12	View file
drivers/serial/8250_acorn.c	modified	+1	−2	View file
drivers/serial/Kconfig	modified	+17	−0	View file
drivers/serial/Makefile	modified	+1	−0	View file
drivers/serial/serial_ks8695.c	added	+657	−0	View file
drivers/usb/gadget/Kconfig	modified	+1	−1	View file
include/asm-arm/arch-at91/at91sam9rl.h	added	+110	−0	View file
include/asm-arm/arch-at91/at91sam9rl_matrix.h	added	+96	−0	View file
include/asm-arm/arch-at91/cpu.h	modified	+9	−0	View file
include/asm-arm/arch-at91/hardware.h	modified	+2	−17	View file
include/asm-arm/arch-at91/io.h	modified	+18	−0	View file
include/asm-arm/arch-at91/irqs.h	modified	+1	−0	View file
include/asm-arm/arch-at91/timex.h	modified	+5	−0	View file
include/asm-arm/arch-at91/uncompress.h	modified	+1	−1	View file
include/asm-arm/arch-cl7500/entry-macro.S	modified	+8	−0	View file
include/asm-arm/arch-davinci/common.h	added	+19	−0	View file
include/asm-arm/arch-davinci/debug-macro.S	added	+21	−0	View file
include/asm-arm/arch-davinci/dma.h	added	+16	−0	View file
include/asm-arm/arch-davinci/entry-macro.S	added	+32	−0	View file
include/asm-arm/arch-davinci/hardware.h	added	+14	−0	View file
include/asm-arm/arch-davinci/io.h	added	+79	−0	View file
include/asm-arm/arch-davinci/irqs.h	added	+105	−0	View file
include/asm-arm/arch-davinci/memory.h	added	+64	−0	View file
include/asm-arm/arch-davinci/psc.h	added	+76	−0	View file
include/asm-arm/arch-davinci/serial.h	added	+20	−0	View file
include/asm-arm/arch-davinci/system.h	added	+29	−0	View file
include/asm-arm/arch-davinci/timex.h	added	+17	−0	View file
include/asm-arm/arch-davinci/uncompress.h	added	+35	−0	View file
include/asm-arm/arch-davinci/vmalloc.h	added	+15	−0	View file
include/asm-arm/arch-ebsa110/entry-macro.S	modified	+1	−1	View file
include/asm-arm/arch-ebsa285/entry-macro.S	modified	+8	−8	View file
include/asm-arm/arch-iop13xx/io.h	modified	+1	−1	View file
include/asm-arm/arch-iop13xx/iop13xx.h	modified	+29	−0	View file
include/asm-arm/arch-iop13xx/irqs.h	modified	+7	−1	View file
include/asm-arm/arch-iop13xx/msi.h	added	+11	−0	View file
include/asm-arm/arch-iop32x/io.h	modified	+1	−1	View file
include/asm-arm/arch-iop33x/io.h	modified	+1	−1	View file
include/asm-arm/arch-ks8695/debug-macro.S	added	+38	−0	View file
include/asm-arm/arch-ks8695/devices.h	added	+32	−0	View file
include/asm-arm/arch-ks8695/dma.h	added	+17	−0	View file
include/asm-arm/arch-ks8695/entry-macro.S	added	+53	−0	View file
include/asm-arm/arch-ks8695/hardware.h	added	+49	−0	View file
include/asm-arm/arch-ks8695/io.h	added	+19	−0	View file
include/asm-arm/arch-ks8695/irqs.h	added	+54	−0	View file
include/asm-arm/arch-ks8695/memory.h	added	+49	−0	View file
include/asm-arm/arch-ks8695/regs-gpio.h	added	+53	−0	View file
include/asm-arm/arch-ks8695/regs-hpna.h	added	+25	−0	View file
include/asm-arm/arch-ks8695/regs-irq.h	added	+41	−0	View file
include/asm-arm/arch-ks8695/regs-lan.h	added	+65	−0	View file
include/asm-arm/arch-ks8695/regs-mem.h	added	+89	−0	View file
include/asm-arm/arch-ks8695/regs-misc.h	added	+97	−0	View file
include/asm-arm/arch-ks8695/regs-pci.h	added	+53	−0	View file
include/asm-arm/arch-ks8695/regs-switch.h	added	+66	−0	View file
include/asm-arm/arch-ks8695/regs-sys.h	added	+34	−0	View file
include/asm-arm/arch-ks8695/regs-timer.h	added	+40	−0	View file
include/asm-arm/arch-ks8695/regs-uart.h	added	+92	−0	View file
include/asm-arm/arch-ks8695/regs-wan.h	added	+65	−0	View file
include/asm-arm/arch-ks8695/system.h	added	+48	−0	View file
include/asm-arm/arch-ks8695/timex.h	added	+20	−0	View file
include/asm-arm/arch-ks8695/uncompress.h	added	+37	−0	View file
include/asm-arm/arch-ks8695/vmalloc.h	added	+19	−0	View file
include/asm-arm/arch-omap/mux.h	modified	+30	−1	View file
include/asm-arm/arch-realview/entry-macro.S	modified	+1	−1	View file
include/asm-arm/arch-rpc/entry-macro.S	modified	+8	−0	View file
include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h	modified	+1	−0	View file
include/asm-arm/arch-sa1100/entry-macro.S	modified	+4	−4	View file
include/asm-arm/arch-versatile/entry-macro.S	modified	+1	−1	View file
include/asm-arm/ecard.h	modified	+7	−1	View file
include/asm-arm/hardware/entry-macro-iomd.S	modified	+11	−17	View file
include/asm-arm/sizes.h	modified	+4	−0	View file
include/asm-avr32/arch-at32ap/cpu.h	modified	+1	−0	View file
include/linux/serial_core.h	modified	+4	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d7c0984..e55bbd3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -114,9 +114,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_BUST_SPINLOCK
-	bool
-
 config ARCH_MAY_HAVE_PC_FDC
 	bool
 
@@ -247,6 +244,15 @@ config ARCH_IMX
 	help
 	  Support for Motorola's i.MX family of processors (MX1, MXL).
 
+config ARCH_IOP13XX
+	bool "IOP13xx-based"
+	depends on MMU
+	select PLAT_IOP
+	select PCI
+	select ARCH_SUPPORTS_MSI
+	help
+	  Support for Intel's IOP13XX (XScale) family of processors.
+
 config ARCH_IOP32X
 	bool "IOP32x-based"
 	depends on MMU
@@ -264,22 +270,12 @@ config ARCH_IOP33X
 	help
 	  Support for Intel's IOP33X (XScale) family of processors.
 
-config ARCH_IOP13XX
-	bool "IOP13xx-based"
-	depends on MMU
-	select PLAT_IOP
-	select PCI
-	select ARCH_SUPPORTS_MSI
-	help
-	  Support for Intel's IOP13XX (XScale) family of processors.
-
-config ARCH_IXP4XX
-	bool "IXP4xx-based"
+config ARCH_IXP23XX
+ 	bool "IXP23XX-based"
 	depends on MMU
-	select GENERIC_TIME
-	select GENERIC_CLOCKEVENTS
+ 	select PCI
 	help
-	  Support for Intel's IXP4XX (XScale) family of processors.
+	  Support for Intel's IXP23xx (XScale) family of processors.
 
 config ARCH_IXP2000
 	bool "IXP2400/2800-based"
@@ -288,12 +284,13 @@ config ARCH_IXP2000
 	help
 	  Support for Intel's IXP2400/2800 (XScale) family of processors.
 
-config ARCH_IXP23XX
- 	bool "IXP23XX-based"
+config ARCH_IXP4XX
+	bool "IXP4xx-based"
 	depends on MMU
- 	select PCI
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
 	help
-	  Support for Intel's IXP23xx (XScale) family of processors.
+	  Support for Intel's IXP4XX (XScale) family of processors.
 
 config ARCH_L7200
 	bool "LinkUp-L7200"
@@ -308,6 +305,12 @@ config ARCH_L7200
 	  If you have any questions or comments about the Linux kernel port
 	  to this board, send e-mail to <[email protected]>.
 
+config ARCH_KS8695
+	bool "Micrel/Kendin KS8695"
+	help
+	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
+	  System-on-Chip devices.
+
 config ARCH_NS9XXX
 	bool "NetSilicon NS9xxx"
 	help
@@ -354,7 +357,6 @@ config ARCH_SA1100
 config ARCH_S3C2410
 	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
 	select GENERIC_GPIO
-	select GENERIC_TIME
 	help
 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
 	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -377,6 +379,13 @@ config ARCH_LH7A40X
 	  core with a wide array of integrated devices for
 	  hand-held and low-power applications.
 
+config ARCH_DAVINCI
+	bool "TI DaVinci"
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+	help
+	  Support for TI's DaVinci platform.
+
 config ARCH_OMAP
 	bool "TI OMAP"
 	select GENERIC_GPIO
@@ -445,6 +454,10 @@ source "arch/arm/mach-netx/Kconfig"
 
 source "arch/arm/mach-ns9xxx/Kconfig"
 
+source "arch/arm/mach-davinci/Kconfig"
+
+source "arch/arm/mach-ks8695/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
 	bool
@@ -505,7 +518,7 @@ config ISA_DMA_API
 	bool
 
 config PCI
-	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX
+	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695
 	help
 	  Find out whether you have a PCI motherboard. PCI is the name of a
 	  bus system, i.e. the way the CPU talks to the other stuff inside
@@ -674,7 +687,8 @@ config LEDS
 		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-		   ARCH_AT91 || MACH_TRIZEPS4
+		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+		   ARCH_KS8695
 	help
 	  If you say Y here, the LEDs on your machine will be used
 	  to provide useful information about your current system status.

arch/arm/Makefile

View file

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 00ea430..cbd5010 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -135,6 +135,8 @@ endif
  machine-$(CONFIG_ARCH_NETX)	   := netx
  machine-$(CONFIG_ARCH_NS9XXX)	   := ns9xxx
  textofs-$(CONFIG_ARCH_NS9XXX)	   := 0x00108000
+ machine-$(CONFIG_ARCH_DAVINCI)	   := davinci
+ machine-$(CONFIG_ARCH_KS8695)     := ks8695
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.

arch/arm/configs/at91sam9rlek_defconfig

View file

diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig
new file mode 100644
index 0000000..fbe8b30
--- /dev/null
+++ b/arch/arm/configs/at91sam9rlek_defconfig
@@ -0,0 +1,957 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21
+# Mon May  7 16:30:40 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_AT91SAM9260 is not set
+# CONFIG_ARCH_AT91SAM9261 is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
+CONFIG_ARCH_AT91SAM9RL=y
+
+#
+# AT91SAM9RL Board Type
+#
+CONFIG_MACH_AT91SAM9RLEK=y
+
+#
+# AT91 Board Options
+#
+
+#
+# AT91 Feature Selections
+#
+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,17105363 root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+# CONFIG_INET is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_AT91=y
+# CONFIG_MTD_NAND_NANDSIM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+# CONFIG_PNPACPI is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=24576
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#