Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

h8300: switch EARLYCON

Browse source 
earlyprintk is architecture specific option.
earlycon is generic and small footprint.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
This commit is contained in:
Yoshinori Sato 2015-11-21 21:42:58 +09:00
parent d85816167b
commit 8cad489261
3 changed files with 10 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/h8300/configs/h8300h-sim_defconfig
View file

@ -34,7 +34,7 @@ CONFIG_BINFMT_FLAT=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_SH_SCI_EARLYCON=y
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set

7
arch/h8300/kernel/setup.c
View file

@ -20,8 +20,6 @@
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
@ -137,11 +135,6 @@ void __init setup_arch(char **cmdline_p)
parse_early_param(); parse_early_param();
bootmem_init(); bootmem_init();
#if defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)
sim_console_register();
#endif
early_platform_driver_probe("earlyprintk", 1, 0);
/* /*
* get kmalloc into gear * get kmalloc into gear
*/ */

67
arch/h8300/kernel/sim-console.c
View file

@ -1,79 +1,30 @@
/* /*
* arch/h8300/kernel/early_printk.c * arch/h8300/kernel/sim-console.c
* *
* Copyright (C) 2009 Yoshinori Sato <ysato@users.sourceforge.jp> * Copyright (C) 2015 Yoshinori Sato <ysato@users.sourceforge.jp>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
*/ */
#include <linux/console.h> #include <linux/console.h>
#include <linux/tty.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/serial_core.h>
#include <linux/platform_device.h>
static void sim_write(struct console *co, const char *ptr, static void sim_write(struct console *con, const char *s, unsigned n)
unsigned len)
{ {
register const int fd __asm__("er0") = 1; /* stdout */ register const int fd __asm__("er0") = 1; /* stdout */
register const char *_ptr __asm__("er1") = ptr; register const char *_ptr __asm__("er1") = s;
register const unsigned _len __asm__("er2") = len; register const unsigned _len __asm__("er2") = n;
__asm__(".byte 0x5e,0x00,0x00,0xc7\n\t" /* jsr @0xc7 (sys_write) */ __asm__(".byte 0x5e,0x00,0x00,0xc7\n\t" /* jsr @0xc7 (sys_write) */
: : "g"(fd), "g"(_ptr), "g"(_len)); : : "g"(fd), "g"(_ptr), "g"(_len));
} }
static struct console sim_console = { static int __init sim_setup(struct earlycon_device *device, const char *opt)
.name = "sim_console",
.write = sim_write,
.setup = NULL,
.flags = CON_PRINTBUFFER,
.index = -1,
};
static char sim_console_buf[32];
static int sim_probe(struct platform_device *pdev)
{ {
if (sim_console.data) device->con->write = sim_write;
return -EEXIST;
if (!strstr(sim_console_buf, "keep"))
sim_console.flags |= CON_BOOT;
register_console(&sim_console);
return 0; return 0;
} }
static int sim_remove(struct platform_device *pdev) EARLYCON_DECLARE(h8sim, sim_setup);
{
return 0;
}
static struct platform_driver sim_driver = {
.probe = sim_probe,
.remove = sim_remove,
.driver = {
.name = "h8300-sim",
.owner = THIS_MODULE,
},
};
early_platform_init_buffer("earlyprintk", &sim_driver,
sim_console_buf, ARRAY_SIZE(sim_console_buf));
static struct platform_device sim_console_device = {
.name = "h8300-sim",
.id = 0,
};
static struct platform_device *devices[] __initdata = {
&sim_console_device,
};
void __init sim_console_register(void)
{
early_platform_add_devices(devices,
ARRAY_SIZE(devices));
}