kirkwood: update support for iconnect

Previous patch was pushed due to false user report. While at it fix alphabetic
ordering.

The board is optimized for ubi(fs) and boots OpenWrt without changes to uboot
environment if OpenWrt's uboot package is used. In order to flash the image run
following commands in uboot shell:

nand erase 0x200000 0x1fe00000
ubi part root ; ubi remove rootfs ; ubi create rootfs
tftpboot 0x800000 openwrt-kirkwood-iconnect-rootfs.ubifs ; ubi write 0x800000 rootfs ${filesize} ; reset

Signed-off-by: Luka Perkov <luka@openwrt.org>
CC: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39591

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 bf95f72cb860ea8c64f844b6b17f70ccd1fbc859..c6ceff78c96760cd923a0dec7304a52e7cc005f1 100644 (file)
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -28,7 +28,9 @@ case "`cat /proc/device-tree/model`" in
 "Seagate FreeAgent Dockstar")
        set_lan_dhcp "eth0"
        ;;
-
+"Iomega Iconnect")
+       set_lan_dhcp "eth0"
+       ;;
 "RaidSonic ICY BOX IB-NAS62x0 (Rev B)")
        set_lan_dhcp "eth0"
        ;;

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 11b28fd58b4a339f48f09eb11fcdf7d9a29b7b02..d7ace4519925d97e0381708ca18373915fd29067 100644 (file)
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -117,12 +117,12 @@ Image/InstallKernel/Template/Generic=$(call Image/InstallKernel/Template)
 Image/BuildKernel/Template/DOCKSTAR=$(call Image/BuildKernel/Template,dockstar)
 Image/InstallKernel/Template/DOCKSTAR=$(call Image/InstallKernel/Template,dockstar)
 
-Image/BuildKernel/Template/ICONNECT=$(call Image/BuildKernel/Template,iconnect)
-Image/InstallKernel/Template/ICONNECT=$(call Image/InstallKernel/Template,iconnect)
-
 Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0)
 Image/InstallKernel/Template/IB62X0=$(call Image/InstallKernel/Template,ib62x0)
 
+Image/BuildKernel/Template/ICONNECT=$(call Image/BuildKernel/Template,iconnect)
+Image/InstallKernel/Template/ICONNECT=$(call Image/InstallKernel/Template,iconnect)
+
 Image/BuildKernel/Template/POGOE02=$(call Image/BuildKernel/Template,pogo_e02)
 Image/InstallKernel/Template/POGOE02=$(call Image/InstallKernel/Template,pogo_e02)
 

diff --git a/target/linux/kirkwood/patches-3.10/130-iconnect.patch b/target/linux/kirkwood/patches-3.10/130-iconnect.patch
new file mode 100644 (file)
index 0000000..28e7012
--- /dev/null
+++ b/target/linux/kirkwood/patches-3.10/130-iconnect.patch
@@ -0,0 +1,41 @@
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
++++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
+@@ -85,28 +85,23 @@
+                       status = "okay";
+ 
+                       partition@0 {
+-                              label = "uboot";
+-                              reg = <0x0000000 0xc0000>;
++                              label = "u-boot";
++                              reg = <0x0000000 0xe0000>;
+                       };
+ 
+-                      partition@a0000 {
+-                              label = "env";
+-                              reg = <0xa0000 0x20000>;
++                      partition@e0000 {
++                              label = "u-boot environment";
++                              reg = <0xe0000 0x100000>;
+                       };
+ 
+                       partition@100000 {
+-                              label = "zImage";
+-                              reg = <0x100000 0x300000>;
++                              label = "second stage u-boot";
++                              reg = <0x100000 0x200000>;
+                       };
+ 
+-                      partition@540000 {
+-                              label = "initrd";
+-                              reg = <0x540000 0x300000>;
+-                      };
+-
+-                      partition@980000 {
+-                              label = "boot";
+-                              reg = <0x980000 0x1f400000>;
++                      partition@200000 {
++                              label = "root";
++                              reg = <0x200000 0x1fe00000>;
+                       };
+               };
+ 

diff --git a/target/linux/kirkwood/profiles/110-nas.mk b/target/linux/kirkwood/profiles/110-nas.mk
index 07a9797e55bdade04fe548674d362c2dc1f7f5da..6605f6936283dcf47e16540c30581cbdd4c43c76 100644 (file)
--- a/target/linux/kirkwood/profiles/110-nas.mk
+++ b/target/linux/kirkwood/profiles/110-nas.mk
@@ -22,21 +22,6 @@ DOCKSTAR_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
 
 $(eval $(call Profile,DOCKSTAR))
 
-define Profile/ICONNECT
-  NAME:=Iomega Iconnect
-  PACKAGES:= \
-       kmod-usb2 kmod-usb-storage
-endef
-
-define Profile/ICONNECT/Description
- Package set compatible with Iomega Iconnect board.
-endef
-
-ICONNECT_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-ICONNECT_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
-$(eval $(call Profile,ICONNECT))
-
 define Profile/IB62X0
   NAME:=RaidSonic ICY BOX IB-NAS62x0
   PACKAGES:= \
@@ -53,3 +38,18 @@ IB62X0_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
 IB62X0_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
 
 $(eval $(call Profile,IB62X0))
+
+define Profile/ICONNECT
+  NAME:=Iomega Iconnect
+  PACKAGES:= \
+       kmod-usb2 kmod-usb-storage
+endef
+
+define Profile/ICONNECT/Description
+ Package set compatible with Iomega Iconnect board.
+endef
+
+ICONNECT_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+ICONNECT_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
+$(eval $(call Profile,ICONNECT))