diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-10-09 14:29:09 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-10-15 14:45:28 +1100 |
| commit | 744c79548c78db31217b78855b7075f5fd0b92c1 (patch) | |
| tree | 4142950a338ce7a7e735f80bf90134f173020591 | |
| parent | 8463764f7e4383e1e2339eee174d4151337bc467 (diff) | |
| download | skiboot-744c79548c78db31217b78855b7075f5fd0b92c1.zip skiboot-744c79548c78db31217b78855b7075f5fd0b92c1.tar.gz skiboot-744c79548c78db31217b78855b7075f5fd0b92c1.tar.bz2 | |
console: Move dummy_console_add_nodes() to common code
All the platforms basically do the same thing
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | core/init.c | 4 | ||||
| -rw-r--r-- | core/platform.c | 4 | ||||
| -rw-r--r-- | platforms/astbmc/common.c | 4 | ||||
| -rw-r--r-- | platforms/ibm-fsp/common.c | 2 | ||||
| -rw-r--r-- | platforms/rhesus/rhesus.c | 3 |
5 files changed, 4 insertions, 13 deletions
diff --git a/core/init.c b/core/init.c index 05dd821..811662a 100644 --- a/core/init.c +++ b/core/init.c @@ -610,6 +610,10 @@ void __noreturn main_cpu_entry(const void *fdt, u32 master_cpu) if (platform.init) platform.init(); + /* Setup dummy console nodes if it's enabled */ + if (dummy_console_enabled()) + dummy_console_add_nodes(); + /* Init SLW related stuff, including fastsleep */ slw_init(); diff --git a/core/platform.c b/core/platform.c index 9a56919..1b0093d 100644 --- a/core/platform.c +++ b/core/platform.c @@ -51,10 +51,6 @@ opal_call(OPAL_CEC_REBOOT, opal_cec_reboot, 0); static void generic_platform_init(void) { fake_rtc_init(); - - /* Do we want to unconditionally enable it ? */ - if (dummy_console_enabled()) - dummy_console_add_nodes(); } static struct platform generic_platform = { diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 684fe5d..359188b 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -45,10 +45,6 @@ void astbmc_ext_irq(unsigned int chip_id __unused) void astbmc_init(void) { - /* Setup dummy console nodes */ - if (dummy_console_enabled()) - dummy_console_add_nodes(); - /* Initialize PNOR/NVRAM */ pnor_init(); diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c index 4a2c6c1..5eb2a14 100644 --- a/platforms/ibm-fsp/common.c +++ b/platforms/ibm-fsp/common.c @@ -153,8 +153,6 @@ void ibm_fsp_init(void) /* Setup console */ if (fsp_present()) fsp_console_add_nodes(); - else if (dummy_console_enabled()) - dummy_console_add_nodes(); } int64_t ibm_fsp_cec_reboot(void) diff --git a/platforms/rhesus/rhesus.c b/platforms/rhesus/rhesus.c index 41b1d5a..b749eef 100644 --- a/platforms/rhesus/rhesus.c +++ b/platforms/rhesus/rhesus.c @@ -177,9 +177,6 @@ static int rhesus_pnor_init(void) static void rhesus_init(void) { - if (dummy_console_enabled()) - dummy_console_add_nodes(); - /* Initialize PNOR/NVRAM */ rhesus_pnor_init(); } |