From 5cd3f8c68f1820aaea0dbb9c0cd8332bd9059daa Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@foobox.com>
Date: Thu, 6 May 2010 13:35:49 -0700
Subject: [PATCH] [armemu] fix the armemu build by adding timer routine and
 default config file

---
 platform/armemu/timer.c   | 12 +++++++++++-
 target/armemu/armemu.conf | 14 ++++++++++++++
 target/armemu/rules.mk    |  5 +++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 target/armemu/armemu.conf

diff --git a/platform/armemu/timer.c b/platform/armemu/timer.c
index 4d209a46..4cc2b50d 100644
--- a/platform/armemu/timer.c
+++ b/platform/armemu/timer.c
@@ -48,13 +48,23 @@ status_t platform_set_periodic_timer(platform_timer_callback callback, void *arg
 	return NO_ERROR;
 }
 
+bigtime_t current_time_hires(void)
+{
+	bigtime_t time;
+	*REG(SYSINFO_TIME_LATCH) = 1;
+	time = *REG(SYSINFO_TIME_SECS) * 1000000ULL;
+	time += *REG(SYSINFO_TIME_USECS);
+
+	return time;
+}
+
 time_t current_time(void)
 {
 	time_t time;
 	*REG(SYSINFO_TIME_LATCH) = 1;
 	time = *REG(SYSINFO_TIME_SECS) * 1000;
 	time += *REG(SYSINFO_TIME_USECS) / 1000;
-			
+
 	return time;
 }
 
diff --git a/target/armemu/armemu.conf b/target/armemu/armemu.conf
new file mode 100644
index 00000000..7eaea5d1
--- /dev/null
+++ b/target/armemu/armemu.conf
@@ -0,0 +1,14 @@
+[cpu]
+core = arm926ejs
+
+# the rom file is loaded at address 0x0
+[rom]
+file = lk.bin
+
+[system]
+display = no
+console = yes
+network = no
+
+[network]
+device = /dev/tap0
diff --git a/target/armemu/rules.mk b/target/armemu/rules.mk
index d79834a9..4c7bdd1a 100644
--- a/target/armemu/rules.mk
+++ b/target/armemu/rules.mk
@@ -4,3 +4,8 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 PLATFORM := armemu
 
+$(BUILDDIR)/armemu.conf: $(LOCAL_DIR)/armemu.conf
+	cp $< $@
+
+EXTRA_BUILDDEPS += $(BUILDDIR)/armemu.conf
+GENERATED += $(BUILDDIR)/armemu.conf