Re: [OpenWrt-Devel] [PATCH 1/1] cs5535-gpio: name changed in linux-3.1
Le 29/08/2011 06:55, Philip Prindeville a écrit : The name gpio-cs5535 used to refer to the drivers/char/ module, but in 3.1 it refers to what had been drivers/gpio/cs5535-gpio in more recent kernels. Have you checked on Linux 3.0 ? It seems to me that many drivers have been moved (serial went to drivers/serial/tty or something like that) and so on. Also, I would have checked the linux kernel version out of the package definitions and set a GPIODIR variable to either /gpio or /char, depending on the kernel version. Something like this would be useful anyway when dealing with drivers that move from staging to non-staging. Best regards, -- Emmanuel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [RESEND] Platform patches not applied on make toolchain/kernel-headers/prepare
Apologies if you receive this twice. It was supposed to be sent on last friday, but it seems it wasn't - or at least, I didn't got it back - which is weird since I didn't lost any other message. ---8- Hello, I'm not sure whether this is by design or if this is a mistake, but when one does a make toolchain/kernel-headers/prepare the build process applies the generic patches (in $(GENERIC_PLATFORM_DIR)/paches-$(KERNEL_VERSION)) but not the ones that are located in the specific platform subtree. This has an undesireable consequence: when one wants to modify a linux header that can be used by some userspace program, he must add its platform-specific patch in the generic subtree - otherwise the changes to the header file are not visible. The same remark applies for the platfom files/ directory, which contains potentially important header files as well. In my opinion, the kernel-headers toolchain package shall have no patches/ and no files/ - that doesn't make much sense. I cannot see any reason were one would want to have user-space kernel header files that are not tied to the kernel-space ones. Since the patches are applied on the linux tree, they should be added into to linux generic patch dir (same remark for the files), so maybe one can just set PATCH_DIR to $(PLATFORM_DIR)/patches-$(KERNEL_VERSION) (or something like that) in kernel-headers/Makefile - or change the Kernel/Patch/Default rule so that it always apply the platform patches - and not the patches in PATCH_DIR (since this variable depends on the package). So, honnest mistake or design choice? (i.e. what should I do with this report?) Best regards, -- Emmanuel Deloget ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RESEND] Platform patches not applied on make toolchain/kernel-headers/prepare
Hello, On Monday 29 August 2011 10:22:47 Emmanuel Deloget wrote: Apologies if you receive this twice. It was supposed to be sent on last friday, but it seems it wasn't - or at least, I didn't got it back - which is weird since I didn't lost any other message. It was, see my reply on the list and to you [1]. Note that your email addressed bounced on Friday. [1]: https://lists.openwrt.org/pipermail/openwrt-devel/2011-August/012031.html ---8- Hello, I'm not sure whether this is by design or if this is a mistake, but when one does a make toolchain/kernel-headers/prepare the build process applies the generic patches (in $(GENERIC_PLATFORM_DIR)/paches-$(KERNEL_VERSION)) but not the ones that are located in the specific platform subtree. This has an undesireable consequence: when one wants to modify a linux header that can be used by some userspace program, he must add its platform-specific patch in the generic subtree - otherwise the changes to the header file are not visible. The same remark applies for the platfom files/ directory, which contains potentially important header files as well. In my opinion, the kernel-headers toolchain package shall have no patches/ and no files/ - that doesn't make much sense. I cannot see any reason were one would want to have user-space kernel header files that are not tied to the kernel-space ones. Since the patches are applied on the linux tree, they should be added into to linux generic patch dir (same remark for the files), so maybe one can just set PATCH_DIR to $(PLATFORM_DIR)/patches-$(KERNEL_VERSION) (or something like that) in kernel-headers/Makefile - or change the Kernel/Patch/Default rule so that it always apply the platform patches - and not the patches in PATCH_DIR (since this variable depends on the package). So, honnest mistake or design choice? (i.e. what should I do with this report?) Best regards, -- Emmanuel Deloget ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
On 29.08.2011 16:14, Jan Willies wrote: Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net mailto:open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. as openvpn_complzo obviously is a package definition why isn't the liblzo dependency defined there? that would definitely select it then. ede ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
2011/8/29 edgar.sol...@web.de On 29.08.2011 16:14, Jan Willies wrote: Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net mailto: open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. as openvpn_complzo obviously is a package definition why isn't the liblzo dependency defined there? that would definitely select it then. It's just a configuration option (Config.in), not a full featured package. Depending on it there makes it unavailable in menuconfig unless lzo is selected. This is not desired IMO. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
On 29.08.2011 16:44, Jan Willies wrote: 2011/8/29 edgar.sol...@web.de mailto:edgar.sol...@web.de On 29.08.2011 16 tel:29.08.2011%2016:14, Jan Willies wrote: Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net mailto:open...@lukaperkov.net mailto:open...@lukaperkov.net mailto:open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. as openvpn_complzo obviously is a package definition why isn't the liblzo dependency defined there? that would definitely select it then. It's just a configuration option (Config.in), not a full featured package. Depending on it there makes it unavailable in menuconfig unless lzo is selected. This is not desired IMO. i see, but there is only a OPENVPN_LZO there in Config.in . So wouldn't it be +OPENVPN_LZO:liblzo then? ..ede ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
On 29 August 2011 17:04, edgar.sol...@web.de wrote: On 29.08.2011 16:44, Jan Willies wrote: 2011/8/29 edgar.sol...@web.de mailto:edgar.sol...@web.de On 29.08.2011 16 tel:29.08.2011%2016:14, Jan Willies wrote: Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net mailto:open...@lukaperkov.net mailto:open...@lukaperkov.net mailto:open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. as openvpn_complzo obviously is a package definition why isn't the liblzo dependency defined there? that would definitely select it then. It's just a configuration option (Config.in), not a full featured package. Depending on it there makes it unavailable in menuconfig unless lzo is selected. This is not desired IMO. i see, but there is only a OPENVPN_LZO there in Config.in . So wouldn't it be +OPENVPN_LZO:liblzo OPENVPN_LZO /disables/ lzo, so it should be: +!OPENVPN_LZO:liblzo which incidentially shows that the option names are misleading and they should be renamed or their effect reversed, so that they enable, not disable (I'd prefer the latter). Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
On 29.08.2011 17:14, Jonas Gorski wrote: On 29 August 2011 17:04, edgar.sol...@web.de wrote: On 29.08.2011 16:44, Jan Willies wrote: 2011/8/29 edgar.sol...@web.de mailto:edgar.sol...@web.de On 29.08.2011 16 tel:29.08.2011%2016:14, Jan Willies wrote: Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net mailto:open...@lukaperkov.net mailto:open...@lukaperkov.net mailto:open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. as openvpn_complzo obviously is a package definition why isn't the liblzo dependency defined there? that would definitely select it then. It's just a configuration option (Config.in), not a full featured package. Depending on it there makes it unavailable in menuconfig unless lzo is selected. This is not desired IMO. i see, but there is only a OPENVPN_LZO there in Config.in . So wouldn't it be +OPENVPN_LZO:liblzo OPENVPN_LZO /disables/ lzo, so it should be: +!OPENVPN_LZO:liblzo which incidentially shows that the option names are misleading and they should be renamed or their effect reversed, so that they enable, not disable (I'd prefer the latter). right missed that. and yes reversing would be most elegant. ede ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
2011/8/29 edgar.sol...@web.de On 29.08.2011 17:14, Jonas Gorski wrote: On 29 August 2011 17:04, edgar.sol...@web.de wrote: On 29.08.2011 16:44, Jan Willies wrote: 2011/8/29 edgar.sol...@web.de mailto:edgar.sol...@web.de On 29.08.2011 16 tel:29.08.2011%2016:14, Jan Willies wrote: Hi Luka, 2011/8/21 Luka Perkov open...@lukaperkov.net mailto: open...@lukaperkov.net mailto:open...@lukaperkov.net mailto: open...@lukaperkov.net define Package/openvpn SECTION:=net CATEGORY:=Network + SUBMENU:=VPN DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo The lzo dependency doesn't seem to work. It's not selected here. as openvpn_complzo obviously is a package definition why isn't the liblzo dependency defined there? that would definitely select it then. It's just a configuration option (Config.in), not a full featured package. Depending on it there makes it unavailable in menuconfig unless lzo is selected. This is not desired IMO. i see, but there is only a OPENVPN_LZO there in Config.in . So wouldn't it be +OPENVPN_LZO:liblzo OPENVPN_LZO /disables/ lzo, so it should be: +!OPENVPN_LZO:liblzo which incidentially shows that the option names are misleading and they should be renamed or their effect reversed, so that they enable, not disable (I'd prefer the latter). right missed that. and yes reversing would be most elegant. ede fixed in r28120 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
On Mon, Aug 29, 2011 at 05:32:10PM +0200, Jan Willies wrote: 2011/8/29 edgar.sol...@web.de right missed that. and yes reversing would be most elegant. ede I don't see why reversing would be most elegant. Now you can fully tweak your openvpn package. fixed in r28120 Thanks. I used names similar to openvpn configure script, sorry for the trouble. Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH][PACKAGE] upgrade openvpn package
On 29.08.2011 18:17, Luka Perkov wrote: On Mon, Aug 29, 2011 at 05:32:10PM +0200, Jan Willies wrote: 2011/8/29 edgar.sol...@web.de right missed that. and yes reversing would be most elegant. ede I don't see why reversing would be most elegant. Now you can fully tweak your openvpn package. you missed the reference which incidentially shows that the option names are misleading and they should be renamed or their effect reversed, so that they enable, not disable (I'd prefer the latter). OPENVPN_LZO is not only shorter than OPENVPN_DISABLE_LZO , it also reads better if it is reversed !OPENVPN_LZO . But for that the values in Config.in would have been to be reversed too. The solution now works. All is well.. ede ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] packages/libftdi
Hello list, libftdi depends on libusb. DEPENDS:=+libusb Please insert this line in packages/libftdi/Makefile. Best Regards Jens. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/5] [packages] mc: update version to 4.7.5.3 with addition of mcview and mcdiff
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- utils/mc/Config.in | 20 +++ utils/mc/Makefile | 54 +++ 2 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 utils/mc/Config.in diff --git a/utils/mc/Config.in b/utils/mc/Config.in new file mode 100644 index 000..1f503f8 --- /dev/null +++ b/utils/mc/Config.in @@ -0,0 +1,20 @@ +# mc package config + +menu Configuration + depends on PACKAGE_mc + +config MC_DISABLE_EDITOR + bool Disable internal editor + default y + help +Disables internal editor. +If unsure, choose the default Y. + +config MC_DISABLE_SUBSHELL + bool Disable subshell + default y + help +Disables background shell. +If unsure, choose the default Y. + +endmenu diff --git a/utils/mc/Makefile b/utils/mc/Makefile index 974f2da..0a162c6 100644 --- a/utils/mc/Makefile +++ b/utils/mc/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mc -PKG_VERSION:=4.7.5.2 +PKG_VERSION:=4.7.5.3 PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/ -PKG_MD5SUM:=9fdfe7c0fcff362436eb35fcd1adf0fd +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.midnight-commander.org/downloads/ +PKG_MD5SUM:=6a67e139e0032d8a871455a80d490941 PKG_BUILD_PARALLEL:=1 @@ -21,32 +21,39 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk define Package/mc - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+glib2 +libncurses +libiconv - TITLE:=midnight commander - a powerful file manager - URL:=http://www.midnight-commander.org/ - SUBMENU:=filemanager - MAINTAINER:=Luka Perkov open...@lukaperkov.net + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+glib2 +libncurses +libiconv + TITLE:=midnight commander - a powerful file manager + URL:=http://www.midnight-commander.org/ + SUBMENU:=Filemanager + MAINTAINER:=Luka Perkov open...@lukaperkov.net + MENU:=1 endef define Package/mc/description - GNU Midnight Commander is a visual file manager, licensed under GNU General - Public License and therefore qualifies as Free Software. It's a feature rich - full-screen text mode application that allows you to copy, move and delete - files and whole directory trees, search for files and run commands in the - subshell. + GNU Midnight Commander is a visual file manager, licensed under GNU General + Public License and therefore qualifies as Free Software. It's a feature rich + full-screen text mode application that allows you to copy, move and delete + files and whole directory trees, search for files and run commands in the + subshell. endef +define Package/mc/config + source $(SOURCE)/Config.in +endef + +mc-conf-args-$(CONFIG_MC_DISABLE_EDITOR) += --without-edit +mc-conf-args-$(CONFIG_MC_DISABLE_SUBSHELL) += --without-subshell + CONFIGURE_ARGS += \ --enable-utf8 \ --disable-vfs \ --with-screen=ncurses \ - --without-edit \ --without-gpm-mouse \ - --without-subshell \ --without-x \ - ac_cv_search_addwstr=no + ac_cv_search_addwstr=no \ + $(mc-conf-args-y) AM_HOST=$(firstword $(wildcard $(STAGING_DIR_HOST)/share/automake-*)) @@ -61,6 +68,11 @@ endef define Package/mc/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin/ + ln -sf mc $(1)/usr/bin/mcview + ln -sf mc $(1)/usr/bin/mcdiff +ifneq ($(CONFIG_MC_DISABLE_EDITOR),y) + ln -sf mc $(1)/usr/bin/mcedit +endif $(INSTALL_DIR) $(1)/etc/mc $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.menu $(1)/etc/mc $(INSTALL_DIR) $(1)/etc/mc/skins @@ -69,8 +81,8 @@ define Package/mc/install endef define Package/mc/conffiles -/etc/mc/mc.menu -/etc/mc/skins/default.ini + /etc/mc/mc.menu + /etc/mc/skins/default.ini endef $(eval $(call BuildPackage,mc)) -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/5] [packages] rsync: cosmetic changes after package split
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 -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/5] [packages] smartmontools: split daemon into separate package
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- utils/smartmontools/Makefile | 17 ++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile index 9220aea..606d601 100644 --- a/utils/smartmontools/Makefile +++ b/utils/smartmontools/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org +# +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -25,6 +25,13 @@ define Package/smartmontools URL:=http://smartmontools.sourceforge.net/ endef +define Package/smartmontools-daemon + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+rsync + TITLE:=S.M.A.R.T Monitoring Daemon +endef + define Package/smartmontools/description smartmontools contains utility programs (smartctl, smartd) to control/monitor storage systems using the Self-Monitoring, Analysis @@ -55,11 +62,15 @@ endef define Package/smartmontools/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/smartctl $(1)/usr/sbin/ +endef + +define Package/smartmontools-daemon/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/smartd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) ./files/smartd.conf $(1)/etc + $(INSTALL_DATA) ./files/smartd.conf $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/smartd.init $(1)/etc/init.d/smartd endef $(eval $(call BuildPackage,smartmontools)) +$(eval $(call BuildPackage,smartmontools-daemon)) -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/5] [feeds/packages] updates for several packages
From: Eugene San (eugenesan) eugene...@gmail.com Next patches provide updates for several packages in feeds/packages: [packages] mc: update version to 4.7.5.3 with addition of mcview and mcdiff [packages] motion: update version to fix build with Lunux 2.6.38+ [packages] rsync: cosmetic changes after package split [packages] smartmontools: split daemon into separate package [packages] samba3: update version to 3.0.47 Thanks to Maarten Bezemer m.m.beze...@utwente.nl multimedia/motion/Makefile|4 +- net/rsync/Makefile| 26 +- net/samba3/Config.in | 19 + net/samba3/Makefile | 134 +- net/samba3/files/config-lfs.h | 56 - net/samba3/files/nmbd.init| 14 + net/samba3/files/samba.config | 12 +- net/samba3/files/samba.init | 72 - net/samba3/files/smb.conf.template|9 +- net/samba3/files/smbd.init| 70 + net/samba3/patches/100-avm.patch | 7182 +++-- net/samba3/patches/110-compile_fixes.patch| 87 +- net/samba3/patches/120-owrt_paths.patch | 82 +- net/samba3/patches/130-owrt_smbpasswd.patch | 28 +- net/samba3/patches/140-no_mmap.patch | 27 - net/samba3/patches/170-no_rpc.patch | 49 +- net/samba3/patches/180-fix_duplicate_define.patch | 12 - net/samba3/patches/200-fix-configure.patch| 14 + net/samba3/patches/500-remove_avm_smaller.patch | 78 + net/samba3/patches/510-remove-printing.patch | 49 + utils/mc/Config.in| 20 + utils/mc/Makefile | 54 +- utils/smartmontools/Makefile | 17 +- 23 files changed, 1330 insertions(+), 6785 deletions(-) delete mode 100644 net/samba3/files/config-lfs.h create mode 100644 net/samba3/files/nmbd.init delete mode 100755 net/samba3/files/samba.init create mode 100644 net/samba3/files/smbd.init create mode 100644 net/samba3/patches/200-fix-configure.patch create mode 100644 net/samba3/patches/500-remove_avm_smaller.patch create mode 100644 net/samba3/patches/510-remove-printing.patch create mode 100644 utils/mc/Config.in -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/5] [packages] motion: update version to fix build with Lunux 2.6.38+
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- multimedia/motion/Makefile |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 867333f..2ddc460 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=motion -PKG_VERSION:=3.2.11.1 +PKG_VERSION:=20110826-051001 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \ @SF/motion -PKG_MD5SUM:=4e729f129d8f9b9abaed5121c3cd0037 +PKG_MD5SUM:=e703fce57ae2215cb05f25e3027f5818 PKG_INSTALL:=1 -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/6] target: allow separate kernel configuration for profiles
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- include/target.mk | 14 -- 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/target.mk b/include/target.mk index af32309..135561d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -111,18 +111,20 @@ GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),$(dir)) -__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default -__config_list = $(firstword $(wildcard $(call __config_name_list,$(1 +__config_name_list = $(1)/config-$(KERNEL_PATCHVER)$(2) $(1)/config-default$(2) +__config_list = $(firstword $(wildcard $(call __config_name_list,$(1),$(2 find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list))) -GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR)) -LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR)) +GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR),) +LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR),) ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR)) - LINUX_SUBTARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR)) + LINUX_SUBTARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR),) endif +LINUX_PROFILE_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR),-$(PROFILE)) + # config file list used for compiling -LINUX_KCONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(TOPDIR)/env/kernel-config) +LINUX_KCONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(LINUX_PROFILE_CONFIG) $(TOPDIR)/env/kernel-config) # default config list for reconfiguring # defaults to subtarget if subtarget exists and target does not -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/6] kernel: allow parallel build of image and modules
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- Config.in | 13 + include/kernel-defaults.mk |6 -- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index f36221c..f4dbf80 100644 --- a/Config.in +++ b/Config.in @@ -307,6 +307,19 @@ menu Global build settings If you say Y, toolchain build might break. Before reporting build bugs, set this to N and re-run the build. + config KERNEL_PARALLEL + bool + prompt Parallelize the kernel build (May break build) + depends on PKG_BUILD_PARALLEL + default n + help + Build the kernel with parallel make jobs. + This speeds up the kernel build on SMP machines, but may + break the build for certain toolchain versions. + + If you say Y, kernel build might break. + Before reporting build bugs, set this to N and re-run the build. + comment Stripping options choice diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 5fd27ae..b637577 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -5,6 +5,8 @@ # See /LICENSE for more information. # +KERNEL_JOBS?=$(if $(CONFIG_KERNEL_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)) + KERNEL_MAKEOPTS := -C $(LINUX_DIR) \ CROSS_COMPILE=$(KERNEL_CROSS) \ ARCH=$(LINUX_KARCH) \ @@ -93,14 +95,14 @@ endef define Kernel/CompileModules/Default rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map - +$(MAKE) $(KERNEL_MAKEOPTS) modules + +$(MAKE) $(KERNEL_MAKEOPTS) $(KERNEL_JOBS) modules endef OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id define Kernel/CompileImage/Default $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),,rm -f $(TARGET_DIR)/init) - +$(MAKE) $(KERNEL_MAKEOPTS) $(KERNELNAME) + +$(MAKE) $(KERNEL_MAKEOPTS) $(KERNEL_JOBS) $(KERNELNAME) $(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL) $(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.elf endef -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/6] include/image.mk: allow paralell squashfs image compression
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- include/image.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/image.mk b/include/image.mk index 65d79f4..824f6d5 100644 --- a/include/image.mk +++ b/include/image.mk @@ -87,7 +87,7 @@ else ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),) define Image/mkfs/squashfs @mkdir -p $(TARGET_DIR)/overlay - $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) -processors 1 + $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) -processors $(CONFIG_PKG_BUILD_JOBS) $(call Image/Build,squashfs) endef endif -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/6] settle git and gitsvn support
From: Eugene San (eugenesan) eugene...@gmail.com
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com
---
docs/build.tex | 61 +++-
feeds.conf.default |4 +++
scripts/feeds |2 +-
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/docs/build.tex b/docs/build.tex
index 6e1539a..910ad0a 100644
--- a/docs/build.tex
+++ b/docs/build.tex
@@ -41,12 +41,71 @@ So let's take a look at OpenWrt and see how this all works.
\subsubsection{Download OpenWrt}
-OpenWrt can be downloaded via subversion using the following command:
+OpenWrt can be downloaded via subversion and git.
+
+For downloading using pure subversion (svn) use the following command:
\begin{Verbatim}
$ svn checkout svn://svn.openwrt.org/openwrt/trunk openwrt-trunk
\end{Verbatim}
+To install additional components (feeds) use the following command:
+
+\begin{Verbatim}
+$ make package/symlinks
+\end{Verbatim}
+
+In future to update main tree and feeds use the following commands:
+\begin{Verbatim}
+$ svn up
+$ ./scripts/feeds update
+\end{Verbatim}
+
+For downloading using pure git use the following command:
+
+\begin{Verbatim}
+$ git clone git://nbd.name/openwrt.git openwrt-trunk
+\end{Verbatim}
+
+In case you are planning to use git also for additional components (feeds and
luci),
+please create copy of feeds.conf.default as feeds.conf in which only lines
starting
+with src-git are uncommented.
+
+To install additional components (feeds) use the following command:
+
+\begin{Verbatim}
+$ make package/symlinks
+\end{Verbatim}
+
+In future to update main tree and feeds use the following commands:
+\begin{Verbatim}
+$ git fetch origin
+$ git rebase origin/master
+$ ./scripts/feeds update
+\end{Verbatim}
+
+For downloading using git (while upstream repository is tracked as SVN) use
the following command:
+
+\begin{Verbatim}
+$ git svn clone svn://svn.openwrt.org/openwrt/trunk openwrt-trunk
+\end{Verbatim}
+
+In case you are planning to use gitsvn also for additional components (feeds
and luci),
+please create copy of feeds.conf.default as feeds.conf in which only lines
starting
+with src-gitsvn are uncommented.
+To install additional components (feeds) use the following command:
+
+\begin{Verbatim}
+$ make package/symlinks
+\end{Verbatim}
+
+In future to update main tree and feeds use the following commands:
+\begin{Verbatim}
+$ git svn fetch
+$ git svn rebase
+$ ./scripts/feeds update
+\end{Verbatim}
+
Additionally, there is a trac interface on
\href{https://dev.openwrt.org/}{https://dev.openwrt.org/}
which can be used to monitor svn commits and browse the source repository.
diff --git a/feeds.conf.default b/feeds.conf.default
index c4ac535..3281049 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -7,3 +7,7 @@ src-svn luci
http://svn.luci.subsignal.org/luci/trunk/contrib/package
#src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
#src-svn lxde svn://svn.openwrt.org/openwrt/feeds/lxde
#src-link custom /usr/src/openwrt/custom-feed
+#src-git packages git://nbd.name/packages.git
+#src-git luci git://nbd.name/luci.git
+#src-gitsvn packages svn://svn.openwrt.org/openwrt/packages
+#src-gitsvn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
diff --git a/scripts/feeds b/scripts/feeds
index 6121a62..1b6633b 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -115,7 +115,7 @@ my %update_method = (
'src-git' = {
'init' = git clone --depth 1 '%s' '%s',
'init_branch' = git clone --depth 1 --branch '%s' '%s'
'%s',
- 'update'= git pull,
+ 'update'= git fetch; git rebase,
'controldir'= .git},
'src-gitsvn' = {
'init' = git svn clone -r HEAD '%s' '%s',
--
1.7.6
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 6/6] [package] mac80211: fix mwl8k firmware treatment at build and run times
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
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;
+
--
1.7.6
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/6] several fixes and enhancements
From: Eugene San (eugenesan) eugene...@gmail.com Next patches provide several fixes and enhancements listed below: target: allow separate kernel configuration for profiles kernel: add some missing usb modules kernel: allow parallel build of image and modules include/image.mk: allow paralell squashfs image compression settle git and gitsvn support [package] mac80211: fix mwl8k firmware treatment at build and run times Config.in | 13 docs/build.tex | 61 +++- feeds.conf.default |4 + include/image.mk |2 +- include/kernel-defaults.mk |6 +- include/target.mk | 14 +++-- package/mac80211/Makefile |4 +- .../701-mwl8k-firmware-reload-workaround.patch | 29 + scripts/feeds |2 +- target/linux/generic/config-3.0|6 +- 10 files changed, 125 insertions(+), 16 deletions(-) create mode 100644 package/mac80211/patches/701-mwl8k-firmware-reload-workaround.patch -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/6] kernel: add some missing usb modules
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(-) 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 -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/5] [orion] tune default network config
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/orion/base-files/etc/config/network | 39 -- 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/target/linux/orion/base-files/etc/config/network b/target/linux/orion/base-files/etc/config/network index e7fdecd..24d7a39 100644 --- a/target/linux/orion/base-files/etc/config/network +++ b/target/linux/orion/base-files/etc/config/network @@ -1,22 +1,25 @@ -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2011 OpenWrt.org -config interface loopback -option ifname lo -option protostatic -option ipaddr 127.0.0.1 -option netmask 255.0.0.0 +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' 'eth0' + option 'ifname' 'eth0' + option 'proto' 'none' -config interface wan - option ifname wan - option protodhcp - option hostname openwrt +config 'interface' 'wan' + option 'hostname' 'OpenWrt' + option 'proto' 'dhcp' + option 'type' 'bridge' + option 'ifname' 'wan eth1 eth2' -config interface lan -option ifname lan1 lan2 lan3 lan4 -option type bridge -option protostatic -option ipaddr 192.168.1.1 -option netmask 255.255.255.0 +config 'interface' 'lan' + option 'type' 'bridge' + option 'proto' 'static' + option 'netmask' '255.255.255.0' + option 'nat' '1' + option 'ipaddr' '192.168.2.1' + option 'ifname' 'lan1 lan2 lan3 lan4' -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/5] [orion] add rd88f5181l-ge and rd88f5181l-fxo devices
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/orion/README | 30 +++ target/linux/orion/image/generic.mk| 38 +-- target/linux/orion/image/harddisk.mk |6 ++- .../patches/102-rd88f5181l-ge_partition_map.patch | 33 + .../patches/103-rd88f5181l-fxo_partition_map.patch | 33 + .../patches/104-rd88f5181l-force_cardbus.patch | 27 ++ 6 files changed, 161 insertions(+), 6 deletions(-) create mode 100644 target/linux/orion/README create mode 100644 target/linux/orion/patches/102-rd88f5181l-ge_partition_map.patch create mode 100644 target/linux/orion/patches/103-rd88f5181l-fxo_partition_map.patch create mode 100644 target/linux/orion/patches/104-rd88f5181l-force_cardbus.patch diff --git a/target/linux/orion/README b/target/linux/orion/README new file mode 100644 index 000..7ea1147 --- /dev/null +++ b/target/linux/orion/README @@ -0,0 +1,30 @@ +This orion target is intended to be used with devices based on Marvell Orion 5181 ARM-compatible CPU (aka Feroceon). + +Among supported devices are: + * WRT350N v2 + * WNR854T + * RD88F5181L_GE + * RD88F5181L_FXO + * DT2 + +Marvell RD88F5181L Reference Boards currently utilize OpenWRT native squashfs+jffs2overlay scheme. +Currently only manual install/upgrade procedure tested. +To perform manual/initial installation you will need a TFTP server and board specific image, +for example: openwrt-rd88f5181l_fxo-squashfs.img. + +Follow below steps to install firmware in to device's NOR flash. +(Remember to use apropriate network parameters) + +1. Prepare uBoot environment (In uBoot): + resetenv; reset + setenv ipaddr 192.168.2.200; setenv serverip 192.168.2.100 + setenv loadaddr 0x40; setenv console 'console=ttyS0,115200 panic=30' + setenv bootargs; setenv bootargs_root 'root=/dev/mtd1 ro' + setenv image_name openwrt-rd88f5181l_fxo-squashfs.img + setenv update 'tftpboot $(loadaddr) $(image_name); erase 0xFF80 0xFFEF; cp.b $(loadaddr) 0xFF80 0x6F' + setenv bootcmd 'setenv bootargs $(console) $(bootargs_root); bootm 0xFF80' + save + +2. Update firmare (In uBoot): + run update + diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk index c3bd601..670bed5 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,20 @@ 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 + # RD88F5181L_FXO: mach id 1818 (0x71a) + echo -en \x07\x1c\xa0\xe3\x1a\x10\x81\xe3 $(KDIR)/rd88f5181l_fxo-zImage + cat $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/rd88f5181l_fxo-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_fxo-zImage $(KDIR)/rd88f5181l_fxo-uImage + cp $(KDIR)/rd88f5181l_fxo-uImage $(BIN_DIR)/openwrt-rd88f5181l_fxo-uImage endef define Image/Build/Netgear @@ -40,6 +56,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-$(2)-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 +95,20 @@ define Image/Build/Linksys endef define Image/Build -$(call Image/Build/$(1),$(1)) -$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1)) + $(call Image/Build/$(1),$(1)) + $(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1)) + $(call
[OpenWrt-Devel] [PATCH 0/5] [orion] few cosmetic changes and new Marvell reference devices
From: Eugene San (eugenesan) eugene...@gmail.com Next patches provide few cosmetic changes new Marvell reference devices for orion target: [orion] move dt2 modifications to single patch [orion] use architecture default compliaton flags [orion] referesh kernel config for linux 3.0.3 [orion] tune default network config [orion] add rd88f5181l-ge and rd88f5181l-fxo devices target/linux/orion/Makefile|3 +- target/linux/orion/README | 30 ++ target/linux/orion/base-files/etc/config/network | 39 +- target/linux/orion/config-default | 253 -- .../orion/files/arch/arm/mach-orion5x/dt2-common.h | 82 --- .../orion/files/arch/arm/mach-orion5x/dt2-setup.c | 446 target/linux/orion/harddisk/config-default |1 - target/linux/orion/image/generic.mk| 38 ++- target/linux/orion/image/harddisk.mk |6 +- .../patches/102-rd88f5181l-ge_partition_map.patch | 33 ++ .../patches/103-rd88f5181l-fxo_partition_map.patch | 33 ++ .../patches/104-rd88f5181l-force_cardbus.patch | 27 + .../orion/patches/200-dt2_board_support.patch | 542 +++- 13 files changed, 800 insertions(+), 733 deletions(-) create mode 100644 target/linux/orion/README delete mode 100644 target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h delete mode 100644 target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c create mode 100644 target/linux/orion/patches/102-rd88f5181l-ge_partition_map.patch create mode 100644 target/linux/orion/patches/103-rd88f5181l-fxo_partition_map.patch create mode 100644 target/linux/orion/patches/104-rd88f5181l-force_cardbus.patch -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/5] [orion] move dt2 modifications to single patch
From: Eugene San (eugenesan) eugene...@gmail.com
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com
---
.../orion/files/arch/arm/mach-orion5x/dt2-common.h | 82 ---
.../orion/files/arch/arm/mach-orion5x/dt2-setup.c | 446
.../orion/patches/200-dt2_board_support.patch | 542 +++-
3 files changed, 527 insertions(+), 543 deletions(-)
delete mode 100644 target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
delete mode 100644 target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
diff --git a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
deleted file mode 100644
index a54e188..000
--- a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef __INC_DT2_COMMON_H
-#define __INC_DT2_COMMON_H
-
-#define ATAG_MV_UBOOT 0x41000403
-
-struct tag_mv_uboot {
- u32 uboot_version;
- u32 tclk;
- u32 sysclk;
- u32 isUsbHost;
- u32 overEthAddr;
- u8 dt2_eeprom[256];
-};
-
-#define DT2_EEPROM_ADDR0x50
-#define DT2_EEPROM_OFFSET 0
-#define DT2_EEPROM_LENGTH 256
-
-#define DT2_SERIAL_NUMBER_DEFAULT run on default\0
-#define DT2_REVISION_DEFAULT_INIT 0xFF
-#define DT2_CONFIG_FLAGS_DEFAULT 0x00
-
-#define _PACKED_ __attribute__((packed))
-
-struct DT2_EEPROM_SD_CONFIG {
- unsigned intram_1;
- unsigned intram_2;
- unsigned intram_3;
- unsigned intram_4;
- unsigned char ram_5;
- unsigned char ram_6;
- unsigned short ram_7;
- unsigned intmagic_id;
- } _PACKED_; // 24 Bytes in total
-
-struct DT2_EEPROM_FC_CONFIG {
- unsigned char rtc_sts_mask;
- unsigned char rtc_sts_init;
- unsigned char rtc_int_mask;
- unsigned char rtc_int_init;
- unsigned char rtc_atrim_init;
- unsigned char rtc_dtrim_init;
- unsigned char dummy1;
- unsigned char dummy2;
- unsigned char dt2_config_flags; /* 0x80 to load rtc_values to
RTC */
- unsigned char dt2_revision; /* upper nibble is HW, lower
nibble is FW */
- unsigned char dt2_serial_number[16]; /* Serial number of DT-2 */
- } _PACKED_; // 26 Bytes in total
-
-#define CFG_LOAD_RTC_VALUES0x80
-
-struct DT2_EEPROM_GW_CONFIG {
- unsigned intdummy1;
- unsigned intdummy2;
- unsigned intdummy3;
- unsigned char dummy4;
- unsigned char tos_video_val1;
- unsigned char tos_video_val2;
- unsigned char tos_voip_val;
- unsigned char qos_igmp_cfg;
- unsigned char num_of_ifs;
- unsigned short vlan_ports_if[3];
- unsigned char mac_addr[3][6];
- } _PACKED_; // 42 Bytes in total
-
-#define _SIZE_OF_ALL_STRUCTS_ (sizeof(struct DT2_EEPROM_SD_CONFIG) +
sizeof(struct DT2_EEPROM_FC_CONFIG) + sizeof(struct DT2_EEPROM_GW_CONFIG))
-
-// MV = EEPROM - SD - FC - GW - CRC
-struct DT2_EEPROM_MV_CONFIG {
- unsigned int reg_addr[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ -
sizeof(unsigned int)) / (sizeof(unsigned int) * 2)];
- unsigned int reg_data[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ -
sizeof(unsigned int)) / (sizeof(unsigned int) * 2)];
- } _PACKED_;
-
-struct DT2_EEPROM_STRUCT {
- struct DT2_EEPROM_MV_CONFIG mv;
- struct DT2_EEPROM_SD_CONFIG sd;
- struct DT2_EEPROM_FC_CONFIG fc;
- struct DT2_EEPROM_GW_CONFIG gw;
- unsigned intcrc;
- } _PACKED_;
-
-#endif
diff --git a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
deleted file mode 100644
index a3d9c82..000
--- a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * arch/arm/mach-orion5x/dt2-setup.c
- *
- * Freecom DataTank Gateway Setup
- *
- * Copyright (C) 2009 Zintis Petersons zintis.peters...@abcsolutions.lv
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed as is without any
- * warranty of any kind, whether express or implied.
- */
-
-#include linux/kernel.h
-#include linux/init.h
-#include linux/platform_device.h
-#include linux/pci.h
-#include linux/irq.h
-#include linux/mtd/physmap.h
-#include linux/mv643xx_eth.h
-#include linux/ethtool.h
-#include linux/if_ether.h
-#include net/dsa.h
-#include linux/ata_platform.h
-#include linux/i2c.h
-#include linux/reboot.h
-#include linux/interrupt.h
-#include asm/mach-types.h
-#include asm/gpio.h
-#include asm/leds.h
-#include asm/mach/arch.h
-#include asm/mach/pci.h
-#include mach/orion5x.h
-#include common.h
-#include mpp.h
-
-/*
- * DT2 local
-
[OpenWrt-Devel] [PATCH 2/5] [orion] use architecture default compliaton flags
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/orion/Makefile |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index 54e0c37..3952307 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -10,7 +10,6 @@ ARCH:=arm BOARD:=orion BOARDNAME:=Marvell Orion SUBTARGETS:=generic harddisk -CFLAGS=-Os -pipe -march=armv5te -mtune=xscale -fno-caller-saves MAINTAINER:=Imre Kaloz ka...@openwrt.org LINUX_VERSION:=3.0.3 @@ -19,6 +18,6 @@ include $(INCLUDE_DIR)/target.mk KERNELNAME:=uImage -DEFAULT_PACKAGES += kmod-ath9k kmod-crypto-mv-cesa wpad-mini +DEFAULT_PACKAGES += kmod-ath9k kmod-mwl8k kmod-crypto-mv-cesa wpad-mini $(eval $(call BuildTarget)) -- 1.7.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/5] [orion] referesh kernel config for linux 3.0.3
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/orion/config-default | 253 ++-- target/linux/orion/harddisk/config-default |1 - 2 files changed, 90 insertions(+), 164 deletions(-) diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default index c78a397..896fa8d 100644 --- a/target/linux/orion/config-default +++ b/target/linux/orion/config-default @@ -1,64 +1,58 @@ CONFIG_ALIGNMENT_TRAP=y -# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_ARCH_ORION5X=y -CONFIG_ARCH_SUPPORTS_AOUT=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ARM_THUMB is not set +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_ARM=y +CONFIG_ARM_L1_CACHE_SHIFT=5 +# CONFIG_ARM_THUMB is not set # CONFIG_ARPD is not set -# CONFIG_ARTHUR is not set -CONFIG_ATA=m -# CONFIG_ATMEL is not set -# CONFIG_ATM is not set -# CONFIG_BINFMT_AOUT is not set -CONFIG_BITREVERSE=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BONDING is not set -CONFIG_BOUNCE=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_CIFS_STATS is not set -CONFIG_CLASSIC_RCU=y +CONFIG_BCMA_POSSIBLE=y +# CONFIG_BRCMUTIL is not set +CONFIG_CLKSRC_MMIO=y CONFIG_CMDLINE=root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 -CONFIG_CMDLINE_FORCE=y +CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_CPU_32v5=y -CONFIG_CPU_32=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_FEROCEON=y -CONFIG_CPU_CP15_MMU=y CONFIG_CPU_CP15=y -# CONFIG_CPU_DCACHE_DISABLE is not set -CONFIG_CPU_FEROCEON_OLD_ID=y +CONFIG_CPU_CP15_MMU=y CONFIG_CPU_FEROCEON=y +# CONFIG_CPU_FEROCEON_OLD_ID is not set # CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_NOIFAR=y -CONFIG_CPU_TLB_V4WBI=y -# CONFIG_CRC_CCITT is not set +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_TLB_FEROCEON=y +CONFIG_CPU_USE_DOMAINS=y +CONFIG_CRC16=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_DEV_MV_CESA=y +CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_USER is not set -CONFIG_DEVPORT=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 -# CONFIG_DM9000 is not set CONFIG_DNOTIFY=y # CONFIG_DSCC4 is not set -# CONFIG_E1000E_ENABLED is not set -# CONFIG_E100 is not set +CONFIG_EFI_PARTITION=y # CONFIG_FARSYNC is not set -# CONFIG_FPE_FASTFPE is not set -# CONFIG_FPE_NWFPE is not set CONFIG_FRAME_POINTER=y -CONFIG_FS_POSIX_ACL=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HAMRADIO is not set @@ -66,62 +60,47 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_HAVE_AOUT=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_IDE=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_IRQ_WORK=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_OPROFILE=y -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC=m -CONFIG_HDLC_PPP=m -# CONFIG_HDLC_RAW_ETH is not set -CONFIG_HDLC_RAW=m -# CONFIG_HERMES is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_SCHED_CLOCK=y +CONFIG_HAVE_SPARSE_IRQ=y CONFIG_HWMON=y +# CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_HW_RANDOM=y +CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y -CONFIG_I2C=y -# CONFIG_IDE is not set +# CONFIG_I2C_PXA_PCI is not set +CONFIG_INET_LRO=y CONFIG_INITRAMFS_SOURCE= -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_MATCH_EUI64 is not set -# CONFIG_IP6_NF_MATCH_FRAG is not set -# CONFIG_IP6_NF_MATCH_HL is not set -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_MATCH_OPTS is not set -# CONFIG_IP6_NF_MATCH_RT is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP_MROUTE=y -# CONFIG_IP_NF_ARPTABLES is not set -#
[OpenWrt-Devel] [PATCH] [kirkwood] update to kernel 3.0.3 with addition of rd88f6281
From: Eugene San (eugenesan) eugene...@gmail.com Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com --- target/linux/kirkwood/Makefile |4 +- target/linux/kirkwood/README | 37 ++ .../base-files-rd88f6281/etc/config/network| 25 ++ target/linux/kirkwood/base-files/sbin/install2ubi | 14 + target/linux/kirkwood/config-default | 107 +-- target/linux/kirkwood/image/Makefile |8 +- .../patches/001-openwrt_partition_map.patch| 11 + .../patches/300-mv88f6281_rev_z0_tclock.patch | 11 + ...ardware-bridging-support-for-DSA-switches.patch | 381 target/linux/kirkwood/profiles/100-Sheevaplug.mk |6 +- target/linux/kirkwood/profiles/200-Dockstar.mk |6 +- target/linux/kirkwood/profiles/300-Iconnect.mk |6 +- target/linux/kirkwood/profiles/400-rd88f6281.mk| 17 + 13 files changed, 596 insertions(+), 37 deletions(-) create mode 100644 target/linux/kirkwood/README create mode 100644 target/linux/kirkwood/base-files-rd88f6281/etc/config/network create mode 100755 target/linux/kirkwood/base-files/sbin/install2ubi create mode 100644 target/linux/kirkwood/patches/300-mv88f6281_rev_z0_tclock.patch create mode 100644 target/linux/kirkwood/patches/400-hardware-bridging-support-for-DSA-switches.patch create mode 100644 target/linux/kirkwood/profiles/400-rd88f6281.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 06b6fc7..09e66c4 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -9,10 +9,10 @@ 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.6 +LINUX_VERSION:=3.0.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/README b/target/linux/kirkwood/README new file mode 100644 index 000..ef6d8e1 --- /dev/null +++ b/target/linux/kirkwood/README @@ -0,0 +1,37 @@ +This Kirkwood target is intended to be used with devices based on Marvell Kirkwood 6281/2 ARM-compatible CPU (aka Feroceon). + +Among supported devices are: + * Globalscale Sheevaplug + * Seagate Dockstar + * Iomega iConnect Wireless + * Marvell RD88F6281 Reference Boards + +Marvell RD88F6281 Reference Boards currently utilize UBIFS on NAND scheme for rootfs +and uImage is stored in raw NAND area. +Currently only manual install/upgrade procedure tested. +To perform manual/initial installation you will need a TFTP server and board specific images, +for example: openwrt-kirkwood-uImage and openwrt-kirkwood-rd88f6281-squashfs.uimg. + +Follow below steps to install firmware in to device's NAND flash. +(Remember to use apropriate network parameters) + +1. Prepare uBoot environment (In uBoot): + resetenv; reset + setenv mainlineLinux yes; save; reset + setenv ipaddr 192.168.2.200; setenv serverip 192.168.1.2 + setenv loadaddr 0x200; setenv console 'console=ttyS0,115200 panic=30' + setenv bootargs_root 'ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw' + setenv image_name openwrt-kirkwood-uImage + setenv root_name openwrt-kirkwood-rd88f6281-squashfs.uimg + setenv update_image 'tftpboot $(loadaddr) $(image_name); nand erase 0x10 0x20; nand write $(loadaddr) 0x10 0x20' + setenv load_firmware 'tftpboot $(loadaddr) $(root_name); setenv bootargs $(console) root=/dev/ram0 rw; bootm $(loadaddr)' + setenv bootcmd 'setenv bootargs $(console) $(bootargs_root); nand read $(loadaddr) 0x10 0x20; bootm $(loadaddr)' + save + +2. Load initial firmare (In uBoot): + run update_image + run load_firmware + +3. Install firmware into NAND (In Linux): + $ install2ubifs + $ reboot diff --git a/target/linux/kirkwood/base-files-rd88f6281/etc/config/network b/target/linux/kirkwood/base-files-rd88f6281/etc/config/network new file mode 100644 index 000..24d7a39 --- /dev/null +++ b/target/linux/kirkwood/base-files-rd88f6281/etc/config/network @@ -0,0 +1,25 @@ +# Copyright (C) 2011 OpenWrt.org + +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' + option 'proto' 'none' + +config 'interface' 'wan' + option 'hostname' 'OpenWrt' + option 'proto' 'dhcp' + option 'type' 'bridge' + option 'ifname' 'wan eth1 eth2' + +config 'interface' 'lan' + option 'type' 'bridge' + option 'proto' 'static' + option 'netmask' '255.255.255.0' + option 'nat' '1' + option 'ipaddr' '192.168.2.1' + option 'ifname' 'lan1 lan2 lan3 lan4' diff --git a/target/linux/kirkwood/base-files/sbin/install2ubi
Re: [OpenWrt-Devel] [PATCH 1/5] [orion] move dt2 modifications to single patch
Please note that I have sent dt2 support update patch.
-Original Message-
From: openwrt-devel-boun...@lists.openwrt.org
[mailto:openwrt-devel-boun...@lists.openwrt.org] On Behalf Of
eugene...@gmail.com
Sent: Monday, August 29, 2011 11:15 PM
To: openwrt-devel@lists.openwrt.org
Subject: [OpenWrt-Devel] [PATCH 1/5] [orion] move dt2 modifications to
single patch
From: Eugene San (eugenesan) eugene...@gmail.com
Signed-off-by: Eugene San (eugenesan) eugene...@gmail.com
---
.../orion/files/arch/arm/mach-orion5x/dt2-common.h | 82 ---
.../orion/files/arch/arm/mach-orion5x/dt2-setup.c | 446
.../orion/patches/200-dt2_board_support.patch | 542
+++-
3 files changed, 527 insertions(+), 543 deletions(-) delete mode 100644
target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
delete mode 100644
target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
diff --git a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
deleted file mode 100644
index a54e188..000
--- a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef __INC_DT2_COMMON_H
-#define __INC_DT2_COMMON_H
-
-#define ATAG_MV_UBOOT 0x41000403
-
-struct tag_mv_uboot {
- u32 uboot_version;
- u32 tclk;
- u32 sysclk;
- u32 isUsbHost;
- u32 overEthAddr;
- u8 dt2_eeprom[256];
-};
-
-#define DT2_EEPROM_ADDR0x50
-#define DT2_EEPROM_OFFSET 0
-#define DT2_EEPROM_LENGTH 256
-
-#define DT2_SERIAL_NUMBER_DEFAULT run on default\0
-#define DT2_REVISION_DEFAULT_INIT 0xFF
-#define DT2_CONFIG_FLAGS_DEFAULT 0x00
-
-#define _PACKED_ __attribute__((packed))
-
-struct DT2_EEPROM_SD_CONFIG {
- unsigned intram_1;
- unsigned intram_2;
- unsigned intram_3;
- unsigned intram_4;
- unsigned char ram_5;
- unsigned char ram_6;
- unsigned short ram_7;
- unsigned intmagic_id;
- } _PACKED_; // 24 Bytes in total
-
-struct DT2_EEPROM_FC_CONFIG {
- unsigned char rtc_sts_mask;
- unsigned char rtc_sts_init;
- unsigned char rtc_int_mask;
- unsigned char rtc_int_init;
- unsigned char rtc_atrim_init;
- unsigned char rtc_dtrim_init;
- unsigned char dummy1;
- unsigned char dummy2;
- unsigned char dt2_config_flags; /* 0x80 to load rtc_values
to RTC */
- unsigned char dt2_revision; /* upper nibble is HW, lower
nibble is FW */
- unsigned char dt2_serial_number[16]; /* Serial number of DT-2 */
- } _PACKED_; // 26 Bytes in total
-
-#define CFG_LOAD_RTC_VALUES0x80
-
-struct DT2_EEPROM_GW_CONFIG {
- unsigned intdummy1;
- unsigned intdummy2;
- unsigned intdummy3;
- unsigned char dummy4;
- unsigned char tos_video_val1;
- unsigned char tos_video_val2;
- unsigned char tos_voip_val;
- unsigned char qos_igmp_cfg;
- unsigned char num_of_ifs;
- unsigned short vlan_ports_if[3];
- unsigned char mac_addr[3][6];
- } _PACKED_; // 42 Bytes in total
-
-#define _SIZE_OF_ALL_STRUCTS_ (sizeof(struct DT2_EEPROM_SD_CONFIG) +
sizeof(struct DT2_EEPROM_FC_CONFIG) + sizeof(struct DT2_EEPROM_GW_CONFIG))
-
-// MV = EEPROM - SD - FC - GW - CRC
-struct DT2_EEPROM_MV_CONFIG {
- unsigned int reg_addr[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ -
sizeof(unsigned int)) / (sizeof(unsigned int) * 2)];
- unsigned int reg_data[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ -
sizeof(unsigned int)) / (sizeof(unsigned int) * 2)];
- } _PACKED_;
-
-struct DT2_EEPROM_STRUCT {
- struct DT2_EEPROM_MV_CONFIG mv;
- struct DT2_EEPROM_SD_CONFIG sd;
- struct DT2_EEPROM_FC_CONFIG fc;
- struct DT2_EEPROM_GW_CONFIG gw;
- unsigned intcrc;
- } _PACKED_;
-
-#endif
diff --git a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
deleted file mode 100644
index a3d9c82..000
--- a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * arch/arm/mach-orion5x/dt2-setup.c
- *
- * Freecom DataTank Gateway Setup
- *
- * Copyright (C) 2009 Zintis Petersons zintis.peters...@abcsolutions.lv
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed as is without any
- * warranty of any kind, whether express or implied.
- */
-
-#include linux/kernel.h
-#include linux/init.h
-#include linux/platform_device.h
-#include linux/pci.h
-#include linux/irq.h
-#include linux/mtd/physmap.h
-#include linux/mv643xx_eth.h
-#include linux/ethtool.h
-#include linux/if_ether.h
-#include net/dsa.h
-#include linux/ata_platform.h
-#include
Re: [OpenWrt-Devel] PATCH: Buffalo WZR-HP-G300NH2 support
On 08/16/2011 02:28 PM, Felix Fietkau wrote:
On 2011-08-16 11:51 AM, Mark Deneen wrote:
Please let me know if there is anything which I have overlooked.
Looks mostly fine to me on a first quick look (aside from some whitespace vs tab
issues).
Before we accept this, I want to split out the mtd concat code from
WZR-HP-AG300H, so that the mach file for this device can share it without adding
more unnecessary code duplication.
I have an immediate need to support v1 and v2 hardware in one image. As
products they are essentially identical, as well as in user space in Linux,
and deploying a image which is all but identical to support 2 machines makes
no sense to me.
This needs more work and is only for review, however the attached patch
essentially removes the 300NH2 as its own machine type in the kernel and most
of OpenWrt. The one exception here is that the network configuration is a bit
different, so we need to detect the different SoC and use as appropriate.
That's the bit I haven't done yet, since I won't have an actual v2 until
tomorrow.
This *doesn't* include kernel .config changes, since mine has a bunch
of unrelated options turned on. The previous patch of that should be
correct.
This simply merges the machine support between the 300NH and 300NH2, so I can't
take any credit except for cut and paste ;-)
Index: target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
===
--- target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig (revision 28123)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig (working copy)
@@ -145,12 +145,15 @@
default y
config AR71XX_MACH_WZR_HP_G300NH
- bool Buffalo WZR-HP-G300NH board support
+ bool Buffalo WZR-HP-G300NH, G301NH and G300NH2 board support
select SOC_AR913X
+ select SOC_AR724X
select AR71XX_DEV_AR9XXX_WMAC
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
+ select AR71XX_DEV_M25P80
+ select AR71XX_DEV_AP91_PCI if PCI
select RTL8366_SMI
default y
Index: target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
===
--- target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c (revision 28123)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c (working copy)
@@ -2,6 +2,8 @@
* Buffalo WZR-HP-G300NH board support
*
* Copyright (C) 2010 Gabor Juhos juh...@openwrt.org
+ * Copyright (C) 2011 Felix Fietkau n...@openwrt.org
+ * Copyright (C) 2011 Mark Deneen mden...@gmail.com
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@ -11,8 +13,11 @@
#include linux/platform_device.h
#include linux/mtd/mtd.h
#include linux/mtd/partitions.h
+#include linux/mtd/concat.h
+
#include linux/nxp_74hc153.h
#include linux/rtl8366.h
+#include asm/mach-ar71xx/gpio.h
#include asm/mips_machine.h
#include asm/mach-ar71xx/ar71xx.h
@@ -24,6 +29,8 @@
#include dev-gpio-buttons.h
#include dev-leds-gpio.h
#include dev-usb.h
+#include dev-ap91-pci.h
+#include dev-m25p80.h
#define WZRHPG300NH_GPIO_LED_USB 0
#define WZRHPG300NH_GPIO_LED_DIAG 1
@@ -53,6 +60,12 @@
#define WZRHPG300NH_MAC_OFFSET 0x20c
+
+#define WZRHPG300NH2_MAC_OFFSET 0x20c
+#define WZRHPG300NH2_KEYS_POLL_INTERVAL 20 /* msecs */
+#define WZRHPG300NH2_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPG300NH2_KEYS_POLL_INTERVAL)
+
+
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition wzrhpg300nh_flash_partitions[] = {
{
@@ -89,6 +102,44 @@
.size = 0x1f6,
}
};
+
+
+static struct mtd_partition wzrhpg300nh2_flash_partitions[] = {
+ {
+ .name = u-boot,
+ .offset = 0,
+ .size = 0x004,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = u-boot-env,
+ .offset = 0x004,
+ .size = 0x001,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = art,
+ .offset = 0x005,
+ .size = 0x001,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = kernel,
+ .offset = 0x006,
+ .size = 0x010,
+ }, {
+ .name = rootfs,
+ .offset = 0x016,
+ .size = 0x1e9,
+ }, {
+ .name = user_property,
+ .offset = 0x1ff,
+ .size = 0x001,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = firmware,
+ .offset = 0x006,
+ .size = 0x1f9,
+ }
+};
+
#endif /* CONFIG_MTD_PARTITIONS */
static struct ar91xx_flash_platform_data wzrhpg300nh_flash_data = {
@@ -120,6 +171,75 @@
}
};
+
+static struct mtd_info *concat_devs[2] = { NULL, NULL };
+static struct work_struct mtd_concat_work;
+
+static void mtd_concat_add_work(struct work_struct *work)
+{
+ struct mtd_info *mtd;
+
+ mtd = mtd_concat_create(concat_devs, ARRAY_SIZE(concat_devs), flash);
+
+#ifdef CONFIG_MTD_PARTITIONS
+ add_mtd_partitions(mtd, wzrhpg300nh2_flash_partitions,
+ ARRAY_SIZE(wzrhpg300nh2_flash_partitions));
+#else
+ add_mtd_device(mtd);
+#endif
+}
+
+static void
Re: [OpenWrt-Devel] [PATCH 1/1] cs5535-gpio: name changed in linux-3.1
On 8/29/11 1:16 AM, Emmanuel Deloget wrote: Le 29/08/2011 06:55, Philip Prindeville a écrit : The name gpio-cs5535 used to refer to the drivers/char/ module, but in 3.1 it refers to what had been drivers/gpio/cs5535-gpio in more recent kernels. Have you checked on Linux 3.0 ? It seems to me that many drivers have been moved (serial went to drivers/serial/tty or something like that) and so on. Also, I would have checked the linux kernel version out of the package definitions and set a GPIODIR variable to either /gpio or /char, depending on the kernel version. Something like this would be useful anyway when dealing with drivers that move from staging to non-staging. Best regards, -- Emmanuel The change was made in 3.1, but it affects mostly naming. The driver that *was* in drivers/char/ used an entirely different model of GPIO, which was revamped around 2.6.35 and appeared as drivers/gpio/ instead to support co-habitation until the old driver was finally deprecated (in 3.1). ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] PATCH: Buffalo WZR-HP-G300NH2 support
On 2011/08/30, at 6:13, Peter Naulls wrote: I have an immediate need to support v1 and v2 hardware in one image. As products they are essentially identical, as well as in user space in Linux, and deploying a image which is all but identical to support 2 machines makes no sense to me. Are you sure that WZR-HP-G300NH/NH1 and WZR-HP-G300NH2 are (essentially) identical? Here are brief description of chip sets used in WZR-HP*. WZR-HP-G300NH1 AR9132 + AR9100 + RTL8366* (WZR-HP-G300NH, WZR-HP-G301NH(JP market), WZR-HP-G302NH(JP market)) WZR-HP-G300NH2 AR7242 + AR9280 + AR8316 and just FYI, WHR-HP-G300NAR7240 + AR9280 + AR8316 WZR-HP-AG300H AR7161 + AR9220 + AR9223 + AR8316 --- shinoda smime.p7s Description: S/MIME cryptographic signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
