- 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 svn path=/trunk/kernel/source/linux-kernel-2.6.12/; revision=3427
This commit is contained in:
parent
e698c06dab
commit
b6333e75bd
|
@ -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
|
||||
|
||||
|
|
|
@ -355,7 +355,13 @@ CONFIG_PARPORT_1284=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNP_DEBUG=y
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
@ -447,6 +453,7 @@ CONFIG_BLK_DEV_IDESCSI=m
|
|||
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_HCIUART_BCSP=y
|
|||
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_ISTALLION=m
|
|||
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
|
||||
|
|
|
@ -355,7 +355,13 @@ CONFIG_PARPORT_1284=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNP_DEBUG=y
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
@ -447,6 +453,7 @@ CONFIG_BLK_DEV_IDESCSI=m
|
|||
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_HCIUART_BCSP=y
|
|||
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_ISTALLION=m
|
|||
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
|
||||
|
|
|
@ -363,7 +363,13 @@ CONFIG_PARPORT_1284=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNP_DEBUG=y
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
@ -455,6 +461,7 @@ CONFIG_BLK_DEV_IDESCSI=m
|
|||
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_HCIUART_BCSP=y
|
|||
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_STALDRV=y
|
|||
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
|
||||
|
|
|
@ -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,7 +229,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNP_DEBUG=y
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
@ -286,6 +292,7 @@ CONFIG_BLK_DEV_IDECD=y
|
|||
#
|
||||
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_NETDEVICES=y
|
|||
# CONFIG_BONDING is not set
|
||||
# CONFIG_EQUALIZER is not set
|
||||
CONFIG_TUN=y
|
||||
CONFIG_NET_SB1000=m
|
||||
|
||||
#
|
||||
# ARCnet devices
|
||||
|
|
|
@ -355,7 +355,13 @@ CONFIG_PARPORT_1284=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNP_DEBUG=y
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
@ -447,6 +453,7 @@ CONFIG_BLK_DEV_IDESCSI=m
|
|||
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_HCIUART_BCSP=y
|
|||
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_ISTALLION=m
|
|||
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
|
||||
|
|
|
@ -362,7 +362,13 @@ CONFIG_PARPORT_1284=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNP_DEBUG=y
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
@ -454,6 +460,7 @@ CONFIG_BLK_DEV_IDESCSI=m
|
|||
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_HCIUART_BCSP=y
|
|||
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_STALDRV=y
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue