diff options
| -rw-r--r-- | arch/arm/lib/eabi_compat.c | 4 | ||||
| -rw-r--r-- | arch/sandbox/config.mk | 1 | ||||
| -rw-r--r-- | arch/sandbox/cpu/Makefile | 7 | ||||
| -rw-r--r-- | arch/sandbox/cpu/cpu.c | 4 | ||||
| -rw-r--r-- | arch/sandbox/cpu/os.c | 34 | ||||
| -rw-r--r-- | arch/sandbox/lib/board.c | 17 | ||||
| -rw-r--r-- | board/sandbox/sandbox/sandbox.c | 4 | ||||
| -rw-r--r-- | common/Makefile | 3 | ||||
| -rw-r--r-- | include/os.h | 22 | ||||
| -rw-r--r-- | post/post.c | 2 |
10 files changed, 81 insertions, 17 deletions
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c index e1b87beba..2028dbd71 100644 --- a/arch/arm/lib/eabi_compat.c +++ b/arch/arm/lib/eabi_compat.c @@ -23,3 +23,7 @@ int raise (int signum) void __aeabi_unwind_cpp_pr0(void) { }; + +void __aeabi_unwind_cpp_pr1(void) +{ +}; diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index ab330265e..2ec1bb772 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -18,3 +18,4 @@ # MA 02111-1307 USA PLATFORM_CPPFLAGS += -DCONFIG_SANDBOX -D__SANDBOX__ +PLATFORM_LIBS += -lrt diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile index e5e860b71..2ae0f7155 100644 --- a/arch/sandbox/cpu/Makefile +++ b/arch/sandbox/cpu/Makefile @@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# os.c is build in the system environment, so needs standard includes -CPPFLAGS_arch/sandbox/cpu/os.o += -I/usr/include - include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).o @@ -40,6 +37,10 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) +# os.c is build in the system environment, so needs standard includes +$(obj)os.o: ALL_CFLAGS := $(filter-out -nostdinc,$(ALL_CFLAGS)) +$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,$(CPPFLAGS)) + ######################################################################### # defines $(obj).depend target diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index c7bf8a915..d7684d38e 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -34,12 +34,12 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* delay x useconds */ void __udelay(unsigned long usec) { - /* Ignore this for now */ + os_usleep(usec); } unsigned long timer_get_us(void) { - return 0; + return os_get_nsec() / 1000; } int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index f80faac1f..6d55b5cbc 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -23,8 +23,12 @@ #include <stdlib.h> #include <termios.h> #include <unistd.h> +#include <time.h> +#include <errno.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/mman.h> +#include <linux/types.h> #include <os.h> @@ -87,3 +91,33 @@ void os_tty_raw(int fd) atexit(os_fd_restore); } + +void *os_malloc(size_t length) +{ + return mmap(NULL, length, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); +} + +void os_usleep(unsigned long usec) +{ + usleep(usec); +} + +u64 os_get_nsec(void) +{ +#if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK) + struct timespec tp; + if (EINVAL == clock_gettime(CLOCK_MONOTONIC, &tp)) { + struct timeval tv; + + gettimeofday(&tv, NULL); + tp.tv_sec = tv.tv_sec; + tp.tv_nsec = tv.tv_usec * 1000; + } + return tp.tv_sec * 1000000000ULL + tp.tv_nsec; +#else + struct timeval tv; + gettimeofday(&tv, NULL); + return tv.tv_sec * 1000000000ULL + tv.tv_usec * 1000; +#endif +} diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c index ae5a51760..b7997e9a7 100644 --- a/arch/sandbox/lib/board.c +++ b/arch/sandbox/lib/board.c @@ -45,8 +45,12 @@ #include <version.h> #include <serial.h> +#include <os.h> + DECLARE_GLOBAL_DATA_PTR; +static gd_t gd_mem; + /************************************************************************ * Init Utilities * ************************************************************************ @@ -147,7 +151,7 @@ void board_init_f(ulong bootflag) uchar *mem; unsigned long addr_sp, addr, size; - gd = malloc(sizeof(gd_t)); + gd = &gd_mem; assert(gd); memset((void *)gd, 0, sizeof(gd_t)); @@ -158,7 +162,8 @@ void board_init_f(ulong bootflag) } size = CONFIG_SYS_SDRAM_SIZE; - mem = malloc(size); + mem = os_malloc(CONFIG_SYS_SDRAM_SIZE); + assert(mem); gd->ram_buf = mem; addr = (ulong)(mem + size); @@ -214,11 +219,9 @@ void board_init_r(gd_t *id, ulong dest_addr) post_output_backlog(); #endif -#if 0 /* Sandbox uses system malloc for now */ - /* The Malloc area is immediately below the monitor copy in DRAM */ - malloc_start = dest_addr - TOTAL_MALLOC_LEN; - mem_malloc_init(malloc_start, TOTAL_MALLOC_LEN); -#endif + /* The Malloc area is at the top of simulated DRAM */ + mem_malloc_init((ulong)gd->ram_buf + gd->ram_size - TOTAL_MALLOC_LEN, + TOTAL_MALLOC_LEN); /* initialize environment */ env_relocate(); diff --git a/board/sandbox/sandbox/sandbox.c b/board/sandbox/sandbox/sandbox.c index 95a504597..f376c7435 100644 --- a/board/sandbox/sandbox/sandbox.c +++ b/board/sandbox/sandbox/sandbox.c @@ -21,6 +21,8 @@ #include <common.h> +#include <os.h> + /* * Pointer to initial global data area * @@ -34,7 +36,7 @@ void flush_cache(unsigned long start, unsigned long size) ulong get_timer(ulong base) { - return 0; + return (os_get_nsec() / 1000000) - base; } int timer_init(void) diff --git a/common/Makefile b/common/Makefile index 1be723603..2d9ae8c5c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -29,9 +29,6 @@ LIB = $(obj)libcommon.o ifndef CONFIG_SPL_BUILD COBJS-y += main.o COBJS-y += command.o -ifndef CONFIG_SANDBOX -COBJS-y += dlmalloc.o -endif COBJS-y += exports.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o COBJS-y += image.o diff --git a/include/os.h b/include/os.h index d5df22f77..f3af4f0e0 100644 --- a/include/os.h +++ b/include/os.h @@ -76,3 +76,25 @@ void os_exit(int exit_code); * Put tty into raw mode to mimic serial console better */ void os_tty_raw(int fd); + +/** + * Acquires some memory from the underlying os. + * + * \param length Number of bytes to be allocated + * \return Pointer to length bytes or NULL on error + */ +void *os_malloc(size_t length); + +/** + * Access to the usleep function of the os + * + * \param usec Time to sleep in micro seconds + */ +void os_usleep(unsigned long usec); + +/** + * Gets a monotonic increasing number of nano seconds from the OS + * + * \return A monotonic increasing time scaled in nano seconds + */ +u64 os_get_nsec(void); diff --git a/post/post.c b/post/post.c index 45e08f8cc..d62f10aa5 100644 --- a/post/post.c +++ b/post/post.c @@ -495,7 +495,7 @@ void post_reloc(void) */ unsigned long post_time_ms(unsigned long base) { -#if defined(CONFIG_PPC) || defined(CONFIG_ARM) +#if defined(CONFIG_PPC) || defined(CONFIG_ARM) && !defined(CONFIG_KIRKWOOD) return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ) - base; #else |