[kernel] r21943 - in dists/sid/linux/debian: . config/kernelarch-powerpc

[Ben Hutchings]

Author: benh
Date: Sat Oct 11 21:03:18 2014
New Revision: 21943

Log:
[ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles (Closes: #764745)

From: Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com>

- The value of ppc64 is incorrect for ppc64el (specifically, console=tty0),
  rendering the console useless (blank and unresponsive) if no kernel parameters
  are specified (e.g., debian-installer netboot).
- It's not needed currently: the kernel correctly autodetects the console
  on ppc64el platforms (hvc0 on pseries, hvc0 and hvc1 on powernv).

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64
   dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-be
   dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-le

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sat Oct 11 20:43:03 2014	(r21942)
+++ dists/sid/linux/debian/changelog	Sat Oct 11 21:03:18 2014	(r21943)
@@ -1,8 +1,13 @@
 linux (3.16.5-2) UNRELEASED; urgency=medium
 
+  [ Ben Hutchings ]
   * qla2xxx: fix kernel NULL pointer access (regression in 3.16)
     (Closes: #764804)
 
+  [ Mauricio Faria de Oliveira ]
+  * [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles
+    (Closes: #764745)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Oct 2014 21:41:58 +0100
 
 linux (3.16.5-1) unstable; urgency=medium

Modified: dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64	Sat Oct 11 20:43:03 2014	(r21942)
+++ dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64	Sat Oct 11 21:03:18 2014	(r21943)
@@ -9,7 +9,6 @@
 CONFIG_PPC_64K_PAGES=y
 ## end choice
 CONFIG_SCHED_SMT=y
-CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
 CONFIG_KERNEL_START=0xc000000000000000
 
 ##

Modified: dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-be
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-be	Sat Oct 11 20:43:03 2014	(r21942)
+++ dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-be	Sat Oct 11 21:03:18 2014	(r21943)
@@ -1,4 +1,9 @@
 ##
+## file: arch/powerpc/Kconfig
+##
+CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
+
+##
 ## file: arch/powerpc/platforms/cell/Kconfig
 ##
 CONFIG_PPC_IBM_CELL_BLADE=y

Modified: dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-le
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-le	Sat Oct 11 20:43:03 2014	(r21942)
+++ dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64-le	Sat Oct 11 21:03:18 2014	(r21943)
@@ -1,4 +1,9 @@
 ##
+## file: arch/powerpc/Kconfig
+##
+# CONFIG_CMDLINE_BOOL is not set
+
+##
 ## file: arch/powerpc/platforms/Kconfig.cputype
 ##
 CONFIG_NR_CPUS=2048