# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1278131911 18000
# Node ID 2f39d1bfb2fd5f60783ebbbfddf75c6f8bd6d95e
# Parent  b55c80be32b6d05bdeb5806f8a66a89c5222c205
Add baseconfig-linux, the infrastructure to use it, and move over the arm targets.  (You can override with a miniconfig-linux or miniconfig-uClibc in the appropriate target directory.)

diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/functions.sh
--- a/sources/functions.sh	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/functions.sh	Fri Jul 02 23:38:31 2010 -0500
@@ -94,15 +94,12 @@
   for i in $(is_in_list $1 $USE_UNSTABLE && echo {$ARCH_NAME,$ARCH}/miniconfig-alt-$1) \
     {$ARCH_NAME,$ARCH}/miniconfig-$1
   do
-    if [ -f "$CONFIG_DIR/$i" ]
-    then
-      echo "$CONFIG_DIR/$i"
-      return
-    fi
+    [ -f "$CONFIG_DIR/$i" ] && cat "$CONFIG_DIR/$i" && return
   done
 
-  echo "getconfig $1 failed" >&2
-  dienow
+  # Output baseconfig, then append $1_CONFIG (converting $1 to uppercase)
+  cat "$SOURCES/baseconfig-$1"
+  eval "echo \"\${$(echo $1 | tr a-z A-Z)_CONFIG}\""
 }
 
 # Find all files in $STAGE_DIR newer than $CURSRC.
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/sections/linux-headers.sh
--- a/sources/sections/linux-headers.sh	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/sections/linux-headers.sh	Fri Jul 02 23:38:31 2010 -0500
@@ -2,15 +2,12 @@
 
 setupfor linux
 
-# This isn't strictly necessary, but if we have a kernel config, expand
-# and copy it.
+# Expand and copy kernel .config.
 
-cp "$(getconfig linux)" mini.conf &&
-if [ "$SYSIMAGE_TYPE" == "initramfs" ]
-then
-  echo "CONFIG_BLK_DEV_INITRD=y" >> mini.conf
-fi
-[ -e mini.conf ] &&
+getconfig linux > mini.conf &&
+[ "$SYSIMAGE_TYPE" == "initramfs" ] &&
+echo "CONFIG_BLK_DEV_INITRD=y" >> mini.conf
+
 make ARCH=${BOOT_KARCH:-$KARCH} KCONFIG_ALLCONFIG=mini.conf $LINUX_FLAGS \
   allnoconfig >/dev/null &&
 mkdir -p "$STAGE_DIR/src" &&
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/sections/uClibc.build
--- a/sources/sections/uClibc.build	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/sections/uClibc.build	Fri Jul 02 23:38:31 2010 -0500
@@ -9,16 +9,7 @@
 
 # Configure
 
-if is_in_list uClibc $USE_UNSTABLE &&
-   [ -e "$CONFIG_DIR/$ARCH/miniconfig-alt-uClibc" ]
-then
-  cp "$CONFIG_DIR/$ARCH/miniconfig-alt-uClibc" "$WORK/mini.conf" || dienow
-  echo using miniconfig-alt-uClibc
-else
-  cp "$SOURCES/baseconfig-uClibc" "$WORK/mini.conf" &&
-  echo "$UCLIBC_CONFIG" >> "$WORK/mini.conf" || dienow
-  echo Creating miniconfig for uClibc
-fi
+getconfig uClibc > "$WORK/mini.conf" || dienow
 
 # Build and install
 
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv4eb/settings
--- a/sources/targets/armv4eb/settings	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/targets/armv4eb/settings	Fri Jul 02 23:38:31 2010 -0500
@@ -9,6 +9,19 @@
 
 UCLIBC_CONFIG="TARGET_arm=y"
 
