From 364983fa82746f78149d22d451ca8b7a09fd6ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= <fs@debian.org>
Date: Fri, 8 Sep 2006 11:41:02 +0000
Subject: [PATCH] Update amd64 xen subarch config and defines to work with new
 config creation.

svn path=/dists/trunk/linux-2.6/; revision=7377
---
 debian/arch/amd64/xen/config       | 20 ----------------
 debian/arch/amd64/xen/config.amd64 | 37 ------------------------------
 debian/arch/amd64/xen/defines      |  5 ++++
 3 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 debian/arch/amd64/xen/config.amd64

diff --git a/debian/arch/amd64/xen/config b/debian/arch/amd64/xen/config
index c5cc18394..8ce377fee 100644
--- a/debian/arch/amd64/xen/config
+++ b/debian/arch/amd64/xen/config
@@ -1,21 +1 @@
 CONFIG_X86_64_XEN=y
-CONFIG_XEN_PCIDEV_FRONTEND=y
-# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XEN_PCIDEV_BACKEND=y
-CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
-# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
-# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-# CONFIG_XEN_TPMDEV_BACKEND is not set
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_LOOPBACK=m
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DISABLE_SERIAL=y
-CONFIG_XEN_SYSFS=y
-CONFIG_XEN_COMPAT_030002_AND_LATER=y
-# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
diff --git a/debian/arch/amd64/xen/config.amd64 b/debian/arch/amd64/xen/config.amd64
deleted file mode 100644
index 9f760245d..000000000
--- a/debian/arch/amd64/xen/config.amd64
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_LOCK_KERNEL=y
-CONFIG_CPUSETS=y
-CONFIG_STOP_MACHINE=y
-CONFIG_SMP=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NUMA=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_NR_CPUS=32
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_R8169_VLAN is not set
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_MAVEN=m
-# CONFIG_SOUND_AWE32_SYNTH is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_DIGIEPCA=m
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM=y
-CONFIG_DISCONTIGMEM_MANUAL=y
-CONFIG_ACPI_NUMA=y
-CONFIG_MIGRATION=y
-CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
-CONFIG_SUSPEND_SMP=y
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_NODES_SHIFT=6
-CONFIG_X86_L1_CACHE_BYTES=128
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_K8_NUMA=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-# CONFIG_MPSC is not set
-# CONFIG_MK8 is not set
-CONFIG_GENERIC_CPU=y
diff --git a/debian/arch/amd64/xen/defines b/debian/arch/amd64/xen/defines
index cb77ed90f..481ba9b6d 100644
--- a/debian/arch/amd64/xen/defines
+++ b/debian/arch/amd64/xen/defines
@@ -3,8 +3,13 @@ flavours:
  amd64
 
 [image]
+configs: amd64/xen/config _xen/config
 initramfs-generators: initramfs-tools 
 type: plain-xen
 
 [xen]
 flavour: amd64
+
+[amd64_image]
+configs: amd64/config.amd64
+