[Zrouter-src] ZRouter.org: push to ZRouter boards/D-Link/DSR-500/README boards...

Sat Jan 21 16:36:24 UTC 2012

details:   http://zrouter.org/hg/zrouter//rev/94c83e48d6a8
changeset: 320:94c83e48d6a8
user:      ray at terran.dlink.ua
date:      Sat Jan 21 18:18:48 2012 +0200
description:
D-Link/DSR-500 update.

diffstat:

 boards/D-Link/DSR-500/README      |  17 +++++++++++++++++
 boards/D-Link/DSR-500/board.hints |  31 +++++++++++++++++++++++--------
 boards/D-Link/DSR-500/board.mk    |  12 +++++++++---
 socs/Cavium/CN5010/soc.mk         |  25 +++++++++++++++++--------
 4 files changed, 66 insertions(+), 19 deletions(-)

diffs (172 lines):

diff -r 617912b36846 -r 94c83e48d6a8 boards/D-Link/DSR-500/README

--- a/boards/D-Link/DSR-500/README	Mon Jan 16 23:30:09 2012 +0200
+++ b/boards/D-Link/DSR-500/README	Sat Jan 21 18:18:48 2012 +0200
@@ -0,0 +1,17 @@
+#tftpboot 0x550000 DSR-500/D-Link_DSR-500.zimage
+#erase $(linux_start) $(linux_limit);cp.b $(fileaddr) $(linux_start) $(filesize)
+#gunzip $(linux_start) 0x300000 $(loadaddr) 0x1000000 ; bootoctlinux 0x7000000 numcores=1
+
+
+#tftp 0 DSR-1000N/boot/kernel/kernel.gz ; gunzip 0x5500000 $(filesize) 0x7000000 0x1000000 ; bootoctlinux 0x7000000 numcores=1
+
+
+
+
+setenv loadbsd 'tftp 0 DSR-500/D-Link_DSR-500.zimage'
+setenv flashbsd 'protect off $(linux_start) +$(filesize) ; erase $(linux_start) +$(filesize) ; cp.b $(fileaddr) $(linux_start) $(filesize)'
+setenv bootbsd 'gunzip $(linux_start) 0x300000 $(loadaddr) 0x1000000 ; bootoctlinux 0 numcores=1'
+
+setenv updatebsd 'run loadbsd ; run flashbsd'
+
+
diff -r 617912b36846 -r 94c83e48d6a8 boards/D-Link/DSR-500/board.hints
--- a/boards/D-Link/DSR-500/board.hints	Mon Jan 16 23:30:09 2012 +0200
+++ b/boards/D-Link/DSR-500/board.hints	Sat Jan 21 18:18:48 2012 +0200
@@ -1,12 +1,26 @@
 # $FreeBSD$
 # device.hints
 
-hint.switch.0.iface="octe0"
-hint.switch.0.driver="bcm5325_switch"
-hint.switch.1.iface="octe1"
-hint.switch.1.driver="bcm5325_switch"
-hint.switch.2.iface="octe2"
-hint.switch.2.driver="bcm5325_switch"
+# No probe at all
+hint.miibus.0.phymask="0x00000000"
+hint.miibus.1.phymask="0x00000000"
+hint.miibus.3.phymask="0x00000100"
+# bgephy will attach here
+
+hint.floatphy.0.at="miibus0"
+hint.floatphy.0.phyno=0
+hint.floatphy.0.master="switch"
+hint.floatphy.0.master_unit=0
+hint.floatphy.0.master_phys=0x0000001f # Sense PHY0
+hint.floatphy.0.flags=0x00000000
+hint.floatphy.0.speed=1000
+
+# Switch attached to MDIO bus on arge0
+hint.switch.0.at="miibus1"
+hint.switch.0.phyno=30
+
+
+
 
 
 #phys_mapped_flash:
@@ -24,11 +38,11 @@
 
 hint.map.1.at="cfid0"
 hint.map.1.start=0x000a0000
-hint.map.1.end=0x009a0000
+hint.map.1.end="search:0x00100000:0x10000:.!/bin/sh"
 hint.map.1.name="kernel"
 
 hint.map.2.at="cfid0"
-hint.map.2.start=0x009a0000
+hint.map.2.start="search:0x00100000:0x10000:.!/bin/sh"
 hint.map.2.end=0x01da0000
 hint.map.2.name="rootfs"
 
@@ -52,3 +66,4 @@
 hint.map.6.end=0x01da0000
 hint.map.6.name="upgrade"
 
+
diff -r 617912b36846 -r 94c83e48d6a8 boards/D-Link/DSR-500/board.mk
--- a/boards/D-Link/DSR-500/board.mk	Mon Jan 16 23:30:09 2012 +0200
+++ b/boards/D-Link/DSR-500/board.mk	Sat Jan 21 18:18:48 2012 +0200
@@ -20,6 +20,7 @@
 KERNCONF_OPTIONS+=	OCTEON_VENDOR_D_LINK
 KERNCONF_OPTIONS+=	OCTEON_BOARD_DSR_1000N
 
