Signed-off-by: Eugene San (eugenesan) <eugene...@gmail.com>
---
.../base-files/etc/uci-defaults/02_network | 39 +++++++++++++++++++++-
target/linux/kirkwood/config-3.10 | 9 +++--
target/linux/kirkwood/config-3.14 | 8 ++++-
target/linux/kirkwood/image/Makefile | 14 +++++++-
4 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 0c55cbf..11a30c0 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -20,11 +20,44 @@ set network.lan6.reqprefix='no'
EOF
}
+set_wan_dhcp() {
+ local ifname=$1
+ uci batch <<EOF
+set network.wan='interface'
+set network.wan.ifname='$ifname'
+set network.wan.proto='dhcp'
+set network.wan.type='bridge'
+set network.wan6='interface'
+set network.wan6.ifname='@wan'
+set network.wan6.proto='dhcpv6'
+set network.wan6.reqprefix='no'
+EOF
+}
+
+set_lan_static() {
+ local ifname=$1
+ uci batch <<EOF
+set network.lan='interface'
+set network.lan.ifname='$ifname'
+set network.lan.proto='static'
+set network.lan.type='bridge'
+set network.lan.ipaddr='192.168.2.1'
+set network.lan.netmask='255.255.255.0'
+set network.lan.nat='1'
+EOF
+}
+
. /lib/functions/uci-defaults.sh
ucidef_set_interface_loopback
-case "`cat /proc/device-tree/model`" in
+if [ -r "/proc/device-tree/model" ]; then
+ model="`cat /proc/device-tree/model`"
+else
+ model="`grep ^Hardware /proc/cpuinfo | sed "s/Hardware.*: \(.*\)/\1/g"`"
+fi
+
+case "$model" in
"Seagate FreeAgent Dockstar")
set_lan_dhcp "eth0"
;;
@@ -40,6 +73,10 @@ case "`cat /proc/device-tree/model`" in
"Linksys EA4500")
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
+"Marvell RD-88F6281 Reference Board")
+ set_lan_static "lan1 lan2 lan3 lan4"
+ set_wan_dhcp "wan eth1 eth2"
+ ;;
*)
ucidef_set_interface_lan "eth0"
;;
diff --git a/target/linux/kirkwood/config-3.10
b/target/linux/kirkwood/config-3.10
index d6606d3..4ae830a 100644
--- a/target/linux/kirkwood/config-3.10
+++ b/target/linux/kirkwood/config-3.10
@@ -60,6 +60,7 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
# CONFIG_DLCI is not set
CONFIG_DNOTIFY=y
CONFIG_DTC=y
+CONFIG_ETHERNET_PACKET_MANGLE=y
CONFIG_EXT4_FS=y
CONFIG_FRAME_POINTER=y
CONFIG_FS_MBCACHE=y
@@ -126,6 +127,7 @@ CONFIG_HW_RANDOM=y
CONFIG_HZ_PERIODIC=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_MV64XXX=y
CONFIG_INET_LRO=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -158,11 +160,12 @@ CONFIG_MACH_DLINK_KIRKWOOD_DT=y
# CONFIG_MACH_OPENRD_CLIENT is not set
# CONFIG_MACH_OPENRD_ULTIMATE is not set
# CONFIG_MACH_RD88F6192_NAS is not set
-# CONFIG_MACH_RD88F6281 is not set
-# CONFIG_MACH_SHEEVAPLUG is not set
+CONFIG_MACH_RD88F6281=y
+CONFIG_MACH_SHEEVAPLUG=y
# CONFIG_MACH_T5325 is not set
# CONFIG_MACH_TS219 is not set
# CONFIG_MACH_TS41X is not set
+CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BOARDINFO=y
CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
@@ -187,6 +190,7 @@ CONFIG_MVEBU_CLK_CORE=y
CONFIG_MVEBU_CLK_GATING=y
CONFIG_MVEBU_MBUS=y
CONFIG_MVMDIO=y
+CONFIG_MVSWITCH_PHY=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_KUSER_HELPERS=y
CONFIG_NEED_PER_CPU_KM=y
@@ -253,6 +257,7 @@ CONFIG_SPI=y
CONFIG_SPI_MASTER=y
CONFIG_SPI_ORION=y
CONFIG_SPLIT_PTLOCK_CPUS=999999
+CONFIG_SWCONFIG=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_UBIFS_FS=y
diff --git a/target/linux/kirkwood/config-3.14
b/target/linux/kirkwood/config-3.14
index 381ce75..b81aefc 100644
--- a/target/linux/kirkwood/config-3.14
+++ b/target/linux/kirkwood/config-3.14
@@ -72,6 +72,7 @@ CONFIG_DEBUG_UART_VIRT=0xfed12000
# CONFIG_DLCI is not set
CONFIG_DNOTIFY=y
CONFIG_DTC=y
+CONFIG_ETHERNET_PACKET_MANGLE=y
CONFIG_EXT4_FS=y
CONFIG_FRAME_POINTER=y
CONFIG_FS_MBCACHE=y
@@ -146,6 +147,7 @@ CONFIG_HZ_FIXED=0
CONFIG_HZ_PERIODIC=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_MV64XXX=y
CONFIG_INET_LRO=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IOMMU_HELPER=y
@@ -158,6 +160,7 @@ CONFIG_IRQ_FORCED_THREADING=y
CONFIG_IRQ_WORK=y
CONFIG_JBD2=y
CONFIG_KIRKWOOD_CLK=y
+CONFIG_KIRKWOOD_LEGACY=y
CONFIG_KTIME_SCALAR=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_NETXBIG=y
@@ -175,10 +178,11 @@ CONFIG_LZO_DECOMPRESS=y
# CONFIG_MACH_OPENRD_CLIENT is not set
# CONFIG_MACH_OPENRD_ULTIMATE is not set
# CONFIG_MACH_RD88F6192_NAS is not set
-# CONFIG_MACH_RD88F6281 is not set
+CONFIG_MACH_RD88F6281=y
# CONFIG_MACH_T5325 is not set
# CONFIG_MACH_TS219 is not set
# CONFIG_MACH_TS41X is not set
+CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BOARDINFO=y
# CONFIG_MLX5_CORE is not set
CONFIG_MMC=y
@@ -204,6 +208,7 @@ CONFIG_MVEBU_CLK_COMMON=y
CONFIG_MVEBU_MBUS=y
CONFIG_MVMDIO=y
# CONFIG_MVNETA is not set
+CONFIG_MVSWITCH_PHY=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_KUSER_HELPERS=y
CONFIG_NEED_PER_CPU_KM=y
@@ -270,6 +275,7 @@ CONFIG_SPI=y
CONFIG_SPI_MASTER=y
CONFIG_SPI_ORION=y
CONFIG_SPLIT_PTLOCK_CPUS=999999
+CONFIG_SWCONFIG=y
CONFIG_SWIOTLB=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TICK_CPU_ACCOUNTING=y
diff --git a/target/linux/kirkwood/image/Makefile
b/target/linux/kirkwood/image/Makefile
index a3971d4..9fa2c76 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -16,7 +16,9 @@ endef
define Image/BuildKernel/Template
$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
+ ifneq ($(2),legacy)
echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage
+ endif
$(call Image/BuildKernel/MkuImage, \
none, 0x8000, 0x8000, \
$(BIN_DIR)/$(IMG_PREFIX)-zImage, \
@@ -25,7 +27,9 @@ define Image/BuildKernel/Template
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
+ ifneq ($(2),legacy)
echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
+ endif
$(call Image/BuildKernel/MkuImage, \
none, 0x8000, 0x8000, \
$(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
@@ -34,10 +38,13 @@ define Image/BuildKernel/Template
endif
ifneq ($(1),)
+ ifneq ($(2),legacy)
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/kirkwood-$(1).dtb
$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb
-
+ endif
$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-$(call
sanitize_profile_name)-zImage
+ ifneq ($(2),legacy)
cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >>
$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage
+ endif
$(call Image/BuildKernel/MkuImage, \
none, 0x8000, 0x8000, \
$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage, \
@@ -46,7 +53,9 @@ define Image/BuildKernel/Template
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(call
sanitize_profile_name)-zImage-initramfs
+ ifneq ($(2),legacy)
cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >>
$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage-initramfs
+ endif
$(call Image/BuildKernel/MkuImage, \
none, 0x8000, 0x8000, \
$(BIN_DIR)/$(IMG_PREFIX)-$(call
sanitize_profile_name)-zImage-initramfs, \
@@ -132,6 +141,9 @@ Image/InstallKernel/Template/ICONNECT=$(call
Image/InstallKernel/Template,iconne
Image/BuildKernel/Template/POGOE02=$(call Image/BuildKernel/Template,pogo_e02)
Image/InstallKernel/Template/POGOE02=$(call
Image/InstallKernel/Template,pogo_e02)
+Image/BuildKernel/Template/RD88F6281=$(call
Image/BuildKernel/Template,RD88F6281,legacy)
+Image/InstallKernel/Template/RD88F6281=$(call
Image/InstallKernel/Template,RD88F6281,legacy)
+
define Image/BuildKernel
$(call Image/BuildKernel/Template/$(PROFILE))
endef
--
1.8.5.2 (Apple Git-48)
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
