unify alix support

add hardware profiles for 3 alix boards, but use the same toolchain
for all of them. This is just better for maintenance purpose.
delete old targets.

46 files changed, 347 insertions, 10185 deletions

diff --git a/target/Config.in b/target/Config.in
index 07733b06b..f2484c9ff 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -59,13 +59,7 @@ config ADK_LINUX_64
 config ADK_NATIVE
 	tristate
 
-config ADK_alix1c
-	tristate
-
-config ADK_alix2d
-	tristate
-
-config ADK_alix2d13
+config ADK_alix
 	tristate
 
 config ADK_wrap
@@ -169,9 +163,7 @@ config ADK_x86
 
 config ADK_TARGET
 	string
-	default "alix1c"  if ADK_alix1c
-	default "alix2d"  if ADK_alix2d
-	default "alix2d13"  if ADK_alix2d13
+	default "alix"  if ADK_alix
 	default "wrap"  if ADK_wrap
 	default "brcm"  if ADK_brcm
 	default "toolchain-arm"  if ADK_arm_toolchain
@@ -232,17 +224,19 @@ default ADK_LINUX_NATIVE
 config ADK_LINUX_NATIVE
 	bool "Native platform"
 	select ADK_NATIVE
-	depends on ADK_HOST_LINUX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
+	depends on ADK_HOST_LINUX
 	help
 	  Make a native build. Use host tools.
 	  No toolchain will be created.
 
-config ADK_LINUX_ALIX
-	bool "ALIX and WRAP boards"
+config ADK_LINUX_X86_ALIX
+	bool "ALIX boards"
+	select ADK_x86
+	select ADK_alix
 	help
-	  Support for Alix and Wrap boards.
+	  Support for Alix boards.
 	  http://www.pcengines.ch
 
 config ADK_LINUX_ARM_FOXG20
@@ -295,17 +289,6 @@ config ADK_LINUX_MIKROTIK
 	  http://www.mikrotik.com
 	  http://www.routerboards.com
 
-#config ADK_LINUX_MIPS_WAG54G
-#	bool "Linksys WAG54G"
-#	select ADK_KERNEL_NETDEVICES
-#	select ADK_KERNEL_NET_PCI
-#	select ADK_KERNEL_NET_ETHERNET
-#	select ADK_KERNEL_MII
-#	select ADK_wag54g
-#	help
-#	  Linksys WAG54G DSL router with Wireless.
-#	  (Texas Instruments AR7 platform)
-
 config ADK_LINUX_MIPS_AG241
 	bool "Linksys AG241v2"
 	select ADK_KERNEL_NETDEVICES
@@ -402,6 +385,26 @@ config ADK_LINUX_X86_64_SHUTTLE
 	  Support for a nice and fast shuttle xpc with AMD quad-core CPU.
 	  Status: development
 
+config ADK_LINUX_X86_WRAP
+	bool "PC Engines WRAP"
+	select ADK_x86
+	select ADK_wrap
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select ADK_KERNEL_CRC32
+	select ADK_TARGET_WITH_WATCHDOG
+	select BUSYBOX_HWCLOCK
+	help
+	  End of life, but I still have one board.
+	  http://www.pcengines.ch/
+	  Status: stable
+
 endchoice
 
 choice
@@ -502,26 +505,6 @@ config ADK_LINUX_X86_64_TOOLCHAIN
 
 endchoice
 
-
-#choice 
-#prompt "Target Optimization"
-#depends on ADK_LINUX_ARMEL_TOOLCHAIN || ADK_LINUX_ARM_TOOLCHAIN
-#
-#config ADK_LINUX_ARM_V5TE
-#	bool "armv5te"
-#	help
-#
-#config ADK_LINUX_ARM_V4T
-#	bool "armv4t"
-#	help
-#
-#endchoice
-
-#config ADK_TARGET_ARCH_OPTIMIZATION
-#	string
-#	default "armv5te" if ADK_LINUX_ARM_V5TE
-#	default "armv4t" if ADK_LINUX_ARM_V4T
-
 choice
 prompt "Architecture"
 depends on ADK_LINUX_QEMU