+KERNCONF_DEVICES+=	brgphy
 KERNCONF_DEVICES+=	switch
 KERNCONF_DEVICES+=	switch_bcm5325
 
@@ -29,7 +30,9 @@
 WITH_USB=yes
 WITH_IPSEC=yes
 # Builded modules
-KERNCONF_MODULES_OVERRIDE+=ipfw usb/umass usb/uplcom usb/u3g dummynet
+KERNCONF_MODULES_OVERRIDE+=ipfw dummynet zlib
+KERNCONF_MODULES_OVERRIDE+=usb/uplcom usb/u3g usb/umodem usb/ucom
+KERNCONF_MODULES_OVERRIDE+=usb/umass cam
 
 # Additional utilities ????
 WORLD_SUBDIRS_ZROUTER+=target/sbin/upgrade
@@ -58,7 +61,10 @@
 
 MKULZMA_BLOCKSIZE=65536
 
-PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
+# 256K block
+PACKING_KERNEL_ROUND=0x40000
+PACKING_KERNEL_IMAGE?=kernel.strip.gz.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
-NEW_IMAGE_TYPE=split_kernel_rootfs
+NEW_IMAGE_TYPE?=zimage
+#NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r 617912b36846 -r 94c83e48d6a8 socs/Cavium/CN5010/soc.mk
--- a/socs/Cavium/CN5010/soc.mk	Mon Jan 16 23:30:09 2012 +0200
+++ b/socs/Cavium/CN5010/soc.mk	Sat Jan 21 18:18:48 2012 +0200
@@ -10,25 +10,32 @@
 KERNCONF_IDENT?=	CN5010
 KERNCONF_CPU=		CPU_CNMIPS
 KERNCONF_OPTIONS+=	ISA_MIPS64
-KERNCONF_OPTIONS+=	OCTEON_VENDOR_D_LINK
-KERNCONF_OPTIONS+=	OCTEON_BOARD_DSR_1000N
 KERNCONF_FILES+=	"../cavium/files.octeon1"
 KERNCONF_HINTS=		"OCTEON1.hints"
 
 KERNCONF_MAKEOPTIONS+=	"ARCH_FLAGS=\"-march=octeon -mabi=64\""
 KERNCONF_MAKEOPTIONS+=	"MIPS_BIG_ENDIAN=defined"
 #KERNCONF_MAKEOPTIONS+=	"LDSCRIPT_NAME=ldscript.mips.octeon1"
-KERNCONF_KERN_LDSCRIPT_NAME?=	ldscript.mips.octeon1
+KERNCONF_KERN_LDSCRIPT_NAME=	ldscript.mips.octeon1
+#KERNCONF_KERN_LDSCRIPT_NAME=
 KERNCONF_KERNLOADADDR?=		0xffffffff80100000
+#KERNCONF_KERNENTRYPOINT?=	0xffffffff80100080
 
 KERNCONF_OPTIONS+=	MALLOC_DEBUG_MAXZONES=8
 
 KERNCONF_OPTIONS+=		SMP
-KERNCONF_OPTIONS+=		MAXUSERS=3
-KERNCONF_OPTIONS+=		MAXFILES=512
-KERNCONF_OPTIONS+=		NSFBUFS=1024
-KERNCONF_OPTIONS+=		SHMALL=128
+#KERNCONF_OPTIONS+=		MAXUSERS=3
+#KERNCONF_OPTIONS+=		MAXFILES=512
+#KERNCONF_OPTIONS+=		NSFBUFS=1024
+#KERNCONF_OPTIONS+=		SHMALL=128
 KERNCONF_OPTIONS+=		MSGBUF_SIZE=65536
+KERNCONF_OPTIONS+=		KTRACE
+KERNCONF_OPTIONS+=		STACK
+KERNCONF_OPTIONS+=		SYSVSHM
+KERNCONF_OPTIONS+=		SYSVMSG
+KERNCONF_OPTIONS+=		SYSVSEM
+KERNCONF_OPTIONS+=		_KPOSIX_PRIORITY_SCHEDULING
+KERNCONF_OPTIONS+=		PRINTF_BUFR_SIZE=128
 
 # Options for making kernel smallest 
 KERNCONF_OPTIONS+=		NO_SYSCTL_DESCR
@@ -38,6 +45,7 @@
 
 # Debug definitions
 ##KERNCONF_MAKEOPTIONS+=	"DEBUG=-g"
+KERNCONF_OPTIONS+=		ALT_BREAK_TO_DEBUGGER
 KERNCONF_OPTIONS+=		DDB
 KERNCONF_OPTIONS+=		KDB
 ##KERNCONF_OPTIONS+=		KTRACE
@@ -107,7 +115,8 @@
 .if defined(WITH_USB)
 KERNCONF_DEVICES+=	usb
 #KERNCONF_OPTIONS+=	USB_DEBUG
-KERNCONF_DEVICES+=	cndotg
+#KERNCONF_DEVICES+=	cndotg
+KERNCONF_DEVICES+=	octusb
 .endif
 
 
