update sn2_defconfig to include new console

PATCH In review Jesse Barnes 2 participants 5 messages Jul 17, 2004 – Jul 18, 2004

Share & tools

Jesse Barnes

author

2004-07-17 21:04 UTC #0 lore raw

PATCH 1/1 update sn2_defconfig to include new console

Now that Linus' tree has the new sn2 console driver, make sn2_defconfig enable it by default. The device is major 204, minor 40. Note that you'll probably have to update your elilo.conf and inittab to use the new driver, as it's called ttySG0 rather than ttyS0.

David, can you send this update to Linus along with whatever else you're going to have him pull for 2.6.8? That'll keep things from being inconsistent.

Signed-off-by Jesse Barnes <[email protected]>

Thanks,
Jesse

===== arch/ia64/configs/sn2_defconfig 1.8 vs edited =====

arch/ia64/configs/sn2_defconfig +13 -3

@@ -24,6 +24,7 @@
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y

@@ -85,6 +86,7 @@
 # Firmware Drivers
 #
 CONFIG_EFI_VARS=y
+# CONFIG_EFI_PCDP is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set

@@ -271,7 +273,6 @@
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_MEGARAID is not set
 CONFIG_SCSI_SATA=y
 # CONFIG_SCSI_SATA_SVW is not set

@@ -527,8 +528,6 @@
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_N_HDLC is not set
 # CONFIG_STALDRV is not set
-CONFIG_SGI_L1_SERIAL=y
-CONFIG_SGI_L1_SERIAL_CONSOLE=y
 
 #
 # Serial drivers

@@ -538,6 +537,8 @@
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256

@@ -573,6 +574,11 @@
 # CONFIG_I2C is not set
 
 #
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
 # Misc devices
 #

@@ -751,6 +757,7 @@
 CONFIG_JOLIET=y
 # CONFIG_ZISOFS is not set
 CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems

@@ -785,6 +792,7 @@
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set

@@ -885,6 +893,7 @@
 #
 # Library routines
 #
+# CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m

@@ -935,6 +944,7 @@
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_ARC4 is not set
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set

Keith Owens

2004-07-17 23:24 UTC #1 lore raw

Quoted 7 lines · Jesse Barnes

=== arch/ia64/configs/sn2_defconfig 1.8 vs edited ==>--- 1.8/arch/ia64/configs/sn2_defconfig 2004-06-24 06:42:21 -07:00
+++ edited/arch/ia64/configs/sn2_defconfig 2004-07-17 09:24:59 -07:00
arch/ia64/configs/sn2_defconfig +0 -0
@@ -24,6 +24,7 @@
 # CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_KALLSYMS_EXTRA_PASS should not be turned on by default. It is only to be used when there is a bug in the kallsyms code, the extra pass provides debugging data and lets the users continue to build while we work out what is wrong with kallsyms.

Jesse Barnes

author

2004-07-18 19:34 UTC #2 lore raw

In reply to Jesse Barnes

Quoted 15 lines · Keith Owens

On Sat, 17 Jul 2004 17:04:08 -0400,
Quoted 7 lines · Jesse Barnes
=== arch/ia64/configs/sn2_defconfig 1.8 vs edited ==> >--- 1.8/arch/ia64/configs/sn2_defconfig 2004-06-24 06:42:21 -07:00
+++ edited/arch/ia64/configs/sn2_defconfig 2004-07-17 09:24:59 -07:00
arch/ia64/configs/sn2_defconfig +0 -0
@@ -24,6 +24,7 @@
 # CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_KALLSYMS_EXTRA_PASS should not be turned on by default. It is only to be used when there is a bug in the kallsyms code, the extra pass provides debugging data and lets the users continue to build while we work out what is wrong with kallsyms.

Oh, I see. I thought it was a 'double check' against bad values. I'll send out another update shortly that turns it off.

Thanks,
Jesse

Jesse Barnes

author

2004-07-18 19:57 UTC #3 lore raw

In reply to Jesse Barnes

Quoted 18 lines · Jesse Barnes

Quoted 16 lines · Keith Owens
On Sat, 17 Jul 2004 17:04:08 -0400,
Quoted 8 lines · Jesse Barnes
===== arch/ia64/configs/sn2_defconfig 1.8 vs edited =====
arch/ia64/configs/sn2_defconfig +0 -0
@@ -24,6 +24,7 @@
 # CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_KALLSYMS_EXTRA_PASS should not be turned on by default. It is only to be used when there is a bug in the kallsyms code, the extra pass provides debugging data and lets the users continue to build while we work out what is wrong with kallsyms.

Quoted 2 lines

Oh, I see. I thought it was a 'double check' against bad values. I'll send out another update shortly that turns it off.

Here it is, live from Ottawa.

Jesse

Jesse Barnes

author

2004-07-18 20:15 UTC #4 lore raw

In reply to Jesse Barnes

Quoted 19 lines · Jesse Barnes

Quoted 18 lines · Jesse Barnes
Quoted 16 lines · Keith Owens
On Sat, 17 Jul 2004 17:04:08 -0400,
Quoted 8 lines · Jesse Barnes
===== arch/ia64/configs/sn2_defconfig 1.8 vs edited =====
arch/ia64/configs/sn2_defconfig +0 -0
@@ -24,6 +24,7 @@
 # CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_KALLSYMS_EXTRA_PASS should not be turned on by default. It is only to be used when there is a bug in the kallsyms code, the extra pass provides debugging data and lets the users continue to build while we work out what is wrong with kallsyms.

Quoted 4 lines

Quoted 2 lines
Oh, I see. I thought it was a 'double check' against bad values. I'll send out another update shortly that turns it off.
Here it is, live from Ottawa.

And here's the actual patch. Sorry for the trouble.

Jesse

===== arch/ia64/configs/sn2_defconfig 1.8 vs edited =====

arch/ia64/configs/sn2_defconfig +13 -3

@@ -24,6 +24,7 @@
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y

@@ -85,6 +86,7 @@
 # Firmware Drivers
 #
 CONFIG_EFI_VARS=y
+# CONFIG_EFI_PCDP is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set

@@ -271,7 +273,6 @@
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_MEGARAID is not set
 CONFIG_SCSI_SATA=y
 # CONFIG_SCSI_SATA_SVW is not set

@@ -527,8 +528,6 @@
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_N_HDLC is not set
 # CONFIG_STALDRV is not set
-CONFIG_SGI_L1_SERIAL=y
-CONFIG_SGI_L1_SERIAL_CONSOLE=y
 
 #
 # Serial drivers

@@ -538,6 +537,8 @@
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256

@@ -573,6 +574,11 @@
 # CONFIG_I2C is not set
 
 #
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
 # Misc devices
 #

@@ -751,6 +757,7 @@
 CONFIG_JOLIET=y
 # CONFIG_ZISOFS is not set
 CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems

@@ -785,6 +792,7 @@
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set

@@ -885,6 +893,7 @@
 #
 # Library routines
 #
+# CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m

@@ -935,6 +944,7 @@
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_ARC4 is not set
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set