@@ -608,104 +591,7 @@ config ADK_LINUX_X86_64_QEMU
 
 endchoice
 
-choice
-prompt "Alix/Wrap model"
-default ADK_LINUX_X86_ALIX1C
-depends on ADK_LINUX_ALIX
-
-config ADK_LINUX_X86_ALIX1C
-	bool "PC Engines Alix1C"
-	select ADK_x86
-	select ADK_alix1c
-	select ADK_KERNEL_NLS
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select BUSYBOX_HWCLOCK
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_INPUT
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
-	help
-	  Support for ALIX1C boards.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-config ADK_LINUX_X86_ALIX2D
-	bool "PC Engines Alix2D"
-	select ADK_x86
-	select ADK_alix2d
-	select ADK_KERNEL_NLS
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select BUSYBOX_HWCLOCK
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
-	help
-	  Support for ALIX2D boards.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-config ADK_LINUX_X86_ALIX2D13
-	bool "PC Engines Alix2D13"
-	select ADK_x86
-	select ADK_alix2d13
-	select ADK_KERNEL_NLS
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NEW_LEDS
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select BUSYBOX_HWCLOCK
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
-	help
-	  Support for ALIX2D13 boards.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-config ADK_LINUX_X86_WRAP
-	bool "PC Engines WRAP"
-	select ADK_wrap
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select ADK_KERNEL_CRC32
-	select ADK_TARGET_WITH_WATCHDOG
-	select BUSYBOX_HWCLOCK
-	help
-	  End of life, but I still have one board.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-endchoice
+source "target/Config.in.alix"
 
 choice
 prompt "Routerboard model"
@@ -789,9 +675,7 @@ config ADK_TARGET_LIB_EGLIBC
 	select ADK_eglibc
 	depends on ADK_LINUX_QEMU || \
 		ADK_LINUX_X86_IBMX40 || \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D || \
-		ADK_LINUX_X86_ALIX2D13 || \
+		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_RB4XX || \
 		ADK_LINUX_MIPS_RB532 || \
@@ -807,9 +691,7 @@ config ADK_TARGET_LIB_GLIBC
 	select ADK_glibc
 	depends on ADK_LINUX_QEMU || \
 		ADK_LINUX_X86_IBMX40 || \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D || \
-		ADK_LINUX_X86_ALIX2D13 || \
+		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_MIPS_RB4XX || \
@@ -837,7 +719,7 @@ prompt "Target Firmware type"
 config ADK_TARGET_ROOTFS_INITRAMFS
 	bool "initramfs filesystem"
 	depends on \
-		ADK_LINUX_ALIX || \
+		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_NATIVE || \
@@ -851,7 +733,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	bool "initramfs filesystem included into kernel image"
 	select ADK_LINUX_INITRAMFS_BUILTIN
 	depends on \
-		ADK_LINUX_ALIX || \
+		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_X86_IBMX40 || \
 		ADK_LINUX_X86_64_SHUTTLE || \
@@ -866,8 +748,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	select ADK_KERNEL_SQUASHFS
 	depends on \
 		ADK_LINUX_CRIS_FOXBOARD || \
-		ADK_LINUX_MIPS_AG241 || \
-		ADK_LINUX_MIPS_WAG54G
+		ADK_LINUX_MIPS_AG241
 	help
 	  highly compressed read-only filesystem for flash.
 
@@ -887,14 +768,11 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	depends on \
 		ADK_LINUX_CRIS_FOXBOARD || \
 		ADK_LINUX_ARM_FOXG20 || \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D || \
-		ADK_LINUX_X86_ALIX2D13 || \
+		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_BRCM || \
 		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_MIPS_RB4XX || \
-		ADK_LINUX_MIPS_WAG54G || \
 		ADK_LINUX_MIPS_AG241 || \
 		ADK_LINUX_MIPS64_LEMOTE
 	select ADK_KERNEL_SUNRPC
