Device changes to go along with prcm rewrite.

2 files changed, 12 insertions, 7 deletions

diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 4fcd951099f..7c1093df1ff 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.1 2009/05/08 03:13:26 drahn Exp $
+#	$OpenBSD: Makefile.beagle,v 1.2 2009/05/24 21:02:48 drahn Exp $
 
 # Makefile for OpenBSD
 #
@@ -182,6 +182,9 @@ bsd.rd: bsd
 
 bsd.img: bsd.rd
 	${OBJCOPY} -O binary bsd.rd bsd.img
+
+bsd.umg: bsd.img
+	mkimage -C none -A arm -O OpenBSD -e 0x80300000 -a 0x80300000 -d bsd.img bsd.umg
  
 # depend on network or filesystem configuration 
 uipc_domain.o uipc_proto.o vfs_conf.o: Makefile 
diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK
index f31b7051c72..60ba3bd6eef 100644
--- a/sys/arch/beagle/conf/RAMDISK
+++ b/sys/arch/beagle/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.2 2009/05/11 12:49:24 drahn Exp $
+# $OpenBSD: RAMDISK,v 1.3 2009/05/24 21:02:48 drahn Exp $
 #
 # GENERIC machine description file
 #
@@ -64,17 +64,19 @@ mainbus0	at root
 cpu0		at mainbus?
 ahb0		at mainbus?
 
-prcm0		at ahb? addr 0x48004800	# power/clock controller
+prcm0		at ahb? addr 0x48004000	# power/clock controller
 intc0		at ahb? addr 0x48200000	# interrupt controller
 gptimer0	at ahb? addr 0x49032000	intr 38 # timer GPTIMER2
 gptimer1	at ahb? addr 0x48318000	intr 37 # timer GPTIMER1
 
 #sm0		at ahb?	addr 0x0C000300 intr 188 #ethernet
 
-#omgpio0		at ahb? addr 0x48018000 intr 29
-#omgpio1		at ahb? addr 0x4801a000 intr 30
-#omgpio2		at ahb? addr 0x4801c000 intr 31
-#omgpio3		at ahb? addr 0x4801e000 intr 32
+omgpio0		at ahb? addr 0x48310000 intr 29
+omgpio1		at ahb? addr 0x49050000 intr 30
+omgpio2		at ahb? addr 0x49052000 intr 31
+omgpio3		at ahb? addr 0x49054000 intr 32
+omgpio4		at ahb? addr 0x49056000 intr 33
+omgpio5		at ahb? addr 0x49058000 intr 34
 
 omdog0		at ahb? addr 0x48314000 		# watchdog timer