[Zrouter-src] ZRouter.org: push to ZRouter socs/Atheros/AR7161/soc.hints socs/...

Tue Apr 17 14:44:17 UTC 2012

details:   http://zrouter.org/hg/zrouter//rev/7d48e6c0d95c
changeset: 381:7d48e6c0d95c
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Tue Apr 17 17:39:07 2012 +0300
description:
1. Rename target mipsbe to mips (Upstream changes)
2. Remove board related things (redboot map and rootfs name)

diffstat:

 socs/Atheros/AR7161/soc.hints |  33 ++++++++++++++++++++++++++-------
 socs/Atheros/AR7161/soc.mk    |   6 +++---
 2 files changed, 29 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r 99586852be15 -r 7d48e6c0d95c socs/Atheros/AR7161/soc.hints

--- a/socs/Atheros/AR7161/soc.hints	Tue Apr 17 17:36:55 2012 +0300
+++ b/socs/Atheros/AR7161/soc.hints	Tue Apr 17 17:39:07 2012 +0300
@@ -1,5 +1,4 @@
-
-# Atheros APB bus
+# $FreeBSD$
 hint.apb.0.at="nexus0"
 hint.apb.0.irq=4
 
@@ -7,22 +6,41 @@
 hint.uart.0.at="apb0"
 # see atheros/uart_cpu_ar71xx.c why +3
 hint.uart.0.maddr=0x18020003
-hint.uart.0.msize=0x18
+hint.uart.0.msize=0x20
 hint.uart.0.irq=3
+hint.uart.0.flags="0x30"
+
+#ohci
+hint.ohci.0.at="apb0"
+hint.ohci.0.maddr=0x1c000000
+hint.ohci.0.msize=0x01000000
+hint.ohci.0.irq=6
+
+#ehci
+hint.ehci.0.at="nexus0"
+hint.ehci.0.maddr=0x1b000000
+hint.ehci.0.msize=0x01000000
+hint.ehci.0.irq=1
 
 # pci
 hint.pcib.0.at="nexus0"
 hint.pcib.0.irq=0
 
+hint.arge.0.at="nexus0"
+hint.arge.0.maddr=0x19000000
+hint.arge.0.msize=0x1000
+hint.arge.0.irq=2
+
+hint.arge.1.at="nexus0"
+hint.arge.1.maddr=0x1a000000
+hint.arge.1.msize=0x1000
+hint.arge.1.irq=3
+
 # ar71xx_spi
 hint.spi.0.at="nexus0"
 hint.spi.0.maddr=0x1f000000
 hint.spi.0.msize=0x10
 
-# SPI flash
-hint.mx25l.0.at="spibus0"
-hint.mx25l.0.cs=0
-
 # Watchdog
 hint.ar71xx_wdog.0.at="nexus0"
 
@@ -32,3 +50,4 @@
 hint.gpio.0.msize=0x1000
 hint.gpio.0.irq=2
 
+
diff -r 99586852be15 -r 7d48e6c0d95c socs/Atheros/AR7161/soc.mk
--- a/socs/Atheros/AR7161/soc.mk	Tue Apr 17 17:36:55 2012 +0300
+++ b/socs/Atheros/AR7161/soc.mk	Tue Apr 17 17:39:07 2012 +0300
@@ -1,7 +1,7 @@
 
 
 TARGET=			mips
-TARGET_ARCH=		mipseb
+TARGET_ARCH=		mips
 
 KERNCONF_MACHINE=	${TARGET} ${TARGET_ARCH}
 KERNCONF_IDENT?=	AR7161
@@ -55,7 +55,7 @@
 #KERNCONF_OPTIONS+= 	BOOTP_COMPAT
 #KERNCONF_OPTIONS+=		ROOTDEVNAME=\"nfs:192.168.0.90:/usr/home/ray/Projects/MIPS/FreeBSD/rootfs-mips\"
 #KERNCONF_OPTIONS+=		ROOTDEVNAME=\\\"cd9660:/dev/map/rootfs.uncompress\\\"
-KERNCONF_OPTIONS+=		ROOTDEVNAME=\\\"cd9660:/dev/redboot/rootfs.uncompress\\\"
+#KERNCONF_OPTIONS+=		ROOTDEVNAME=\\\"cd9660:/dev/redboot/rootfs.uncompress\\\"
 
 
 # Board definitions
@@ -64,7 +64,7 @@
 KERNCONF_OPTIONS+= 	CD9660
 #KERNCONF_OPTIONS+= 	GEOM_LABEL
 #KERNCONF_DEVICES+=	geom_map
-KERNCONF_DEVICES+=	geom_redboot
+#KERNCONF_DEVICES+=	geom_redboot
 KERNCONF_DEVICES+=	geom_uncompress
 #KERNCONF_DEVICES+=	nvram2env
 