@@ -923,10 +801,7 @@ config ADK_TARGET_ROOTFS_USB
 
 config ADK_TARGET_ROOTFS_EXT2_BLOCK
 	bool "read-write filesystem for block devices with ext2"
-	depends on \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D || \
-		ADK_LINUX_X86_ALIX2D13 || \
+	depends on ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_MIPS_RB532
@@ -1113,7 +988,6 @@ config ADK_PACKAGE_SUFFIX
 	string
 	default "ipk" if ADK_TARGET_PACKAGE_IPKG
 	default "tar.gz" if ADK_TARGET_PACKAGE_TGZ
-#	default "rpm" if ADK_TARGET_PACKAGE_RPM
 	help
 
 choice
@@ -1136,13 +1010,5 @@ config ADK_TARGET_PACKAGE_TGZ
 	  Pre- and post install scripts will be executed in the target
 	  directory. There will be no package manager installed onto the target.
 	  
-
-#config ADK_TARGET_PACKAGE_RPM
-#	boolean
-#	prompt "rpm package format"
-#	help
-#	  Create rpm packages and use rpm package management on the
-#         target. WARNING: NOT YET IMPLEMENTED
-
 endchoice
 endmenu
diff --git a/target/Config.in.alix b/target/Config.in.alix
new file mode 100644
index 000000000..f496d29e9
--- /dev/null
+++ b/target/Config.in.alix
@@ -0,0 +1,64 @@
+choice
+depends on ADK_LINUX_X86_ALIX
+prompt "Hardware model"
+
+config ADK_HARDWARE_ALIX1C
+	bool "ALIX.1C"
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_HDD
+	select ADK_KERNEL_NLS
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	help
+         Hardware profile for ALIX.1C
+
+config ADK_HARDWARE_ALIX2D2
+	bool "ALIX.2D2"
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_WITH_LEDS
+	select ADK_KERNEL_NLS
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select ADK_KERNEL_NEW_LEDS
+	help
+         Hardware profile for ALIX.2D2
+
+config ADK_HARDWARE_ALIX2D13
+	bool "ALIX.2D13"
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_WITH_LEDS
+	select ADK_KERNEL_NLS
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select ADK_KERNEL_NEW_LEDS
+	help
+         Hardware profile for ALIX.2D13
+
+endchoice
diff --git a/target/alix1c/Makefile b/target/alix/Makefile
index bed5b3c69..bed5b3c69 100644
--- a/target/alix1c/Makefile
+++ b/target/alix/Makefile
diff --git a/target/alix1c/files/etc/fstab b/target/alix/files/etc/fstab
index 7aed67706..7aed67706 100644
--- a/target/alix1c/files/etc/fstab
+++ b/target/alix/files/etc/fstab
diff --git a/target/alix1c/files/etc/inittab b/target/alix/files/etc/inittab
index e6db98239..e6db98239 100644
--- a/target/alix1c/files/etc/inittab
+++ b/target/alix/files/etc/inittab
diff --git a/target/alix1c/files/etc/mdev.conf b/target/alix/files/etc/mdev.conf
index 69d9c0079..69d9c0079 100644
--- a/target/alix1c/files/etc/mdev.conf
+++ b/target/alix/files/etc/mdev.conf
diff --git a/target/alix1c/files/etc/network/interfaces b/target/alix/files/etc/network/interfaces
index 104c1a1b6..104c1a1b6 100644
--- a/target/alix1c/files/etc/network/interfaces
+++ b/target/alix/files/etc/network/interfaces
diff --git a/target/alix1c/files/etc/tmpfs b/target/alix/files/etc/tmpfs
index 08558e471..08558e471 100644
--- a/target/alix1c/files/etc/tmpfs
+++ b/target/alix/files/etc/tmpfs
diff --git a/target/alix2d13/kernel.config b/target/alix/kernel.config
index f46102881..697a3b27c 100644
--- a/target/alix2d13/kernel.config
+++ b/target/alix/kernel.config
@@ -1,15 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34
-# Mon Jul  5 20:11:20 2010
+# Linux kernel version: 2.6.36
+# Thu Nov 11 22:33:23 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -19,8 +19,10 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 # CONFIG_NEED_DMA_MAP_STATE is not set
+CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -48,6 +50,7 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_X86_32_LAZY_GS=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
@@ -58,6 +61,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -80,7 +84,6 @@ CONFIG_SYSVIPC_SYSCTL=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -103,10 +106,10 @@ CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_KALLSYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
-# CONFIG_BUG is not set
+CONFIG_BUG=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_BASE_FULL is not set
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
@@ -129,6 +132,7 @@ CONFIG_SLAB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -139,20 +143,21 @@ CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
 
 #
 # GCOV-based kernel profiling
 #
