diff options
Diffstat (limited to 'board/sandbox')
| -rw-r--r-- | board/sandbox/board.c | 1 | ||||
| -rw-r--r-- | board/sandbox/console.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/board/sandbox/board.c b/board/sandbox/board.c index c0397ab0ab..a3f64983c4 100644 --- a/board/sandbox/board.c +++ b/board/sandbox/board.c @@ -29,7 +29,6 @@ static struct device_d tap_device = { .name = "tap", - .id = "eth0", }; static int devices_init(void) diff --git a/board/sandbox/console.c b/board/sandbox/console.c index a3d2ce93c6..7b429df8b3 100644 --- a/board/sandbox/console.c +++ b/board/sandbox/console.c @@ -25,7 +25,7 @@ #include <asm/arch/linux.h> #include <xfuncs.h> -int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd) +int u_boot_register_console(char *name, int stdinfd, int stdoutfd) { struct device_d *dev; struct linux_console_data *data; @@ -35,10 +35,10 @@ int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd) data = (struct linux_console_data *)(dev + 1); dev->platform_data = data; + strcpy(dev->name, name); strcpy(dev->name, "console"); - if (stdinfd >= 0) data->flags = CONSOLE_STDIN; if (stdoutfd >= 0) @@ -47,8 +47,6 @@ int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd) data->stdoutfd = stdoutfd; data->stdinfd = stdinfd; - get_free_deviceid(dev->id, name_template); - return register_device(dev); } |