diff --git a/arch/sandbox/board/console.c b/arch/sandbox/board/console.c index cd5ad57..cf1781d 100644 --- a/arch/sandbox/board/console.c +++ b/arch/sandbox/board/console.c @@ -22,7 +22,7 @@ #include #include -int barebox_register_console(char *name, int stdinfd, int stdoutfd) +int barebox_register_console(int stdinfd, int stdoutfd) { struct device_d *dev; struct linux_console_data *data; @@ -32,9 +32,8 @@ data = (struct linux_console_data *)(dev + 1); dev->platform_data = data; - strcpy(dev->name, name); - strcpy(dev->name, "console"); + dev->id = DEVICE_ID_DYNAMIC; data->stdoutfd = stdoutfd; data->stdinfd = stdinfd; diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 1f11ed4..1327a56 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -19,7 +19,7 @@ int linux_execve(const char * filename, char *const argv[], char *const envp[]); -int barebox_register_console(char *name_template, int stdinfd, int stdoutfd); +int barebox_register_console(int stdinfd, int stdoutfd); int barebox_register_dtb(const void *dtb); diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 67667d4..192917a 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -366,7 +366,7 @@ exit(1); } - barebox_register_console("cout", -1, fd); + barebox_register_console(-1, fd); break; case 'I': fd = open(optarg, O_RDWR); @@ -375,7 +375,7 @@ exit(1); } - barebox_register_console("cin", fd, -1); + barebox_register_console(fd, -1); break; case 'x': sdl_xres = strtoul(optarg, NULL, 0); @@ -426,7 +426,7 @@ } } - barebox_register_console("console", fileno(stdin), fileno(stdout)); + barebox_register_console(fileno(stdin), fileno(stdout)); rawmode(); start_barebox(); diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c index 760b3b8..0d5da9d 100644 --- a/drivers/serial/linux_console.c +++ b/drivers/serial/linux_console.c @@ -73,6 +73,9 @@ console_register(cdev); + pr_info("%s: registered as %s%d\n", dev->name, cdev->class_dev.name, + cdev->class_dev.id); + return 0; }