-# CONFIG_SLOW_WORK is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=1
+CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
@@ -166,8 +171,6 @@ CONFIG_BLOCK=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -206,7 +209,7 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 #
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_SMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
@@ -236,10 +239,8 @@ CONFIG_MGEODE_LX=y
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
-# CONFIG_GENERIC_CPU is not set
 # CONFIG_X86_GENERIC is not set
 CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=5
@@ -263,7 +264,6 @@ CONFIG_CPU_SUP_AMD=y
 # CONFIG_CPU_SUP_CENTAUR is not set
 # CONFIG_CPU_SUP_TRANSMETA_32 is not set
 # CONFIG_CPU_SUP_UMC_32 is not set
-# CONFIG_X86_DS is not set
 # CONFIG_HPET_TIMER is not set
 # CONFIG_DMI is not set
 # CONFIG_IOMMU_HELPER is not set
@@ -274,7 +274,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 # CONFIG_X86_UP_APIC is not set
 # CONFIG_X86_MCE is not set
-# CONFIG_VM86 is not set
+CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
@@ -298,7 +298,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ILLEGAL_POINTER_VALUE=0
 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
@@ -315,7 +314,9 @@ CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_RESERVE_LOW_64K=y
 # CONFIG_MATH_EMULATION is not set
-# CONFIG_MTRR is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+# CONFIG_X86_PAT is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_HZ_100 is not set
@@ -323,14 +324,14 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-CONFIG_SCHED_HRTICK=y
+# CONFIG_SCHED_HRTICK is not set
 # CONFIG_KEXEC is not set
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,115200"
+CONFIG_CMDLINE="console=tty0 console=ttyS0,115200n8 irqpoll geodewdt.nowayout=1"
 # CONFIG_CMDLINE_OVERRIDE is not set
 
 #
@@ -352,11 +353,11 @@ CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCI_STUB is not set
@@ -366,6 +367,7 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_OLPC is not set
+# CONFIG_OLPC_OPENFIRMWARE is not set
 CONFIG_K8_NB=y
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -411,12 +413,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
+# CONFIG_L2TP is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
@@ -449,9 +453,14 @@ CONFIG_WIRELESS=y
 #
 # CFG80211 needs to be enabled for MAC80211
 #
+
+#
+# Some wireless drivers require a rate control algorithm
+#
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
 
 #
 # Device Drivers
@@ -488,23 +497,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-CONFIG_CS5535_MFGPT=y
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=y
-# CONFIG_HP_ILO is not set
-# CONFIG_VMWARE_BALLOON is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_CB710_CORE is not set
+# CONFIG_MISC_DEVICES is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -547,31 +540,48 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
 # CONFIG_SATA_PMP is not set
+
+#
+# Controllers with non-SFF native interface
+#
 # CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_SIL24 is not set
 CONFIG_ATA_SFF=y
-# CONFIG_SATA_SVW is not set
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
 # CONFIG_ATA_PIIX is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
 # CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
 # CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
 # CONFIG_PATA_ALI is not set
 CONFIG_PATA_AMD=y
 # CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -579,39 +589,48 @@ CONFIG_PATA_AMD=y
 # CONFIG_PATA_CS5536 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
 # CONFIG_PATA_HPT366 is not set
 # CONFIG_PATA_HPT37X is not set
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
 # CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_NS87415 is not