[OpenWrt-Devel] [PATCH] kirkwood: add support for Marvell rd88f6281 as gateway+nas profile in legacy mode
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=99
+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
Re: [OpenWrt-Devel] [PATCH 3/5] [packages] rsync: cosmetic changes after package split
Ok. I just tried to unify style of this file, and wasn't planning tabs-spaces holy-war :-) Although, both approaches can be found all over the code and there is no specific guidelines on subject. Note, there is at least one change not related to styling: - --disable-acl-support \ + --disable-acl-support On Fri, Sep 30, 2011 at 14:48, Florian Fainelli flor...@openwrt.org wrote: Hello, On Monday 29 August 2011 22:09:35 eugene...@gmail.com wrote: From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- net/rsync/Makefile | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 46670e5..f6d8eb1 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -21,20 +21,20 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk define Package/rsync - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=Fast remote file copy program (like rcp) - DEPENDS:=+libpopt - URL:=http://rsync.samba.org/ + SECTION:=net + CATEGORY:=Network + SUBMENU:=File Transfer + TITLE:=Fast remote file copy program (like rcp) + DEPENDS:=+libpopt + URL:=http://rsync.samba.org/ endef define Package/rsyncd - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=Rsync daemon - DEPENDS:=+rsync + SECTION:=net + CATEGORY:=Network + SUBMENU:=File Transfer + TITLE:=Rsync daemon + DEPENDS:=+rsync endef define Package/rsync/description @@ -54,7 +54,7 @@ CONFIGURE_ARGS += \ --disable-debug \ --disable-locale \ --disable-xattr-support \ - --disable-acl-support \ + --disable-acl-support define Package/rsync/install $(INSTALL_DIR) $(1)/usr/bin @@ -68,7 +68,7 @@ define Package/rsyncd/description endef define Package/rsyncd/conffiles -/etc/rsyncd.conf + /etc/rsyncd.conf endef define Package/rsyncd/install The prefered way of writing a Makefile is how it is right now. Inserting tabs instead of 2 spaces is not what we generally have. -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 3/5] [packages] rsync: cosmetic changes after package split
I understand. BTW, thank you for reviewing and applying my patches. On Fri, Sep 30, 2011 at 15:59, Florian Fainelli flor...@openwrt.org wrote: On Friday 30 September 2011 14:37:05 Eugene San wrote: Ok. I just tried to unify style of this file, and wasn't planning tabs-spaces holy-war :-) Although, both approaches can be found all over the code and there is no specific guidelines on subject. Agreed, in general I try to keep this style of 2 spaces for declarations inside define/endef blocks, but having tabs is also valid. Note sure about other editors, but vim for instance does a better highlighting job when using 2 spaces (it's Friday after all). Note, there is at least one change not related to styling: - --disable-acl-support \ + --disable-acl-support On Fri, Sep 30, 2011 at 14:48, Florian Fainelli flor...@openwrt.org wrote: Hello, On Monday 29 August 2011 22:09:35 eugene...@gmail.com wrote: From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- net/rsync/Makefile | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 46670e5..f6d8eb1 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -21,20 +21,20 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk define Package/rsync - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=Fast remote file copy program (like rcp) - DEPENDS:=+libpopt - URL:=http://rsync.samba.org/ + SECTION:=net + CATEGORY:=Network + SUBMENU:=File Transfer + TITLE:=Fast remote file copy program (like rcp) + DEPENDS:=+libpopt + URL:=http://rsync.samba.org/ endef define Package/rsyncd - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=Rsync daemon - DEPENDS:=+rsync + SECTION:=net + CATEGORY:=Network + SUBMENU:=File Transfer + TITLE:=Rsync daemon + DEPENDS:=+rsync endef define Package/rsync/description @@ -54,7 +54,7 @@ CONFIGURE_ARGS += \ --disable-debug \ --disable-locale \ --disable-xattr-support \ - --disable-acl-support \ + --disable-acl-support define Package/rsync/install $(INSTALL_DIR) $(1)/usr/bin @@ -68,7 +68,7 @@ define Package/rsyncd/description endef define Package/rsyncd/conffiles -/etc/rsyncd.conf + /etc/rsyncd.conf endef define Package/rsyncd/install The prefered way of writing a Makefile is how it is right now. Inserting tabs instead of 2 spaces is not what we generally have. -- Florian -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/6] kernel: add some missing usb modules
There was no 3.1 when this modification was created. I suppose it can be blindly applied to 3.1. On Tue, Aug 30, 2011 at 11:11, Florian Fainelli flor...@openwrt.org wrote: Hello, On Monday 29 August 2011 22:11:51 eugene...@gmail.com wrote: From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/generic/config-3.0 |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Any reasons this is not applied to config-3.1 as well? diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0 index ed8ad82..d8bd005 100644 --- a/target/linux/generic/config-3.0 +++ b/target/linux/generic/config-3.0 @@ -2893,13 +2893,13 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y # CONFIG_USB_STKWEBCAM is not set # CONFIG_USB_STORAGE is not set CONFIG_USB_STORAGE_ALAUDA=y -# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_STORAGE_ENE_UB6250 is not set +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +CONFIG_USB_STORAGE_ENE_UB6250=y CONFIG_USB_STORAGE_DATAFAB=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_REALTEK is not set CONFIG_USB_STORAGE_FREECOM=y -# CONFIG_USB_STORAGE_ISD200 is not set +CONFIG_USB_STORAGE_ISD200=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_STORAGE_ONETOUCH is not set -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 6/6] [package] mac80211: fix mwl8k firmware treatment at build and run times
Hi,
I've spoken with driver maintainer and he promised to look into it. We
should see second part of patch as temporary solution before upstream fixes
the issue.
On Tue, Aug 30, 2011 at 11:14, Florian Fainelli flor...@openwrt.org wrote:
Hello,
On Monday 29 August 2011 22:11:55 eugene...@gmail.com wrote:
From: Eugene San (eugenesan) eugene...@gmail.com
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com
---
package/mac80211/Makefile |4 +-
.../701-mwl8k-firmware-reload-workaround.patch | 29
2 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644
package/mac80211/patches/701-mwl8k-firmware-reload-workaround.patch
The first patch looks obviously correct, what about sending the second
upstream?
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index e2942f8..3fdd691 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -1326,14 +1326,14 @@ define KernelPackage/ath9k-htc/install
endef
define KernelPackage/mwl8k/install
- $(INSTALL_DIR) $(1)/lib/firmware
+ $(INSTALL_DIR) $(1)/lib/firmware/mwl8k/
$(INSTALL_DATA) \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366_ap-2.fw
\ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366.fw \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8366.fw \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8687.fw \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8687.fw \
- $(1)/lib/firmware/
+ $(1)/lib/firmware/mwl8k/
endef
define KernelPackage/net-ipw2100/install
diff --git
a/package/mac80211/patches/701-mwl8k-firmware-reload-workaround.patch
b/package/mac80211/patches/701-mwl8k-firmware-reload-workaround.patch new
file mode 100644
index 000..7c09699
--- /dev/null
+++ b/package/mac80211/patches/701-mwl8k-firmware-reload-workaround.patch
@@ -0,0 +1,29 @@
+--- a/drivers/net/wireless/mwl8k.c
b/drivers/net/wireless/mwl8k.c
+@@ -5470,7 +5470,7 @@
+ */
+ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char
*fw_image)
+ {
+-int i, rc = 0;
++int i, rc, loops = 0;
+ struct mwl8k_priv *priv = hw-priv;
+
+ mwl8k_stop(hw);
+@@ -5479,7 +5479,16 @@
+ for (i = 0; i mwl8k_tx_queues(priv); i++)
+ mwl8k_txq_deinit(hw, i);
+
+-rc = mwl8k_init_firmware(hw, fw_image, false);
++loops = 5;
++do {
++rc = mwl8k_init_firmware(hw, fw_image, false);
++if (rc)
++printk(KERN_WARNING mwl8k: Failed to init
firmware, will retry
in 5
seconds @%s:%d.\n, __FUNCTION__, __LINE__); ++ else
++break;
++
++msleep(5000);
++} while (--loops);
+ if (rc)
+ goto fail;
+
--
Florian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/5] support git-svn and two devices in kirkwood and orion targets
Providing next patches for review/inclusion: support git-svn as scm and download engine(git as frontend for svn) support kernel config per target profile fix cpiogz [kirkwood]: add squashfs support and RD88F6281 profile [orion]: normalize jffs2 support and RD88F5181L_GE image Luci reqires additional patch: 0006-luci-workaround-for-git-as-scm-and-download-engine.patch (Will be following current patches set) feeds.conf.default |3 ++ include/download.mk| 16 include/image.mk |1 + include/target.mk |4 +- scripts/feeds |6 +++ target/linux/kirkwood/Makefile |4 +- .../linux/kirkwood/base-files/etc/config/network | 37 target/linux/kirkwood/config-default-rd88f6281 | 20 +++ target/linux/kirkwood/image/Makefile | 10 - .../patches/001-openwrt_partition_map.patch| 21 +-- target/linux/kirkwood/profiles/400-rd88f6281.mk| 17 + target/linux/orion/config-default | 10 +++-- target/linux/orion/image/generic.mk| 34 +++--- .../patches/102-rd88f5181l-ge_partition_map.patch | 33 + 14 files changed, 197 insertions(+), 19 deletions(-) create mode 100644 target/linux/kirkwood/base-files/etc/config/network create mode 100644 target/linux/kirkwood/config-default-rd88f6281 create mode 100644 target/linux/kirkwood/profiles/400-rd88f6281.mk create mode 100644 target/linux/orion/patches/102-rd88f5181l-ge_partition_map.patch -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/5] [kirkwood]: add squashfs support and RD88F6281 profile
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/kirkwood/Makefile |4 +- .../linux/kirkwood/base-files/etc/config/network | 37 target/linux/kirkwood/config-default-rd88f6281 | 20 +++ target/linux/kirkwood/image/Makefile | 10 - .../patches/001-openwrt_partition_map.patch| 21 +-- target/linux/kirkwood/profiles/400-rd88f6281.mk| 17 + 6 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 target/linux/kirkwood/base-files/etc/config/network create mode 100644 target/linux/kirkwood/config-default-rd88f6281 create mode 100644 target/linux/kirkwood/profiles/400-rd88f6281.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 37d6d3d..96cef3f 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=kirkwood BOARDNAME:=Marvell Kirkwood -FEATURES:=targz usb jffs2 +FEATURES:=targz usb jffs2 squashfs MAINTAINER:=Imre Kaloz ka...@openwrt.org LINUX_VERSION:=2.6.37.4 @@ -18,6 +18,6 @@ include $(INCLUDE_DIR)/target.mk KERNELNAME:=uImage -DEFAULT_PACKAGES += +DEFAULT_PACKAGES += kmod-crypto-mv-cesa $(eval $(call BuildTarget)) diff --git a/target/linux/kirkwood/base-files/etc/config/network b/target/linux/kirkwood/base-files/etc/config/network new file mode 100644 index 000..d24221f --- /dev/null +++ b/target/linux/kirkwood/base-files/etc/config/network @@ -0,0 +1,37 @@ +config 'interface' 'loopback' + option 'ifname' 'lo' + option 'proto' 'static' + option 'ipaddr' '127.0.0.1' + option 'netmask' '255.0.0.0' + +config 'interface' 'eth0' + option 'ifname' 'eth0' + +config 'interface' 'lan' + option 'ifname' 'lan1 lan2 lan3 lan4' + option 'type' 'bridge' + option 'proto' 'static' + option 'netmask' '255.255.255.0' + option 'nat' '1' + option 'stp' '1' + option 'ipaddr' '192.168.2.1' + +config 'interface' 'wan' + option 'hostname' 'openwrt' + option 'proto' 'dhcp' + option 'defaultroute' '0' + option 'peerdns' '0' + option 'type' 'bridge' + option 'ifname' 'wan eth1 eth2' + +config 'wifi-device' 'wifi0' + option 'type' 'mac80211' + option 'channel' '5' + +config 'wifi-iface' + option 'device' 'wlan0' + option 'network' 'lan' + option 'mode' 'ap' + option 'ssid' 'openwrt' + option 'hidden' '0' + option 'encryption' 'none' diff --git a/target/linux/kirkwood/config-default-rd88f6281 b/target/linux/kirkwood/config-default-rd88f6281 new file mode 100644 index 000..56e64d5 --- /dev/null +++ b/target/linux/kirkwood/config-default-rd88f6281 @@ -0,0 +1,20 @@ +CONFIG_MACH_RD88F6281=y +CONFIG_CMDLINE=rootdelay=1 console=ttyS0,115200 panic=5 +CONFIG_NET_DSA_MV88E6123_61_65=y +CONFIG_INITRAMFS_COMPRESSION_GZIP=y +CONFIG_RD_GZIP=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_UBIFS_FS=y +# CONFIG_UBIFS_FS_XATTR is not set +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index c93be67..3972b61 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2010 OpenWrt.org +# Copyright (C) 2009-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,9 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk JFFS2OPTS += --little-endian --pagesize=0x800 --no-cleanmarkers --pad +JFFS2_BLOCKSIZE = 128k define Image/Prepare cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage + cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/zImage endef define Image/BuildKernel @@ -31,10 +33,14 @@ define Image/Build/jffs2-128k endef define Image/Build/squashfs + $(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T multi \ + -C none -a 0x8000 -e 0x8000 -n 'Linux-$(LINUX_VERSION)-initrd' \ + -d $(KDIR)/zImage:$(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).uimg + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) ( \ dd if=$(KDIR)/uImage bs=4096k conv=sync; \ - dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ + dd if=$(KDIR)/root.squashfs bs=128k conv=sync; \ ) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img endef diff --git a/target/linux/kirkwood/patches/001-openwrt_partition_map.patch b/target/linux/kirkwood/patches/001
[OpenWrt-Devel] [PATCH 1/5] support git-svn as scm and download engine(git as frontend for svn)
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com
---
feeds.conf.default |3 +++
include/download.mk | 16
scripts/feeds |6 ++
3 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/feeds.conf.default b/feeds.conf.default
index c4ac535..5eb7555 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,6 +1,9 @@
src-svn packages svn://svn.openwrt.org/openwrt/packages
src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
src-svn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
+#src-gsvn packages svn://svn.openwrt.org/openwrt/packages
+#src-gsvn xwrt http://x-wrt.googlecode.com/svn/trunk/package
+#src-gsvn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
#src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
#src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
#src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
diff --git a/include/download.mk b/include/download.mk
index fd197ea..91896df 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -97,6 +97,22 @@ define DownloadMethod/git
)
endef
+define DownloadMethod/gsvn
+ $(call wrap_mirror, \
+ echo Checking out files from the git-svn repository...; \
+ mkdir -p $(TMP_DIR)/dl \
+ cd $(TMP_DIR)/dl \
+ rm -rf $(SUBDIR) \
+ [ \! -d $(SUBDIR) ] \
+ git svn clone $(URL) $(SUBDIR) \
+ echo Packing checkout... \
+ rm -rf $(SUBDIR)/.git \
+ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) \
+ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ \
+ rm -rf $(SUBDIR); \
+ )
+endef
+
define DownloadMethod/bzr
$(call wrap_mirror, \
echo Checking out files from the bzr repository...; \
diff --git a/scripts/feeds b/scripts/feeds
index 9f773df..4db6230 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -117,6 +117,11 @@ my %update_method = (
'init_branch' = git clone --depth 1 --branch '%s' '%s'
'%s',
'update'= git pull,
'controldir'= .git},
+ 'src-gsvn' = {
+ 'init' = git svn clone '%s' '%s',
+ 'init_branch' = git svn clone --branch '%s' '%s' '%s',
+ 'update'= git svn rebase,
+ 'controldir'= .git},
'src-bzr' = {
'init' = bzr checkout --lightweight '%s' '%s',
'update'= bzr update,
@@ -286,6 +291,7 @@ my %install_method = (
'src-cpy' = \install_generic,
'src-link' = \install_generic,
'src-git' = \install_generic,
+ 'src-gsvn' = \install_generic,
'src-bzr' = \install_generic,
'src-hg' = \install_generic,
'src-darcs' = \install_generic,
--
1.7.4.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] luci workaround for git-svn as scm and download engine
--- luci/Makefile |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/luci/Makefile b/luci/Makefile index 354de1e..ac1ac78 100644 --- a/luci/Makefile +++ b/luci/Makefile @@ -4,6 +4,7 @@ PKG_BRANCH:=trunk ifeq ($(DUMP),) USELOCAL:=$(shell grep luci ../../../.project 2/dev/null /dev/null echo 1) + USEGSVN:=$(shell git svn info 2/dev/null /dev/null echo 1) endif PKG_NAME:=luci @@ -16,7 +17,11 @@ ifeq ($(USELOCAL),1) else PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) ifeq ($(DUMP),) -PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p') +ifeq ($(USEGSVN),1) + PKG_REV:=$(shell LC_ALL=C svn info $(PKG_SOURCE_URL) | sed -ne's/^Revision: //p') +else + PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p') +endif PKG_VERSION:=0.10+svn$(PKG_REV) endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/5] fix cpiogz
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- include/image.mk |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/image.mk b/include/image.mk index 29328b3..3160a4d 100644 --- a/include/image.mk +++ b/include/image.mk @@ -106,6 +106,7 @@ endif ifneq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),) define Image/mkfs/cpiogz ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) + $(call Image/Build,cpiogz) endef endif -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/5] [orion]: normalize jffs2 support and RD88F5181L_GE image
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/orion/config-default | 10 +++-- target/linux/orion/image/generic.mk| 34 --- .../patches/102-rd88f5181l-ge_partition_map.patch | 33 +++ 3 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 target/linux/orion/patches/102-rd88f5181l-ge_partition_map.patch diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default index c78a397..665a2e8 100644 --- a/target/linux/orion/config-default +++ b/target/linux/orion/config-default @@ -41,6 +41,7 @@ CONFIG_CPU_TLB_V4WBI=y CONFIG_CRYPTO_DEV_MV_CESA=y CONFIG_CRYPTO_HW=y # CONFIG_DEBUG_USER is not set +CONFIG_DECOMPRESS_LZMA=y CONFIG_DEVPORT=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -137,7 +138,7 @@ CONFIG_MACH_DT2=y # CONFIG_MACH_MV2120 is not set # CONFIG_MACH_NET2BIG is not set # CONFIG_MACH_RD88F5181L_FXO is not set -# CONFIG_MACH_RD88F5181L_GE is not set +CONFIG_MACH_RD88F5181L_GE=y # CONFIG_MACH_RD88F5182 is not set # CONFIG_MACH_RD88F6183AP_GE is not set # CONFIG_MACH_TERASTATION_PRO2 is not set @@ -192,6 +193,7 @@ CONFIG_PLAT_ORION=y # CONFIG_R6040 is not set CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_ISL1208=y +CONFIG_RTC_DRV_DS1307=y CONFIG_SATA_PMP=y # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SENSORS_PC87360 is not set @@ -209,10 +211,10 @@ CONFIG_USB_EHCI_HCD=m # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_KAWETH is not set -CONFIG_USB=m +CONFIG_USB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD is not set # CONFIG_USBPCWATCHDOG is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_PRINTER is not set @@ -229,7 +231,7 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_USBAT is not set CONFIG_USB_SUPPORT=y -CONFIG_USB_UHCI_HCD=m +# CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_USBNET is not set # CONFIG_USB_VIDEO_CLASS is not set # CONFIG_USB_WDM is not set diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk index c3bd601..4a88a3a 100644 --- a/target/linux/orion/image/generic.mk +++ b/target/linux/orion/image/generic.mk @@ -5,6 +5,8 @@ # See /LICENSE for more information. # +JFFS2_BLOCKSIZE = 128k + define Image/Prepare cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage endef @@ -25,6 +27,13 @@ define Image/BuildKernel -C none -a 0x8000 -e 0x8000 -n 'Linux-$(LINUX_VERSION)' \ -d $(KDIR)/wnr854t-zImage $(KDIR)/wnr854t-uImage cp $(KDIR)/wnr854t-uImage $(BIN_DIR)/openwrt-wnr854t-uImage + # RD88F5181L_GE: mach id 1812 (0x714) + echo -en \x07\x1c\xa0\xe3\x14\x10\x81\xe3 $(KDIR)/rd88f5181l_ge-zImage + cat $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/rd88f5181l_ge-zImage + $(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \ + -C none -a 0x8000 -e 0x8000 -n 'Linux-$(LINUX_VERSION)' \ + -d $(KDIR)/rd88f5181l_ge-zImage $(KDIR)/rd88f5181l_ge-uImage + cp $(KDIR)/rd88f5181l_ge-uImage $(BIN_DIR)/openwrt-rd88f5181l_ge-uImage endef define Image/Build/Netgear @@ -40,6 +49,15 @@ define Image/Build/Netgear $(STAGING_DIR_HOST)/bin/add_header $(3) $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img endef +define Image/Build/Marvell + # Orion Marvell Images + ( \ + dd if=$(BIN_DIR)/openwrt-rd88f5181l_ge-uImage bs=1024k conv=sync; \ + dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ + ) $(BIN_DIR)/openwrt-$(2)-$(1).img + $(STAGING_DIR_HOST)/bin/add_header $(3) $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img +endef + define Image/Build/Linksys # Orion Linksys Images # sysupgrade image @@ -70,15 +88,19 @@ define Image/Build/Linksys endef define Image/Build -$(call Image/Build/$(1),$(1)) -$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1)) - # Leave WRT350Nv2 at last position due to webimage dependency for zip - # 5th parameter is kernel mtd size, e.g. 0x0010 = 1048576 or 0x001A = 1703936 -$(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576) + $(call Image/Build/$(1),$(1)) + $(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1)) + $(call Image/Build/Marvell,$(1),rd88f5181l_ge,RD88F5181L_GE,$(1)) + # Leave WRT350Nv2 at last position due to webimage dependency for zip + # and too big image without squashfs +ifeq ($(1),squashfs) + # 5th parameter is kernel mtd size, e.g. 0x0010 = 1048576 or 0x001A = 1703936 + $(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576) +endif endef define Image/Build/squashfs -$(call prepare_generic_squashfs,$(KDIR)/root.squashfs) + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) ( \ dd if=$(KDIR