+LINUX_CONFIG="
+CONFIG_CPU_ARM926T=y
+CONFIG_MMU=y
+CONFIG_ARCH_VERSATILE_PB=y
+CONFIG_MACH_VERSATILE_AB=y
+CONFIG_CPU_ARM926T=y
+CONFIG_ARM_THUMB=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_RTC_DRV_PL031=y
+"
+
 emulator_command()
 {
   echo qemu-system-arm -M versatilepb $(qemu_defaults "$@") \
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv4l/miniconfig-linux
--- a/sources/targets/armv4l/miniconfig-linux	Fri Jul 02 12:58:41 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-CONFIG_MMU=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_MACH_VERSATILE_AB=y
-CONFIG_CPU_ARM926T=y
-CONFIG_ARM_THUMB=y
-CONFIG_PCI=y
-CONFIG_CMDLINE="mem=128M console=ttyAMA0"
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_FW_LOADER=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_PCI=y
-CONFIG_8139CP=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_EXT2_FS=y
-CONFIG_TMPFS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_EXT3_FS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv4l/settings
--- a/sources/targets/armv4l/settings	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/targets/armv4l/settings	Fri Jul 02 23:38:31 2010 -0500
@@ -16,6 +16,22 @@
 ARCH_WANTS_LITTLE_ENDIAN=y
 "
 
+LINUX_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...
+CONFIG_CPU_ARM926T=y
+CONFIG_MMU=y
+CONFIG_ARCH_VERSATILE_PB=y
+CONFIG_MACH_VERSATILE_AB=y
+CONFIG_ARM_THUMB=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_RTC_DRV_PL031=y
+"
+
 emulator_command()
 {
   echo qemu-system-arm -M versatilepb $(qemu_defaults "$@") \
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv4tl/miniconfig-linux
--- a/sources/targets/armv4tl/miniconfig-linux	Fri Jul 02 12:58:41 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-CONFIG_MMU=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_COMPAT_BRK=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_MACH_VERSATILE_AB=y
-CONFIG_CPU_ARM926T=y
-#CONFIG_CPU_ARM920T=y
-CONFIG_ARM_THUMB=y
-CONFIG_PCI=y
-CONFIG_PCI_LEGACY=y
-CONFIG_AEABI=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_CMDLINE="mem=128M console=ttyAMA0"
-CONFIG_VFP=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=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_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_PCI=y
-CONFIG_8139CP=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_HW_RANDOM=y
-CONFIG_HWMON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
-CONFIG_MAGIC_SYSRQ=y
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv4tl/settings
--- a/sources/targets/armv4tl/settings	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/targets/armv4tl/settings	Fri Jul 02 23:38:31 2010 -0500
@@ -23,6 +23,22 @@
 DOPIC=y
 "
 
+LINUX_CONFIG="
+#CONFIG_CPU_ARM920T=y
+CONFIG_CPU_ARM926T=y
+CONFIG_MMU=y
+CONFIG_ARCH_VERSATILE_PB=y
+#CONFIG_MACH_VERSATILE_AB=y
+CONFIG_ARM_THUMB=y
+CONFIG_VFP=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
+"
+
 emulator_command()
 {
   echo qemu-system-arm -M versatilepb $(qemu_defaults "$@") \
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv5l/miniconfig-linux
--- a/sources/targets/armv5l/miniconfig-linux	Fri Jul 02 12:58:41 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-CONFIG_MMU=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_COMPAT_BRK=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_MACH_VERSATILE_AB=y
-CONFIG_CPU_ARM926T=y
-CONFIG_ARM_THUMB=y
-CONFIG_PCI=y
-CONFIG_PCI_LEGACY=y
-CONFIG_AEABI=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_CMDLINE="mem=128M console=ttyAMA0"
-CONFIG_VFP=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=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_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_PCI=y
-CONFIG_8139CP=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_HW_RANDOM=y
-CONFIG_HWMON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
-CONFIG_MAGIC_SYSRQ=y
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv5l/settings
--- a/sources/targets/armv5l/settings	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/targets/armv5l/settings	Fri Jul 02 23:38:31 2010 -0500
@@ -20,6 +20,21 @@
 DOPIC=y
 "
 
+LINUX_CONFIG="
+CONFIG_CPU_ARM926T=y
+CONFIG_MMU=y
+CONFIG_ARCH_VERSATILE_PB=y
+#CONFIG_MACH_VERSATILE_AB=y
+CONFIG_ARM_THUMB=y
+CONFIG_VFP=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
+"
+
 emulator_command()
 {
   echo qemu-system-arm -M versatilepb $(qemu_defaults "$@") \
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv6l/miniconfig-linux
--- a/sources/targets/armv6l/miniconfig-linux	Fri Jul 02 12:58:41 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-CONFIG_MMU=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_COMPAT_BRK=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_CPU_V6=y
-CONFIG_ARM_THUMB=y
-CONFIG_PCI=y
-CONFIG_PCI_LEGACY=y
-CONFIG_AEABI=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_CMDLINE="mem=128M console=ttyAMA0"
-CONFIG_VFP=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=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_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_PCI=y
-CONFIG_8139CP=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_HW_RANDOM=y
-CONFIG_HWMON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_TMPFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_SQUASHFS=y
-CONFIG_MAGIC_SYSRQ=y
diff -r b55c80be32b6 -r 2f39d1bfb2fd sources/targets/armv6l/settings
--- a/sources/targets/armv6l/settings	Fri Jul 02 12:58:41 2010 -0500
+++ b/sources/targets/armv6l/settings	Fri Jul 02 23:38:31 2010 -0500
@@ -22,6 +22,21 @@
 DOPIC=y
 "
 
+LINUX_CONFIG="
+CONFIG_MMU=y
+CONFIG_ARCH_VERSATILE_PB=y
+#CONFIG_MACH_VERSATILE_AB=y
+CONFIG_CPU_V6=y
+CONFIG_ARM_THUMB=y
+CONFIG_VFP=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
+"
+
 emulator_command()
 {
   echo qemu-system-arm -M versatilepb -cpu arm1136 $(qemu_defaults "$@") \
diff -r b55c80be32b6 -r 2f39d1bfb2fd system-image.sh
--- a/system-image.sh	Fri Jul 02 12:58:41 2010 -0500
+++ b/system-image.sh	Fri Jul 02 23:38:31 2010 -0500
@@ -54,7 +54,7 @@
 then
   setupfor linux
   [ -z "$BOOT_KARCH" ] && BOOT_KARCH=$KARCH
-  cp "$(getconfig linux)" mini.conf || dienow
+  getconfig linux > mini.conf || dienow
   [ "$SYSIMAGE_TYPE" == "initramfs" ] &&
     (echo "CONFIG_BLK_DEV_INITRD=y" >> mini.conf || dienow)
   make ARCH=$BOOT_KARCH KCONFIG_ALLCONFIG=mini.conf $LINUX_FLAGS \