# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1278216349 18000
# Node ID 0b53de0d6eecad9fead813dbda3b3ab2cc20ab75
# Parent  2f39d1bfb2fd5f60783ebbbfddf75c6f8bd6d95e
Forgot to check in the baseconfig-linux file.  Also, convert the x86 targets and clean up the arm targets.

diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/baseconfig-linux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/baseconfig-linux	Sat Jul 03 23:05:49 2010 -0500
@@ -0,0 +1,39 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_PCI=y
+CONFIG_BINFMT_ELF=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_IDE=y
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+CONFIG_8139CP=y
+CONFIG_HW_RANDOM=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_TMPFS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_SQUASHFS=y
+CONFIG_MAGIC_SYSRQ=y
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/armv4l/settings
--- a/sources/targets/armv4l/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/armv4l/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -17,19 +17,30 @@
 "
 
 LINUX_CONFIG="
+
+# Processor config
+
 # QEMU patch: http://www.mail-archive.com/qemu-devel@nongnu.org/msg19370.html
-# QEMU option: -cpu arm920t
-# CONFIG_CPU_ARM920T=y
-# Until then, we need an armv5 CPU...
+# and QEMU option "-cpu arm920t" enable CONFIG_CPU_ARM920T=y which is the
+# processor that actually _needs_ this code.  But until then, qemu can only
+# emulate an armv5 CPU...
+
 CONFIG_CPU_ARM926T=y
 CONFIG_MMU=y
+CONFIG_ARM_THUMB=y
+CONFIG_AEABI=y
+
+# Versatile board
+
 CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_MACH_VERSATILE_AB=y
-CONFIG_ARM_THUMB=y
+CONFIG_PCI_LEGACY=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 "
 
 emulator_command()
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/armv4tl/settings
--- a/sources/targets/armv4tl/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/armv4tl/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -24,19 +24,31 @@
 "
 
 LINUX_CONFIG="
-#CONFIG_CPU_ARM920T=y
+
+# Processor config
+
+# QEMU patch: http://www.mail-archive.com/qemu-devel@nongnu.org/msg19370.html
+# and QEMU option "-cpu arm920t" enable CONFIG_CPU_ARM920T=y which is the
+# processor that actually _needs_ this code.  But until then, qemu can only
+# emulate an armv5 CPU...
+
 CONFIG_CPU_ARM926T=y
 CONFIG_MMU=y
-CONFIG_ARCH_VERSATILE_PB=y
-#CONFIG_MACH_VERSATILE_AB=y
+CONFIG_VFP=y
 CONFIG_ARM_THUMB=y
-CONFIG_VFP=y
+CONFIG_AEABI=y
+
+# Versatile board
+
+CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_PCI_LEGACY=y
-CONFIG_AEABI=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 "
 
 emulator_command()
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/armv5l/settings
--- a/sources/targets/armv5l/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/armv5l/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -21,18 +21,26 @@
 "
 
 LINUX_CONFIG="
+
+# Processor config
+
 CONFIG_CPU_ARM926T=y
 CONFIG_MMU=y
-CONFIG_ARCH_VERSATILE_PB=y
-#CONFIG_MACH_VERSATILE_AB=y
+CONFIG_VFP=y
 CONFIG_ARM_THUMB=y
-CONFIG_VFP=y
+CONFIG_AEABI=y
+
+# Versatile board
+
+CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_PCI_LEGACY=y
-CONFIG_AEABI=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 "
 
 emulator_command()
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/armv6l/settings
--- a/sources/targets/armv6l/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/armv6l/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -23,18 +23,26 @@
 "
 
 LINUX_CONFIG="
-CONFIG_MMU=y
-CONFIG_ARCH_VERSATILE_PB=y
-#CONFIG_MACH_VERSATILE_AB=y
+
+# Processor config
+
 CONFIG_CPU_V6=y
+CONFIG_MMU=y
 CONFIG_ARM_THUMB=y
+CONFIG_AEABI=y
 CONFIG_VFP=y
+
+# Versatile board
+
+CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_PCI_LEGACY=y
-CONFIG_AEABI=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 "
 
 emulator_command()
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/i486/miniconfig-linux
--- a/sources/targets/i486/miniconfig-linux	Fri Jul 02 23:38:31 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_M486=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_COMPAT_VDSO=y
-CONFIG_PCI=y
-CONFIG_BINFMT_ELF=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NETDEV_1000=y
-CONFIG_E1000=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=8
-CONFIG_RTC=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/i486/settings
--- a/sources/targets/i486/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/i486/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -17,6 +17,17 @@
 UCLIBC_HAS_FPU=y
 "
 
+LINUX_CONFIG="
+CONFIG_M486=y
+CONFIG_PM=y
+CONFIG_ACPI=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEV_1000=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+"
+
 emulator_command()
 {
   echo qemu -cpu 486 $(qemu_defaults "$@")
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/i586/miniconfig-linux
--- a/sources/targets/i586/miniconfig-linux	Fri Jul 02 23:38:31 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_M586=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_COMPAT_VDSO=y
-CONFIG_PCI=y
-CONFIG_BINFMT_ELF=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NETDEV_1000=y
-CONFIG_E1000=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=8
-CONFIG_RTC=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/i586/settings
--- a/sources/targets/i586/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/i586/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -17,6 +17,17 @@
 UCLIBC_HAS_FPU=y
 "
 
+LINUX_CONFIG="
+CONFIG_M586=y
+CONFIG_PM=y
+CONFIG_ACPI=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEV_1000=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+"
+
 emulator_command()
 {
   echo qemu -cpu pentium $(qemu_defaults "$@")
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/i686/miniconfig-linux
--- a/sources/targets/i686/miniconfig-linux	Fri Jul 02 23:38:31 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_MPENTIUMII=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_COMPAT_VDSO=y
-CONFIG_PCI=y
-CONFIG_BINFMT_ELF=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NETDEV_1000=y
-CONFIG_E1000=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=8
-CONFIG_RTC=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_FILE_LOCKING=y
-CONFIG_VFAT_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/i686/settings
--- a/sources/targets/i686/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/i686/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -18,6 +18,17 @@
 UCLIBC_HAS_FPU=y
 "
 
+LINUX_CONFIG="
+CONFIG_MPENTIUMII=y
+CONFIG_PM=y
+CONFIG_ACPI=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEV_1000=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+"
+
 emulator_command()
 {
   echo qemu -cpu pentium3 $(qemu_defaults "$@") \
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/x86_64/miniconfig-linux
--- a/sources/targets/x86_64/miniconfig-linux	Fri Jul 02 23:38:31 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_PM=y
-CONFIG_ACPI=y
-CONFIG_PCI=y
-CONFIG_HT_IRQ=y
-CONFIG_BINFMT_ELF=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GENERIC=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NETDEV_1000=y
-CONFIG_E1000=y
-CONFIG_8139TOO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
diff -r 2f39d1bfb2fd -r 0b53de0d6eec sources/targets/x86_64/settings
--- a/sources/targets/x86_64/settings	Fri Jul 02 23:38:31 2010 -0500
+++ b/sources/targets/x86_64/settings	Sat Jul 03 23:05:49 2010 -0500
@@ -16,6 +16,16 @@
 UCLIBC_HAS_FPU=y
 "
 
+LINUX_CONFIG="
+CONFIG_PM=y
+CONFIG_ACPI=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEV_1000=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+"
+
 emulator_command()
 {
   echo qemu-system-x86_64 $(qemu_defaults "$@")