r3427 - trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64
Frederik Schüler
fschueler-guest@costa.debian.org
Sat, 09 Jul 2005 20:47:54 +0000
Author: fschueler-guest
Date: 2005-07-09 20:47:53 +0000 (Sat, 09 Jul 2005)
New Revision: 3427
Modified:
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/Makefile.inc
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-generic
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8-smp
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.default
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4
trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4-smp
Log:
- polish flavour configs, this should be good for release.
- cleaned Makefile.inc.
Changes for amd64:
* switch from gcc-3.4 to default gcc (make m-a users happy)
* 64bit kernel support for i386 userland suspendend until gcc-4.0 cross-compiling is fixed
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/Makefile.inc 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/Makefile.inc 2005-07-09 20:47:53 UTC (rev 3427)
@@ -2,9 +2,7 @@
# Variables
#
include_common_config := no
-headers_extra := arch/x86_64/kernel/ams-offsets.s
initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
headers_dirs = x86_64
-build_makeflags := 'V=1 CC=gcc-3.4'
default_config := default
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-generic
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-generic 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-generic 2005-07-09 20:47:53 UTC (rev 3427)
@@ -355,9 +355,15 @@
#
# Plug and Play support
#
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=m
@@ -447,6 +453,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -1073,16 +1080,17 @@
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_NET_SB1000=m
#
# ARCnet devices
@@ -1578,7 +1586,7 @@
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8 2005-07-09 20:47:53 UTC (rev 3427)
@@ -355,9 +355,15 @@
#
# Plug and Play support
#
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=m
@@ -447,6 +453,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -1073,16 +1080,17 @@
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_NET_SB1000=m
#
# ARCnet devices
@@ -1578,7 +1586,7 @@
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8-smp
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8-smp 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.amd64-k8-smp 2005-07-09 20:47:53 UTC (rev 3427)
@@ -363,9 +363,15 @@
#
# Plug and Play support
#
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=m
@@ -455,6 +461,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -1077,16 +1084,17 @@
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_NET_SB1000=m
#
# ARCnet devices
@@ -1571,7 +1579,7 @@
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.default
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.default 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.default 2005-07-09 20:47:53 UTC (rev 3427)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12
-# Mon Jun 20 23:37:36 2005
+# Linux kernel version: 2.6.12-1
+# Thu Jul 7 23:45:34 2005
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -229,9 +229,15 @@
#
# Plug and Play support
#
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=y
@@ -286,6 +292,7 @@
#
CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_SHARE_IRQ is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -500,6 +507,7 @@
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
CONFIG_TUN=y
+CONFIG_NET_SB1000=m
#
# ARCnet devices
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4 2005-07-09 20:47:53 UTC (rev 3427)
@@ -355,9 +355,15 @@
#
# Plug and Play support
#
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=m
@@ -447,6 +453,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -1073,16 +1080,17 @@
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_NET_SB1000=m
#
# ARCnet devices
@@ -1578,7 +1586,7 @@
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4-smp
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4-smp 2005-07-07 02:49:33 UTC (rev 3426)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/amd64/config.em64t-p4-smp 2005-07-09 20:47:53 UTC (rev 3427)
@@ -362,9 +362,15 @@
#
# Plug and Play support
#
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
#
+# Protocols
+#
+CONFIG_PNPACPI=y
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=m
@@ -454,6 +460,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -1076,16 +1083,17 @@
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_NET_SB1000=m
#
# ARCnet devices
@@ -1570,7 +1578,7 @@
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y