Skip to contentSkip to conversation

microblaze: remove check for CONFIG_XILINX_CONSOLE

PATCH In review Paul Bolle 2 participants 2 messages May 20, 2014 – May 22, 2014 Microblaze architecture

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 microblaze: remove check for CONFIG_XILINX_CONSOLE

There's been a check for CONFIG_XILINX_CONSOLE since v2.6.30. But the Kconfig symbol XILINX_CONSOLE was never added. Remove this check.

And, since DUMMY_CONSOLE depends on VT, we can now drop the check for CONFIG_VT.

Signed-off-by Paul Bolle <[email protected]>

---
Untested.

Note that xil_con doesn't exit either.

 arch/microblaze/kernel/setup.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
arch/microblaze/kernel/setup.c +1 -5
index bd422794a651..3a93843d346c 100644
@@ -71,13 +71,9 @@ void __init setup_arch(char **cmdline_p)
 
 	xilinx_pci_init();
 
-#ifdef CONFIG_VT
-#if defined(CONFIG_XILINX_CONSOLE)
-	conswitchp = &xil_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
+#if defined(CONFIG_DUMMY_CONSOLE)
 	conswitchp = &dummy_con;
 #endif
-#endif
 }
 
 #ifdef CONFIG_MTD_UCLINUX
Signature · 1 line
1.9.0
maintainer
#1 lore raw
Quoted 24 lines · Paul Bolle

There's been a check for CONFIG_XILINX_CONSOLE since v2.6.30. But the Kconfig symbol XILINX_CONSOLE was never added. Remove this check.

And, since DUMMY_CONSOLE depends on VT, we can now drop the check for CONFIG_VT.

Signed-off-by Paul Bolle <[email protected]>

---
Untested.

Note that xil_con doesn't exit either.

 arch/microblaze/kernel/setup.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
arch/microblaze/kernel/setup.c +0 -1
index bd422794a651..3a93843d346c 100644
@@ -71,13 +71,9 @@ void __init setup_arch(char **cmdline_p)
 
 	xilinx_pci_init();
 
-#ifdef CONFIG_VT

arch/microblaze/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 79

Quoted 10 lines
arch/microblaze/kernel/setup.c +1 -4
-#if defined(CONFIG_XILINX_CONSOLE)
-	conswitchp = &xil_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
+#if defined(CONFIG_DUMMY_CONSOLE)
 	conswitchp = &dummy_con;
 #endif
-#endif
 }
 
 #ifdef CONFIG_MTD_UCLINUX

Looks reasonable.
Applied.

Thanks,
Michal

Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform