diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sandbox/Makefile | 2 | ||||
-rw-r--r-- | arch/sandbox/board/Makefile | 5 | ||||
-rw-r--r-- | arch/sandbox/board/board.c | 45 | ||||
-rw-r--r-- | arch/sandbox/board/clock.c | 48 | ||||
-rw-r--r-- | arch/sandbox/board/console.c | 55 | ||||
-rw-r--r-- | arch/sandbox/board/hostfile.c | 95 |
6 files changed, 1 insertions, 249 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 25fcceb7e0..e15009e2ab 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -70,6 +70,6 @@ cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \ -Wl,--start-group $(uboot-common) -Wl,--end-group \ -lrt -lpthread -common-y += arch/sandbox/lib/ arch/sandbox/board/ +common-y += arch/sandbox/lib/ board/sandbox/ MRPROPER_FILES += include/asm-sandbox/arch diff --git a/arch/sandbox/board/Makefile b/arch/sandbox/board/Makefile deleted file mode 100644 index af62aa25dc..0000000000 --- a/arch/sandbox/board/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += board.o -obj-y += clock.o -obj-y += hostfile.o -obj-y += console.o - diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c deleted file mode 100644 index f7cde99537..0000000000 --- a/arch/sandbox/board/board.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * board.c - * - * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <common.h> -#include <driver.h> -#include <malloc.h> -#include <asm/arch/linux.h> -#include <init.h> -#include <errno.h> - -static struct device_d tap_device = { - .name = "tap", - .id = "eth0", - - .type = DEVICE_TYPE_ETHER, -}; - -static int devices_init(void) -{ - register_device(&tap_device); - - return 0; -} - -device_initcall(devices_init); - diff --git a/arch/sandbox/board/clock.c b/arch/sandbox/board/clock.c deleted file mode 100644 index 27ae7e234c..0000000000 --- a/arch/sandbox/board/clock.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * clock.c - wrapper between a U-Boot clocksource and linux - * - * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <common.h> -#include <init.h> -#include <clock.h> -#include <asm/arch/linux.h> - -static uint64_t linux_clocksource_read(void) -{ - return linux_get_time(); -} - -static struct clocksource cs = { - .read = linux_clocksource_read, - .mask = 0xffffffff, - .shift = 10, -}; - -static int clocksource_init (void) -{ - cs.mult = clocksource_hz2mult(1000 * 1000 * 1000, cs.shift); - - init_clock(&cs); - - return 0; -} - -core_initcall(clocksource_init); diff --git a/arch/sandbox/board/console.c b/arch/sandbox/board/console.c deleted file mode 100644 index 0f54e19231..0000000000 --- a/arch/sandbox/board/console.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * console.c - register a console device - * - * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <common.h> -#include <driver.h> -#include <asm/arch/linux.h> -#include <xfuncs.h> - -int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd) -{ - struct device_d *dev; - struct linux_console_data *data; - - dev = xzalloc(sizeof(struct device_d) + sizeof(struct linux_console_data)); - - data = (struct linux_console_data *)(dev + 1); - - dev->platform_data = data; - - strcpy(dev->name, "console"); - - - if (stdinfd >= 0) - data->flags = CONSOLE_STDIN; - if (stdoutfd >= 0) - data->flags |= CONSOLE_STDOUT | CONSOLE_STDERR; - - data->stdoutfd = stdoutfd; - data->stdinfd = stdinfd; - - get_free_deviceid(dev->id, name_template); - dev->type = DEVICE_TYPE_CONSOLE; - - return register_device(dev); -} - diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c deleted file mode 100644 index 6521722209..0000000000 --- a/arch/sandbox/board/hostfile.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * hostfile.c - use files from the host to simalute U-Boot devices - * - * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <common.h> -#include <driver.h> -#include <malloc.h> -#include <asm/arch/linux.h> -#include <init.h> -#include <errno.h> -#include <asm/arch/hostfile.h> -#include <xfuncs.h> - -static ssize_t hf_read(struct device_d *dev, void *buf, size_t count, ulong offset, ulong flags) -{ - struct hf_platform_data *hf = dev->platform_data; - int fd = hf->fd; - - if (linux_lseek(fd, offset) != offset) - return -EINVAL; - - return linux_read(fd, buf, count); -} - -static ssize_t hf_write(struct device_d *dev, const void *buf, size_t count, ulong offset, ulong flags) -{ - struct hf_platform_data *hf = dev->platform_data; - int fd = hf->fd; - - if (linux_lseek(fd, offset) != offset) - return -EINVAL; - - return linux_write(fd, buf, count); -} - -static void hf_info(struct device_d *dev) -{ - struct hf_platform_data *hf = dev->platform_data; - - printf("file: %s\n", hf->filename); -} - -static struct driver_d hf_drv = { - .name = "hostfile", - .probe = dummy_probe, - .read = hf_read, - .write = hf_write, - .info = hf_info, - .type = DEVICE_TYPE_BLOCK, -}; - -static int hf_init(void) -{ - return register_driver(&hf_drv); -} - -device_initcall(hf_init); - -int u_boot_register_filedev(struct hf_platform_data *hf, char *name_template) -{ - struct device_d *dev; - - dev = xzalloc(sizeof(struct device_d)); - - dev->platform_data = hf; - - hf = dev->platform_data; - - strcpy(dev->name,"hostfile"); - get_free_deviceid(dev->id, name_template); - dev->size = hf->size; - dev->map_base = hf->map_base; - dev->type = DEVICE_TYPE_BLOCK; - - return register_device(dev); -} - |