From fe8fea26aa3ba7f3c45894e52e050dfe41db46d1 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 11 Oct 2014 21:03:18 +0000 Subject: [PATCH] [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles (Closes: #764745) From: Mauricio Faria de Oliveira - 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). svn path=/dists/sid/linux/; revision=21943 --- debian/changelog | 5 +++++ debian/config/kernelarch-powerpc/config-arch-64 | 1 - debian/config/kernelarch-powerpc/config-arch-64-be | 5 +++++ debian/config/kernelarch-powerpc/config-arch-64-le | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8192e261b..1ce968962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sat, 11 Oct 2014 21:41:58 +0100 linux (3.16.5-1) unstable; urgency=medium diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index 58fb65ffd..2d524df40 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -9,7 +9,6 @@ CONFIG_NUMA=y 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 ## diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be index b662db0d5..7210101f1 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-be +++ b/debian/config/kernelarch-powerpc/config-arch-64-be @@ -1,3 +1,8 @@ +## +## file: arch/powerpc/Kconfig +## +CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0" + ## ## file: arch/powerpc/platforms/cell/Kconfig ## diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le index dbe0a4183..be64aa451 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-le +++ b/debian/config/kernelarch-powerpc/config-arch-64-le @@ -1,3 +1,8 @@ +## +## file: arch/powerpc/Kconfig +## +# CONFIG_CMDLINE_BOOL is not set + ## ## file: arch/powerpc/platforms/Kconfig.cputype ##