Powermac zilog serial driver should be built-in

[Jeremy Kerr]

The Powermac zilog serial driver (CONFIG_SERIAL_PMAC_ZILOG) is useful for console output, especially as it is available as the only emulated serial device on KVM on powerpc.

However, it is currently only available as a module, leaving the ubuntu kernel with no serial console on virtual powerpc boots.

[Jeremy Kerr (jk-ozlabs)]

SERIAL_PMAC_ZILOG allows us to get a serial device on KVM-virtualised
powerpc, so build it in to the kernel to allow serial console on these
platforms. This also requires SERIAL_PMAC_ZILOG_CONSOLE.

Since we now set SERIAL_CORE=y on powerpc, this change moves it into the
common.ubuntu config.

BugLink: http://bugs.launchpad.net/bugs/673346

Signed-off-by: Jeremy Kerr <email address hidden>

---
 debian.master/config/amd64/config.common.amd64 | 2 +-
 debian.master/config/armel/config.common.armel | 2 +-
 debian.master/config/config.common.ubuntu | 3 ++-
 debian.master/config/i386/config.common.i386 | 2 +-
 debian.master/config/powerpc/config.common.powerpc | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 202ddd7..03cac17 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -348,7 +348,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_PMACZILOG is not set
 CONFIG_SERIAL_UARTLITE=m
 # CONFIG_SLAB is not set
 CONFIG_SLHC=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index b2bcc3f..d1b714a 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -213,7 +213,7 @@ CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_AK8975 is not set
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_PMACZILOG is not set
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SLHC=y
 CONFIG_SMSC_PHY=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7d900d9..634828a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4077,6 +4077,7 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_SERIAL_ICOM is not set
@@ -4089,7 +4090,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_SERIAL_PMACZILOG=m
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
 # CONFIG_SERIAL_PMACZILOG_TTYS is not set
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIO=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f0c8dd4..6eb1cdd 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -350,7 +350,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_PMACZILOG is not set
 CONFIG_SERIAL_UARTLITE=m
 # CONFIG_SLAB is not set
 CONFIG_SLHC=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 94934...

[Andy Whitcroft (apw)]

Applied to Natty.

-apw

[Launchpad Janitor (janitor)]

This bug was fixed in the package linux - 2.6.37-3.11

---------------
linux (2.6.37-3.11) natty; urgency=low

  [ Andy Whitcroft ]

  * Revert "ubuntu: AUFS -- update to
    b37c575759dc4535ccc03241c584ad5fe69e3b25"
  * Revert "ubuntu: AUFS -- track changes to the arguements to fop fsync()"
  * Revert "ubuntu: AUFS -- update to standalone 2.6.35-rcN as at 20100601"
  * Revert "ubuntu: AUFS -- update to standalone 2.6.34 as at 20100601"
  * Revert "ubuntu: AUFS -- aufs2 base patch for linux-2.6.34"
  * [Config] Disable intel_idle for -virtual kernels
    - LP: #651370
  * [Config] enforcer -- ensure we never enable CONFIG_IMA
  * debian -- pass the correct flavour name when checking configs
  * [Config] enforcer -- ensure CONFIG_INTEL_IDLE is off for -virtual
  * [Config] ensure CONFIG_IPV6=y for powerpc
  * [Config] enforcer -- ensure CONFIG_IPV6=y
  * ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103
  * ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-36-UNRELEASED-20101103
  * ubuntu: AUFS -- update to aufs2.1-36-UNRELEASED-20101103
  * ubuntu: AUFS -- re-enable
  * ubuntu: AUFS -- track changes to work queue initialisation
  * ubuntu: AUFS -- track changes to llseek in v2.6.37-rc1
  * SAUCE: fbcon -- fix race between open and removal of framebuffers
  * SAUCE: fbcon -- fix OOPs triggered by race prevention fixes
    - LP: #614008
  * SAUCE: drm -- stop early access to drm devices

  [ Jeremy Kerr ]

  * [Config] Build-in powermac ZILOG serial driver
    - LP: #673346

  [ Kees Cook ]

  * SAUCE: nx-emu: use upstream ASLR when possible

  [ Tim Gardner ]

  * [Config] Use correct be2iscsi module name in d-i/modules/scsi-modules
    - LP: #628776

  [ Upstream Kernel Changes ]

  * i386: NX emulation
  * nx-emu: drop exec-shield sysctl, merge with disable_nx
  * nx-emu: standardize boottime message prefix
  * mmap randomization for executable mappings on 32-bit
  * exec-randomization: brk away from exec rand area
 -- Andy Whitcroft <email address hidden> Thu, 11 Nov 2010 23:46:37 +0000