[PATCH] Consolidate various v850 platform banner printks

Consolidate various v850 platform banner printks

diff --git a/arch/v850/kernel/anna.c b/arch/v850/kernel/anna.c
index b5a0c844d14156e9522ca6ea1b230d083cc97a36..c734178a1f32bf4f7ee90ba702086de809c3ad37 100644 (file)
--- a/arch/v850/kernel/anna.c
+++ b/arch/v850/kernel/anna.c
@@ -60,12 +60,6 @@ void __init mach_early_init (void)
 
 void __init mach_setup (char **cmdline)
 {
-       printk (KERN_INFO
-               "CPU: %s\n"
-               "Platform: %s\n",
-               CPU_MODEL_LONG,
-               PLATFORM_LONG);
-
 #ifdef CONFIG_V850E_NB85E_UART_CONSOLE
        nb85e_uart_cons_init (1);
 #endif

diff --git a/arch/v850/kernel/fpga85e2c.c b/arch/v850/kernel/fpga85e2c.c
index a9b7d6b25398515b99134969da73179b7143f570..6c65321bbff62339d984f266649ad8084d0e213a 100644 (file)
--- a/arch/v850/kernel/fpga85e2c.c
+++ b/arch/v850/kernel/fpga85e2c.c
@@ -73,8 +73,6 @@ void __init mach_early_init (void)
 
 void __init mach_setup (char **cmdline)
 {
-       printk (KERN_INFO "CPU: NEC V850E2 (NA85E2C FPGA implementation)\n");
-
        memcons_setup ();
 
        /* Setup up NMI0 to copy the registers to a known memory location.

diff --git a/arch/v850/kernel/rte_cb.c b/arch/v850/kernel/rte_cb.c
index ab4ed0ac6e2a1535cbb6521d5165ab74740ec7ce..8f35e93e6974a5ecc206fc9a55def2423cfea547 100644 (file)
--- a/arch/v850/kernel/rte_cb.c
+++ b/arch/v850/kernel/rte_cb.c
@@ -60,20 +60,6 @@ void __init mach_early_init (void)
 
 void __init mach_setup (char **cmdline)
 {
-       printk (KERN_INFO
-               "CPU: %s\n"
-               "Platform: %s%s\n",
-               CPU_MODEL_LONG,
-               PLATFORM_LONG,
-#ifdef CONFIG_ROM_KERNEL
-               ""
-#elif defined (CONFIG_RTE_CB_MULTI)
-               " (with Multi ROM monitor)"
-#else
-               " (with ROM monitor)"
-#endif         
-               );
-
        /* Probe for Mother-A, and print a message if we find it.  */
        *(volatile long *)MB_A_SRAM_ADDR = 0xDEADBEEF;
        if (*(volatile long *)MB_A_SRAM_ADDR == 0xDEADBEEF) {

diff --git a/arch/v850/kernel/setup.c b/arch/v850/kernel/setup.c
index 72c4caefee5cb70c85db4580a39919d259ba4cb5..d4445fdc5925bbd0c6863702d2b4c443ae82eb31 100644 (file)
--- a/arch/v850/kernel/setup.c
+++ b/arch/v850/kernel/setup.c
@@ -78,6 +78,9 @@ void __init setup_arch (char **cmdline)
        /* ... and tell the kernel about it.  */
        init_mem_alloc (ram_start, ram_len);
 
+       printk (KERN_INFO "CPU: %s\nPlatform: %s\n",
+               CPU_MODEL_LONG, PLATFORM_LONG);
+
        /* do machine-specific setups.  */
        mach_setup (cmdline);
 

diff --git a/arch/v850/kernel/sim.c b/arch/v850/kernel/sim.c
index 40a4707ecc08b44392d749751ba2180f7c62f0a7..0367d135344032a8b7b40aea0f53411b34057389 100644 (file)
--- a/arch/v850/kernel/sim.c
+++ b/arch/v850/kernel/sim.c
@@ -42,8 +42,6 @@ void __init mach_setup (char **cmdline)
        const char *err;
        unsigned long root_dev_addr, root_dev_len;
 
-       printk (KERN_INFO "CPU: NEC V850E (GDB simulator)\n");
-
        simcons_setup ();
 
        printk (KERN_INFO "Reading root filesystem: %s", ROOT_FS);

diff --git a/arch/v850/kernel/sim85e2c.c b/arch/v850/kernel/sim85e2c.c
index 94f2e8f4cf21463ce55466496f67fef175713eb6..3eaf4fe72ef35316a27d344ea56c889d819670d2 100644 (file)
--- a/arch/v850/kernel/sim85e2c.c
+++ b/arch/v850/kernel/sim85e2c.c
@@ -79,8 +79,6 @@ void __init mach_early_init (void)
 
 void __init mach_setup (char **cmdline)
 {
-       printk (KERN_INFO "CPU: NEC V850E2 (sim85e2c simulator)\n");
-
        memcons_setup ();
 }