[Zrouter-src] ZRouter.org: push to ZRouter boards/D-Link/DSR-1000/README board...
zrouter-src at zrouter.org
zrouter-src at zrouter.org
Mon Feb 6 11:15:09 UTC 2012
details: http://zrouter.org/hg/zrouter//rev/b4e124c7de68
changeset: 344:b4e124c7de68
user: ray at terran.dlink.ua
date: Mon Feb 06 13:15:59 2012 +0200
description:
Make it clean and tidy
diffstat:
boards/D-Link/DSR-1000/README | 32 +++++++++
boards/D-Link/DSR-1000/board.hints | 77 ++++++++++++++++++++--
boards/D-Link/DSR-1000/board.mk | 30 ++++----
boards/D-Link/DSR-1000N/board.mk | 24 +-----
boards/D-Link/DSR-1000N/files/etc/rc.d/ADAPTATION | 4 +-
boards/D-Link/DSR-500/README | 33 +++++++--
boards/D-Link/DSR-500/board.hints | 14 ++--
boards/D-Link/DSR-500/board.mk | 18 +----
boards/D-Link/DSR-500/files/etc/rc.d/ADAPTATION | 32 +--------
boards/D-Link/DSR-500N/README | 32 +++++++++
boards/D-Link/DSR-500N/board.hints | 77 ++++++++++++++++++++--
boards/D-Link/DSR-500N/board.mk | 44 +++++-------
12 files changed, 282 insertions(+), 135 deletions(-)
diffs (714 lines):
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-1000/README
--- a/boards/D-Link/DSR-1000/README Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-1000/README Mon Feb 06 13:15:59 2012 +0200
@@ -0,0 +1,32 @@
+# Setup
+setenv ipaddr 192.168.0.100
+setenv serverip 192.168.0.90
+
+setenv loadbsd 'tftp 0 DSR-1000/D-Link_DSR-1000.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'
+# Autoboot
+setenv bootcmd 'run bootbsd'
+
+saveenv
+
+# Update
+run updatebsd
+
+# Boot
+run bootbsd
+
+
+Switch configured by EEPROM as a portbased VLAN
+
+LAN1 - switch port 0
+LAN2 - switch port 1
+LAN3 - switch port 2
+LAN4 - switch port 3
+WAN1 - switch port 4
+ switch port 5 - octe1 (name wan1)
+ switch port 8 - octe0 (name lan0)
+WAN2 - ------------- - octe2 (name wan0)
+
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-1000/board.hints
--- a/boards/D-Link/DSR-1000/board.hints Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-1000/board.hints Mon Feb 06 13:15:59 2012 +0200
@@ -1,13 +1,73 @@
# $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
+
+################## GPIO items ##################
+# Buttons
+# GPIO07 - Reset BTN IN PU II INT
+hint.gpioreset.0.at="gpiobus0"
+hint.gpioreset.0.pins="0x0080"
+hint.gpioreset.0.name="reset"
+hint.gpioreset.0.flags="0x04a1"
+
+## GPIO8 - WPS BTN IN PU II INT
+hint.gpiobutton.0.at="gpiobus0"
+hint.gpiobutton.0.pins="0x0100"
+hint.gpiobutton.0.name="wps"
+hint.gpiobutton.0.flags="0x04a1"
+
+hint.gpioled.0.at="gpiobus0"
+hint.gpioled.0.pins="0x0200"
+hint.gpioled.0.name="usb" # Name of first unit w/o number,
+# to compatibility with devices which have only one
+hint.gpioled.0.flags="0x0140" # invout, pulldown
+
+hint.gpioled.1.at="gpiobus0"
+hint.gpioled.1.pins="0x0400"
+hint.gpioled.1.name="usb2"
+hint.gpioled.1.flags="0x0140" # invout, pulldown
+
+hint.gpioled.2.at="gpiobus0"
+hint.gpioled.2.pins="0x0800"
+hint.gpioled.2.name="wps"
+hint.gpioled.2.flags="0x0140" # invout, pulldown
+
+hint.gpioled.3.at="gpiobus0"
+hint.gpioled.3.pins="0x4000"
+hint.gpioled.3.name="status" # Default for status
+hint.gpioled.3.flags="0x0140" # invout, pulldown
+
+hint.gpioled.4.at="gpiobus0"
+hint.gpioled.4.pins="0x8000"
+hint.gpioled.4.name="status_orange"
+hint.gpioled.4.flags="0x0140" # invout, pulldown
+
+hint.gpioled.5.at="gpiobus0"
+hint.gpioled.5.pins="0x20000"
+hint.gpioled.5.name="minipci"
+hint.gpioled.5.flags="0x0140" # invout, pulldown
+
+hint.gpioled.6.at="gpiobus0"
+hint.gpioled.6.pins="0x40000"
+hint.gpioled.6.name="minipci2"
+hint.gpioled.6.flags="0x0140" # invout, pulldown
#phys_mapped_flash:
#640k(bootloader)ro,
@@ -24,11 +84,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 +112,4 @@
hint.map.6.end=0x01da0000
hint.map.6.name="upgrade"
+
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-1000/board.mk
--- a/boards/D-Link/DSR-1000/board.mk Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-1000/board.mk Mon Feb 06 13:15:59 2012 +0200
@@ -10,8 +10,6 @@
# TODO: size suffixes
BOARD_FLASH_SIZE=33554432
-#?????KERNEL_COMPRESSION=lzma.4.17
-
###################################################
#
# Vars for kernel config
@@ -20,19 +18,22 @@
KERNCONF_OPTIONS+= OCTEON_VENDOR_D_LINK
KERNCONF_OPTIONS+= OCTEON_BOARD_DSR_1000N
+KERNCONF_DEVICES+= brgphy
KERNCONF_DEVICES+= switch
KERNCONF_DEVICES+= switch_bcm5325
# ident
KERNCONF_IDENT=${TARGET_VENDOR}_${TARGET_DEVICE}
+
# Include usb and SoC usb controller drivers
WITH_USB=yes
WITH_IPSEC=yes
# Builded modules
-KERNCONF_MODULES_OVERRIDE+=ipfw usb/umass usb/uplcom usb/u3g dummynet
-
-# Additional utilities ????
-WORLD_SUBDIRS_ZROUTER+=target/sbin/upgrade
+KERNCONF_MODULES_OVERRIDE+=ipfw dummynet zlib
+KERNCONF_MODULES_OVERRIDE+=usb/uplcom usb/u3g usb/umodem usb/ucom
+KERNCONF_MODULES_OVERRIDE+=usb/umass cam
+# TODO: enable it if someone require
+KERNCONF_MODULES_OVERRIDE+=firmware
###################################################
#
@@ -41,24 +42,21 @@
###################################################
-# Image must not be biggest than GEOM_MAP_P2 (upgrade part.)
-#????## FIRMWARE_IMAGE_SIZE_MAX=0x003a0000
-
###################################################
#
# Firmware Image Options
#
###################################################
-TARGET_PROFILES+=SMALL_ mpd ssh dlink.ua.web dhcp mroute ntpdate dnsmasq racoon openvpn ppp hostap ath nfs_client
-
-KERNEL_COMPRESSION=oldlzma
-KERNEL_COMPRESSION_TYPE=oldlzma
-UBOOT_KERNEL_COMPRESSION_TYPE=lzma
+TARGET_PROFILES+=SMALL_ mpd ssh dlink.ua.web dhcp mroute ntpdate dnsmasq \
+ racoon openvpn ppp hostap ath nfs_client net_help
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
+
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-1000N/board.mk
--- a/boards/D-Link/DSR-1000N/board.mk Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-1000N/board.mk Mon Feb 06 13:15:59 2012 +0200
@@ -32,16 +32,14 @@
KERNCONF_MODULES_OVERRIDE+=ipfw dummynet zlib
KERNCONF_MODULES_OVERRIDE+=usb/uplcom usb/u3g usb/umodem usb/ucom
KERNCONF_MODULES_OVERRIDE+=usb/umass cam
+# TODO: enable it if someone require
+KERNCONF_MODULES_OVERRIDE+=firmware
-KERNCONF_MODULES_OVERRIDE+=usb/run usb/rum firmware
+
+.if !defined(WITHOUT_WIRELESS)
+KERNCONF_MODULES_OVERRIDE+=usb/run usb/rum
KERNCONF_MODULES_OVERRIDE+=wlan wlan_xauth wlan_wep wlan_tkip wlan_acl \
wlan_amrr wlan_ccmp wlan_rssadapt
-
-# Additional utilities ????
-WORLD_SUBDIRS_ZROUTER+=target/sbin/upgrade
-
-.if !defined(WITHOUT_WIRELESS)
-KERNCONF_MODULES_OVERRIDE+=wlan_xauth wlan_wep wlan_tkip wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt
KERNCONF_OPTIONS+= IEEE80211_DEBUG
KERNCONF_OPTIONS+= IEEE80211_SUPPORT_MESH
KERNCONF_OPTIONS+= IEEE80211_SUPPORT_TDMA
@@ -49,17 +47,12 @@
KERNCONF_DEVICES+= wlan_amrr
KERNCONF_DEVICES+= wlan_wep
KERNCONF_DEVICES+= wlan_ccmp
-#KERNCONF_DEVICES+= wlan_tkip
KERNCONF_OPTIONS+= AH_DEBUG
KERNCONF_OPTIONS+= ATH_DEBUG
KERNCONF_OPTIONS+= ATH_DIAGAPI
KERNCONF_OPTIONS+= ATH_ENABLE_11N
KERNCONF_OPTIONS+= AH_SUPPORT_AR5416
-#KERNCONF_OPTIONS+= AH_SUPPORT_AR9130
-#KERNCONF_OPTIONS+= AH_RXCFG_SDMAMW_4BYTES
-# interrupt mitigation not possible on AR9130
-# option AH_AR5416_INTERRUPT_MITIGATION
KERNCONF_DEVICES+= ath
KERNCONF_DEVICES+= ath_hal
KERNCONF_DEVICES+= ath_pci
@@ -73,9 +66,6 @@
###################################################
-# Image must not be biggest than GEOM_MAP_P2 (upgrade part.)
-#????## FIRMWARE_IMAGE_SIZE_MAX=0x003a0000
-
###################################################
#
# Firmware Image Options
@@ -85,10 +75,6 @@
TARGET_PROFILES+=SMALL_ mpd ssh dlink.ua.web dhcp mroute ntpdate dnsmasq \
racoon openvpn ppp hostap ath nfs_client net_help
-KERNEL_COMPRESSION=oldlzma
-KERNEL_COMPRESSION_TYPE=oldlzma
-UBOOT_KERNEL_COMPRESSION_TYPE=lzma
-
MKULZMA_BLOCKSIZE=65536
# 256K block
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-1000N/files/etc/rc.d/ADAPTATION
--- a/boards/D-Link/DSR-1000N/files/etc/rc.d/ADAPTATION Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-1000N/files/etc/rc.d/ADAPTATION Mon Feb 06 13:15:59 2012 +0200
@@ -14,7 +14,9 @@
adapt_prestart()
{
# Switch confugred by own EEPROM
-# gpioctl -f /dev/gpioc0 -c 10 IN II PU INT
+
+ # Example GPIO
+ #gpioctl -f /dev/gpioc0 -c 10 IN II PU INT
# Import MAC addresses with known names
# kenv LAN_MAC_ADDR=`kenv ethaddr`
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500/README
--- a/boards/D-Link/DSR-500/README Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500/README Mon Feb 06 13:15:59 2012 +0200
@@ -1,17 +1,32 @@
-#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
-
-
-
+# Setup
+setenv ipaddr 192.168.0.100
+setenv serverip 192.168.0.90
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'
+# Autoboot
+setenv bootcmd 'run bootbsd'
+saveenv
+# Update
+run updatebsd
+
+# Boot
+run bootbsd
+
+
+Switch configured by EEPROM as a portbased VLAN
+
+LAN1 - switch port 0
+LAN2 - switch port 1
+LAN3 - switch port 2
+LAN4 - switch port 3
+WAN1 - switch port 4
+ switch port 5 - octe1 (name wan1)
+ switch port 8 - octe0 (name lan0)
+WAN2 - ------------- - octe2 (name wan0)
+
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500/board.hints
--- a/boards/D-Link/DSR-500/board.hints Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500/board.hints Mon Feb 06 13:15:59 2012 +0200
@@ -37,37 +37,37 @@
hint.gpioled.0.pins="0x0200"
hint.gpioled.0.name="usb" # Name of first unit w/o number,
# to compatibility with devices which have only one
-hint.gpioled.0.flags="0x0040" # pulldown
+hint.gpioled.0.flags="0x0140" # invout, pulldown
hint.gpioled.1.at="gpiobus0"
hint.gpioled.1.pins="0x0400"
hint.gpioled.1.name="usb2"
-hint.gpioled.1.flags="0x0040" # pulldown
+hint.gpioled.1.flags="0x0140" # invout, pulldown
hint.gpioled.2.at="gpiobus0"
hint.gpioled.2.pins="0x0800"
hint.gpioled.2.name="wps"
-hint.gpioled.2.flags="0x0040" # pulldown
+hint.gpioled.2.flags="0x0140" # invout, pulldown
hint.gpioled.3.at="gpiobus0"
hint.gpioled.3.pins="0x4000"
hint.gpioled.3.name="status" # Default for status
-hint.gpioled.3.flags="0x0040" # pulldown
+hint.gpioled.3.flags="0x0140" # invout, pulldown
hint.gpioled.4.at="gpiobus0"
hint.gpioled.4.pins="0x8000"
hint.gpioled.4.name="status_orange"
-hint.gpioled.4.flags="0x0040" # pulldown
+hint.gpioled.4.flags="0x0140" # invout, pulldown
hint.gpioled.5.at="gpiobus0"
hint.gpioled.5.pins="0x20000"
hint.gpioled.5.name="minipci"
-hint.gpioled.5.flags="0x0040" # pulldown
+hint.gpioled.5.flags="0x0140" # invout, pulldown
hint.gpioled.6.at="gpiobus0"
hint.gpioled.6.pins="0x40000"
hint.gpioled.6.name="minipci2"
-hint.gpioled.6.flags="0x0040" # pulldown
+hint.gpioled.6.flags="0x0140" # invout, pulldown
#phys_mapped_flash:
#640k(bootloader)ro,
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500/board.mk
--- a/boards/D-Link/DSR-500/board.mk Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500/board.mk Mon Feb 06 13:15:59 2012 +0200
@@ -32,13 +32,8 @@
KERNCONF_MODULES_OVERRIDE+=ipfw dummynet zlib
KERNCONF_MODULES_OVERRIDE+=usb/uplcom usb/u3g usb/umodem usb/ucom
KERNCONF_MODULES_OVERRIDE+=usb/umass cam
-
-KERNCONF_MODULES_OVERRIDE+=usb/run usb/rum firmware
-KERNCONF_MODULES_OVERRIDE+=wlan wlan_xauth wlan_wep wlan_tkip wlan_acl \
- wlan_amrr wlan_ccmp wlan_rssadapt
-
-# Additional utilities ????
-WORLD_SUBDIRS_ZROUTER+=target/sbin/upgrade
+# TODO: enable it if someone require
+KERNCONF_MODULES_OVERRIDE+=firmware
###################################################
#
@@ -47,9 +42,6 @@
###################################################
-# Image must not be biggest than GEOM_MAP_P2 (upgrade part.)
-#????## FIRMWARE_IMAGE_SIZE_MAX=0x003a0000
-
###################################################
#
# Firmware Image Options
@@ -57,11 +49,7 @@
###################################################
TARGET_PROFILES+=SMALL_ mpd ssh dlink.ua.web dhcp mroute ntpdate dnsmasq \
- racoon openvpn ppp hostap ath nfs_client
-
-KERNEL_COMPRESSION=oldlzma
-KERNEL_COMPRESSION_TYPE=oldlzma
-UBOOT_KERNEL_COMPRESSION_TYPE=lzma
+ racoon openvpn ppp hostap ath nfs_client net_help
MKULZMA_BLOCKSIZE=65536
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500/files/etc/rc.d/ADAPTATION
--- a/boards/D-Link/DSR-500/files/etc/rc.d/ADAPTATION Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500/files/etc/rc.d/ADAPTATION Mon Feb 06 13:15:59 2012 +0200
@@ -13,41 +13,17 @@
adapt_prestart()
{
-# switchctl /dev/switch0 set vlan 0 vid 1
-# switchctl /dev/switch0 set vlan 0 add 0 u
-# switchctl /dev/switch0 set vlan 0 add 1 u
-# switchctl /dev/switch0 set vlan 0 add 2 u
-# switchctl /dev/switch0 set vlan 0 add 3 u
-# switchctl /dev/switch0 set vlan 0 del 4
-# switchctl /dev/switch0 set vlan 0 add 5 t
-# switchctl /dev/switch0 set vlan 0 add 6 t
-#
-# switchctl /dev/switch0 set vlan 1 vid 2
-# switchctl /dev/switch0 set vlan 1 del 0
-# switchctl /dev/switch0 set vlan 1 del 1
-# switchctl /dev/switch0 set vlan 1 del 2
-# switchctl /dev/switch0 set vlan 1 del 3
-# switchctl /dev/switch0 set vlan 1 add 4 u
-# switchctl /dev/switch0 set vlan 1 add 5 t
-# switchctl /dev/switch0 set vlan 1 add 6 t
-#
-# switchctl /dev/switch0 set port 0 pvid 1 flags Untag
-# switchctl /dev/switch0 set port 1 pvid 1 flags Untag
-# switchctl /dev/switch0 set port 2 pvid 1 flags Untag
-# switchctl /dev/switch0 set port 3 pvid 1 flags Untag
-# switchctl /dev/switch0 set port 4 pvid 2 flags Untag
-#
-# switchctl /dev/switch0 set port 5 pvid 1 flags Tag
-# switchctl /dev/switch0 set port 6 pvid 1 flags Tag
+ # Switch confugred by own EEPROM
-# gpioctl -f /dev/gpioc0 -c 10 IN II PU INT
+ # Example GPIO
+ #gpioctl -f /dev/gpioc0 -c 10 IN II PU INT
# Import MAC addresses with known names
# kenv LAN_MAC_ADDR=`kenv ethaddr`
# kenv WAN_MAC_ADDR=`kenv wanmac`
ifconfig octe0 name lan0
- ifconfig octe1 name lan1 # While i fixing switch for it
+ ifconfig octe1 name wan1
ifconfig octe2 name wan0
# ifconfig lan0 ether `kenv LAN_MAC_ADDR`
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500N/README
--- a/boards/D-Link/DSR-500N/README Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500N/README Mon Feb 06 13:15:59 2012 +0200
@@ -0,0 +1,32 @@
+# Setup
+setenv ipaddr 192.168.0.100
+setenv serverip 192.168.0.90
+
+setenv loadbsd 'tftp 0 DSR-500N/D-Link_DSR-500N.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'
+# Autoboot
+setenv bootcmd 'run bootbsd'
+
+saveenv
+
+# Update
+run updatebsd
+
+# Boot
+run bootbsd
+
+
+Switch configured by EEPROM as a portbased VLAN
+
+LAN1 - switch port 0
+LAN2 - switch port 1
+LAN3 - switch port 2
+LAN4 - switch port 3
+WAN1 - switch port 4
+ switch port 5 - octe1 (name wan1)
+ switch port 8 - octe0 (name lan0)
+WAN2 - ------------- - octe2 (name wan0)
+
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500N/board.hints
--- a/boards/D-Link/DSR-500N/board.hints Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500N/board.hints Mon Feb 06 13:15:59 2012 +0200
@@ -1,13 +1,73 @@
# $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
+
+################## GPIO items ##################
+# Buttons
+# GPIO07 - Reset BTN IN PU II INT
+hint.gpioreset.0.at="gpiobus0"
+hint.gpioreset.0.pins="0x0080"
+hint.gpioreset.0.name="reset"
+hint.gpioreset.0.flags="0x04a1"
+
+## GPIO8 - WPS BTN IN PU II INT
+hint.gpiobutton.0.at="gpiobus0"
+hint.gpiobutton.0.pins="0x0100"
+hint.gpiobutton.0.name="wps"
+hint.gpiobutton.0.flags="0x04a1"
+
+hint.gpioled.0.at="gpiobus0"
+hint.gpioled.0.pins="0x0200"
+hint.gpioled.0.name="usb" # Name of first unit w/o number,
+# to compatibility with devices which have only one
+hint.gpioled.0.flags="0x0140" # invout, pulldown
+
+hint.gpioled.1.at="gpiobus0"
+hint.gpioled.1.pins="0x0400"
+hint.gpioled.1.name="usb2"
+hint.gpioled.1.flags="0x0140" # invout, pulldown
+
+hint.gpioled.2.at="gpiobus0"
+hint.gpioled.2.pins="0x0800"
+hint.gpioled.2.name="wps"
+hint.gpioled.2.flags="0x0140" # invout, pulldown
+
+hint.gpioled.3.at="gpiobus0"
+hint.gpioled.3.pins="0x4000"
+hint.gpioled.3.name="status" # Default for status
+hint.gpioled.3.flags="0x0140" # invout, pulldown
+
+hint.gpioled.4.at="gpiobus0"
+hint.gpioled.4.pins="0x8000"
+hint.gpioled.4.name="status_orange"
+hint.gpioled.4.flags="0x0140" # invout, pulldown
+
+hint.gpioled.5.at="gpiobus0"
+hint.gpioled.5.pins="0x20000"
+hint.gpioled.5.name="minipci"
+hint.gpioled.5.flags="0x0140" # invout, pulldown
+
+hint.gpioled.6.at="gpiobus0"
+hint.gpioled.6.pins="0x40000"
+hint.gpioled.6.name="minipci2"
+hint.gpioled.6.flags="0x0140" # invout, pulldown
#phys_mapped_flash:
#640k(bootloader)ro,
@@ -24,11 +84,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 +112,4 @@
hint.map.6.end=0x01da0000
hint.map.6.name="upgrade"
+
diff -r f867dc690eee -r b4e124c7de68 boards/D-Link/DSR-500N/board.mk
--- a/boards/D-Link/DSR-500N/board.mk Mon Feb 06 13:03:41 2012 +0200
+++ b/boards/D-Link/DSR-500N/board.mk Mon Feb 06 13:15:59 2012 +0200
@@ -10,27 +10,36 @@
# TODO: size suffixes
BOARD_FLASH_SIZE=33554432
-#?????KERNEL_COMPRESSION=lzma.4.17
-
###################################################
#
# Vars for kernel config
#
###################################################
+KERNCONF_OPTIONS+= OCTEON_VENDOR_D_LINK
+KERNCONF_OPTIONS+= OCTEON_BOARD_DSR_1000N
+KERNCONF_DEVICES+= brgphy
KERNCONF_DEVICES+= switch
KERNCONF_DEVICES+= switch_bcm5325
# ident
KERNCONF_IDENT=${TARGET_VENDOR}_${TARGET_DEVICE}
+
# Include usb and SoC usb controller drivers
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
+# TODO: enable it if someone require
+KERNCONF_MODULES_OVERRIDE+=firmware
+
.if !defined(WITHOUT_WIRELESS)
-KERNCONF_MODULES_OVERRIDE+=wlan_xauth wlan_wep wlan_tkip wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt
+KERNCONF_MODULES_OVERRIDE+=usb/run usb/rum
+KERNCONF_MODULES_OVERRIDE+=wlan wlan_xauth wlan_wep wlan_tkip wlan_acl \
+ wlan_amrr wlan_ccmp wlan_rssadapt
KERNCONF_OPTIONS+= IEEE80211_DEBUG
KERNCONF_OPTIONS+= IEEE80211_SUPPORT_MESH
KERNCONF_OPTIONS+= IEEE80211_SUPPORT_TDMA
@@ -38,28 +47,18 @@
KERNCONF_DEVICES+= wlan_amrr
KERNCONF_DEVICES+= wlan_wep
KERNCONF_DEVICES+= wlan_ccmp
-KERNCONF_DEVICES+= wlan_tkip
KERNCONF_OPTIONS+= AH_DEBUG
KERNCONF_OPTIONS+= ATH_DEBUG
KERNCONF_OPTIONS+= ATH_DIAGAPI
KERNCONF_OPTIONS+= ATH_ENABLE_11N
KERNCONF_OPTIONS+= AH_SUPPORT_AR5416
-#KERNCONF_OPTIONS+= AH_SUPPORT_AR9130
-KERNCONF_OPTIONS+= AH_RXCFG_SDMAMW_4BYTES
-# interrupt mitigation not possible on AR9130
-# option AH_AR5416_INTERRUPT_MITIGATION
KERNCONF_DEVICES+= ath
KERNCONF_DEVICES+= ath_hal
KERNCONF_DEVICES+= ath_pci
KERNCONF_DEVICES+= ath_rate_sample
.endif
-
-
-# Additional utilities ????
-WORLD_SUBDIRS_ZROUTER+=target/sbin/upgrade
-
###################################################
#
# Limits
@@ -67,24 +66,21 @@
###################################################
-# Image must not be biggest than GEOM_MAP_P2 (upgrade part.)
-#????## FIRMWARE_IMAGE_SIZE_MAX=0x003a0000
-
###################################################
#
# Firmware Image Options
#
###################################################
-TARGET_PROFILES+=SMALL_ mpd ssh dlink.ua.web dhcp mroute ntpdate dnsmasq racoon openvpn ppp hostap ath nfs_client
-
-KERNEL_COMPRESSION=oldlzma
-KERNEL_COMPRESSION_TYPE=oldlzma
-UBOOT_KERNEL_COMPRESSION_TYPE=lzma
+TARGET_PROFILES+=SMALL_ mpd ssh dlink.ua.web dhcp mroute ntpdate dnsmasq \
+ racoon openvpn ppp hostap ath nfs_client net_help
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
+
More information about the Zrouter-src
mailing list