Commit a746e6ab authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds

[PATCH] Consolidate various v850 platform banner printks

Consolidate various v850 platform banner printks
parent 8a6f4e29
...@@ -60,12 +60,6 @@ void __init mach_early_init (void) ...@@ -60,12 +60,6 @@ void __init mach_early_init (void)
void __init mach_setup (char **cmdline) 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 #ifdef CONFIG_V850E_NB85E_UART_CONSOLE
nb85e_uart_cons_init (1); nb85e_uart_cons_init (1);
#endif #endif
......
...@@ -73,8 +73,6 @@ void __init mach_early_init (void) ...@@ -73,8 +73,6 @@ void __init mach_early_init (void)
void __init mach_setup (char **cmdline) void __init mach_setup (char **cmdline)
{ {
printk (KERN_INFO "CPU: NEC V850E2 (NA85E2C FPGA implementation)\n");
memcons_setup (); memcons_setup ();
/* Setup up NMI0 to copy the registers to a known memory location. /* Setup up NMI0 to copy the registers to a known memory location.
......
...@@ -60,20 +60,6 @@ void __init mach_early_init (void) ...@@ -60,20 +60,6 @@ void __init mach_early_init (void)
void __init mach_setup (char **cmdline) 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. */ /* Probe for Mother-A, and print a message if we find it. */
*(volatile long *)MB_A_SRAM_ADDR = 0xDEADBEEF; *(volatile long *)MB_A_SRAM_ADDR = 0xDEADBEEF;
if (*(volatile long *)MB_A_SRAM_ADDR == 0xDEADBEEF) { if (*(volatile long *)MB_A_SRAM_ADDR == 0xDEADBEEF) {
......
...@@ -78,6 +78,9 @@ void __init setup_arch (char **cmdline) ...@@ -78,6 +78,9 @@ void __init setup_arch (char **cmdline)
/* ... and tell the kernel about it. */ /* ... and tell the kernel about it. */
init_mem_alloc (ram_start, ram_len); init_mem_alloc (ram_start, ram_len);
printk (KERN_INFO "CPU: %s\nPlatform: %s\n",
CPU_MODEL_LONG, PLATFORM_LONG);
/* do machine-specific setups. */ /* do machine-specific setups. */
mach_setup (cmdline); mach_setup (cmdline);
......
...@@ -42,8 +42,6 @@ void __init mach_setup (char **cmdline) ...@@ -42,8 +42,6 @@ void __init mach_setup (char **cmdline)
const char *err; const char *err;
unsigned long root_dev_addr, root_dev_len; unsigned long root_dev_addr, root_dev_len;
printk (KERN_INFO "CPU: NEC V850E (GDB simulator)\n");
simcons_setup (); simcons_setup ();
printk (KERN_INFO "Reading root filesystem: %s", ROOT_FS); printk (KERN_INFO "Reading root filesystem: %s", ROOT_FS);
......
...@@ -79,8 +79,6 @@ void __init mach_early_init (void) ...@@ -79,8 +79,6 @@ void __init mach_early_init (void)
void __init mach_setup (char **cmdline) void __init mach_setup (char **cmdline)
{ {
printk (KERN_INFO "CPU: NEC V850E2 (sim85e2c simulator)\n");
memcons_setup (); memcons_setup ();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment