Previously, the generated images for the My Net Wi-fi Range Extender
wouldn't always work (and panic) due to the fixed mtd offsets and
sizes for the kernel and rootfs. This patch fixes the problem by
utilizing the shared Cybertan's partition parser to recalculate
the mtd partitions for every image dynamically everytime.
Reported-by: Pascal Paradis <peparadis@yahoo.com>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
SVN-Revision: 44665
OpenWrt can be flashed with following uboot commands:
tftpboot 0x80500000 openwrt-ar71xx-generic-wpj558-16M-squashfs-sysupgrade.bin
erase 0x9f030000 +$filesize
cp.b $fileaddr 0x9f030000 $filesize
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 44620
This patch adds corrected profile and build image for the TL-MR12U board.
Unfortunately i cannot test the factory image since i can't find anywhere
the original chinese firmware but
the generated openwrt-ar71xx-generic-tl-mr12u-v1-squashfs-sysupgrade.bin
worked just fine over a modified mr3040 factory image i managed to modify
to initially flash the mr12u from the original firmware.
Proper kernel support probably should be added since cat /proc/cpuinfo shows
MR13U.
Signed-off-by: Daniel Petre <daniel.petre@gmail.com>
SVN-Revision: 44427
This patch adds support for MERCURY MAC1200R, a dual band 802.11bgn + 802.11ac
router based on the AR9344, with QCA988x ath10k radio and 5 Fast Ethernet ports
Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
SVN-Revision: 44359
This device is very similar to the TL-WR841N v8, only two LED GPIOs are
different.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 44255
The board is already supported by OpenWrt. WNR1000v2/WNR1000v2-VC are
pretty much the same as WNR2000v3/WNR612v2, therefore the same
initialization code and flash layout is used.
Signed-off-by: Ștefan Rusu <saltwaterc@gmail.com>
Tested-by: Douglas Fraser <1dsfraser@gmail.com>
SVN-Revision: 44221
TP-LINK TL-WR843ND v1 is the same model like wr41, but with
Power over Ethernet on wan port.
Signed-off-by: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
SVN-Revision: 44085
the GPIO controlling the rf filter is not configured properly by this patch.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 44077
Patch to add the buildprofile for the GL-Init-6408A-v1 and the GL-Inet-6416A-v1
Both devices are identical, only difference is one comes with 8MB flash and
the other with 16MB flash
Official website: http://www.gl-inet.com/w/?page_id=241&lang=en
Comprehensive list of specs: https://revspace.nl/GL-Inet
Signed-off-by: Martijn Zilverschoon <martijn@friedzombie.com>
SVN-Revision: 43462
This adds support for the TP-LINK CPE210/220/510/520 (Pharos series). These
devices are very similar to the Ubiquiti NanoStations, but with better specs:
faster CPU, more RAM, 2x2 MIMO.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 43385
Currently JFFS2 end-of-filesystem marker 0xdeadc0de is included the
computation of image's MD5 checksum as part of the seama header. But
OpenWrt will erase blocks including and after the marker thus
invalidating the checksum after the first boot.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
SVN-Revision: 42915
Qihoo 360 C301 is a dual band wireless router supports 802.11n and 802.11ac.
Its chipset is AR9344 + AR9882 with two 16MB flashes.
This patch adds its initial support.
v2:
* use mtd_get_mac_ascii to fetch MAC address for ath10k.
* use ath79_register_pci to initialize AR9882.
Signed-off-by: Weijie Gao <hackpascal@gmail.com>
SVN-Revision: 42552
Apparently this is a fairly common refurb unit of the 3800 series now,
with merely the recognition string changed in the boot loader.
Signed-off-by: Dave Taht <dave.taht@bufferbloat.net>
SVN-Revision: 42023
Change list:
* Remove button info on GPIO12, there is no button there.
* Remove nvram mtd partition, as it's not used for anything, saves 64k for user data.
Tested building for carambola2 target.
Signed-off-by: Mantas Pucka <mantas@8devices.com>
SVN-Revision: 41993
This patch adds support for the Ubiquiti Networks airGateway.
Based in part on code posted by David Hutchison <dhutchison@bluemesh.net> on openwrt-devel:
https://lists.openwrt.org/pipermail/openwrt-devel/2013-December/023035.html
Signed-off-by: Matthew Reeve <mreeve@tenxnetworks.com>
SVN-Revision: 41766
This enables the procd nand upgrade for ZyXEL NBG 6716. Also the ubi config
is cleaned up to match the wndr4300.
Signed-off-by: André Valentin <avalentin@marcant.net>
SVN-Revision: 41346
The TL-WA730RE seems to be almost identical to TL-WA701ND, just
that it comes without PoE and a stock-firmware claiming the device
to be a "Range Extender".
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 40972
Dlink dir-615-e1 can use dir-600-a1's image, but the image can't be
uploaded through dlink's normal firmware update web page.
Add profile for dir-615-e1 so the generated image can be uploaded
through the firmware update web page.
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
SVN-Revision: 40969
Based on the the WNDR3700v4 support patch from Ralph Perlich:
http://patchwork.openwrt.org/patch/4763/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 40481
Move the comments out from the shell script to fix build
breakage introduced in r40464.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 40466
The C7v2 has 16 MB flash and QCA9880-BR4A rev 2 supported by ath10k driver.
The C7v1 had 8 MB flash and the unsupported QCA9880-AR1A rev 1.
Signed-off-by: Adam Serbinski <adam@serbinski.com>
Patchwork: http://patchwork.openwrt.org/patch/5071/
[juhosg:
- remove the v2 specific profile add the ath10k driver to the existing
Archer C7 profile instead. Although on v1 devices it does not change
the non-working behaviour, but the ath10k driver is useful for users
whom have replaced the wifi card with a supported one in their units.
- update image/Makefile to build firmware image for both boards if the
Archer C7 profile is selected]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 40463
Everything seems to be working fine. Potential issues:
* VLAN port IDs are reversed with regard to the numbers on the case.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 40400
The version of TL-WDR4300 sold in Israel comes with a different
hardware id.
Patch-by: Daniel <daniel@makrotopia.org>
Patchwork: http://patchwork.openwrt.org/patch/5001/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 40038
Solves ticket #14356 <https://dev.openwrt.org/ticket/14356>
Without this patch, UART output will show only 4 partitions:
[ 0.740000] 4 cmdlinepart partitions found on MTD device spi0.0
[ 0.750000] Creating 4 MTD partitions on "spi0.0":
[ 0.750000] 0x000000000000-0x000000050000 : "u-boot"
[ 0.760000] 0x000000050000-0x000000070000 : "u-boot-env"
[ 0.770000] 0x000000070000-0x0000007f0000 : "firmware"
[ 0.790000] 0x0000007f0000-0x000000800000 : "art"
and then linux complains :VFS: Cannot open root device "(null)"
With this patch, UART out will show 7 partitions:
[ 0.740000] 4 cmdlinepart partitions found on MTD device spi0.0
[ 0.750000] Creating 4 MTD partitions on "spi0.0":
[ 0.750000] 0x000000000000-0x000000040000 : "u-boot"
[ 0.760000] 0x000000040000-0x000000050000 : "u-boot-env"
[ 0.770000] 0x000000050000-0x0000007f0000 : "firmware"
[ 0.780000] 2 netgear-fw partitions found on MTD device firmware
[ 0.780000] 0x000000050000-0x00000014b440 : "kernel"
[ 0.790000] mtd: partition "kernel" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only
[ 0.800000] 0x00000014b440-0x0000007f0000 : "rootfs"
[ 0.810000] mtd: partition "rootfs" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only
[ 0.820000] mtd: device 4 (rootfs) set to be root filesystem
[ 0.830000] 1 squashfs-split partitions found on MTD device rootfs
[ 0.830000] 0x000000340000-0x0000007f0000 : "rootfs_data"
[ 0.840000] 0x0000007f0000-0x000000800000 : "art"
This patch is tested against r39502 of trunk.
Signed-off-by: Jonathan Chang <changcs@santos.ee.ntu.edu.tw>
Patchwork: http://patchwork.openwrt.org/patch/4870/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39625
The mtdpartsize macro triggers shell errors on various Linux distributions
when the partname argument $(1) does not appear within the partmap $(2).
Change the sed pattern to only emit anything if a successful substitution
occured and only evaluate the arithmetic expression if something was printed
by the sed program.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 39583
Get the size of the mtd partitions directly from the
MTD layout and remove the superfluous macro parameters.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39384
The macro checks the size of the rootfs image even if
the second parameter of the macro contains the size of
an eraseblock. It is wrong because the size of the
kernel image will be adjusted to the next eraseblock
and the resulting image might be too large.
Fix the macro to check the size of the final image
instead of the rootfs image.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39383
Now that the switch works correctly we can enable the images for this
board.
Flashing from the factory firmware, the factory failsafe loader and
sysupgrade was tested successfully.
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Patchwork: http://patchwork.openwrt.org/patch/4617/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39130
Make the Image/Build/CyberTAN macro more generic,
and use simple wrappers for the GZIP/LZMA variants.
This simplifies the Makefile a bit, and allows to
build sysupgrade images for the devices which are
using LZMA compressed uImages.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38965
In the current sysupgrade images, the CRC32 value of
the TRX header covers the whole rootfs data. Due to
this, the CRC value should be changed during sysupgrade
otherwise the bootloader refuses to load the image on
the next boot.
Change the image generation to create sysupgrade images
where the CRC32 value covers the kernel data only. This
allows to skip the 'fixtrx' step during sysupgrade on
the target.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38964
- partitions on factory fw are a bit strange
- unknown contained some strings in factory
- unknown2 contains some atheros (2nd art ?)
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Patchwork: http://patchwork.openwrt.org/patch/4149/
[juhosg: edit commit message]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38954
Patch to add the profile for the TP-LINK WR842N/ND v2
Small update, because of a change in the Makefile.
Signed-off-by: Martijn Zilverschoon <thefriedzombie@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/4382/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38815
Patchwork: http://patchwork.openwrt.org/patch/4281/
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
[juhosg:
- remove the Image/Build/CyberTANLZMA/loader macro, it is not used
- move the MYNETREXT SingleProfile definition to the correct place]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38688
Append EOF markers to the END of the UBI image
file. This forces the kernel to erase all blocks
after the marker even if those blocks are not
empty.
Additionally, the resulting image can be flashed
from the original web UI now, so use '-factory'
suffix for that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38683
Extended the Makefile to generate a working factory reset image
for Netgear WNDR4300. The image uses UBI with two volumes squashfs
(rootfs) and JFFS2 (rootfs_data). In order to make stock U-Boot
happy, a fake rootfs image is placed into the last erase block
of the kernel partition.
Signed-off-by: Stefan Agner <stefan@agner.ch>
[juhosg:
- restore the NetgearNAND/initramfs macro,
- remove unused {Squash,Ubi}fsTemplate macros,
- remove board specific mtd options from CONFIG_CMDLINE, append the
board specific ubi.mtd parameter to the kernel command line instead,
- increase kernel partition size to 2MiB,
- use board specific ini file for ubinize,
- put jffs2 eof mark into the rootfs_data ubi volume,
- use KDIR_TMP for temporary images,
- use the squashfs-raw image,
- increase kernel partition size to 2MiB,
- use a local ubinize macro,
- fix macro parameter comments,
- put the fake rootfs into the last erase block of the kernel
partition,
- move Image/Build/NetgearNAND/buildkernel macro before
define Image/Build/NetgearNAND,
- don't use the wndr3700 utility, use '-M' parameter of mkimage to set
the uImage magic,
- use '-recovery' suffix for the generated image, it is only usable via
the fw_recovery function of the bootloader,
- update commit log]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38655
Ensures that the 'Default' images are generated
even if the subtarget has no profiles.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38635
Patchwork: http://patchwork.openwrt.org/patch/4183/
Signed-off-by: Terry Yang <yangbo@bhunetworks.com>
[juhosg:
- remove MultiProfile, it makes no sense for a single board
- move SingleProfile call and the mtdlayout to a different
location keep things sorted (well, almost)]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38593
Fix the image building code so that the kernel correctly
distinguishes between hardware revisions.
Signed-off-by: Mads Hansen <d@taba.se>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38192
Remove the kernel and rootfs partitions. The Seama
parser can find those automatically:
0x000000070000-0x000000ff0000 : "firmware"
2 seama-fw partitions found on MTD device firmware
0x000000070000-0x0000001b0000 : "kernel"
0x0000001b0000-0x000000ff0000 : "rootfs"
mtd: partition "rootfs" set to be root filesystem
1 squashfs-split partitions found on MTD device rootfs
0x000000360000-0x000000ff0000 : "rootfs_data"
0x000000ff0000-0x000001000000 : "radiocfg"
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38155
- append the root squashfs directly after the kernel,
- use the 64kraw/128kraw template instead of the 64k/128k,
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on WZR-HP-G300NH and WZR-600DHP boards.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38153
The Image/Build/WZRHP64K and the Image/Build/WZRHP128K macros
are similar. Move the common stuff into the Image/Build/WZRHP
macro and update the orignal macros to use that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38152
- append the root squashfs directly after the kernel,
- use the 64kraw template instead of the 64k,
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on a TEW-673GRU board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38151
The Image/Build/DIR825B1 and the Image/Build/DLRTDEV macros
are identical. Merge those into a new Image/Build/CameoAP94
macro, and update the device profiles to use the new macro.
Also rename the dir825b1_* mtdlayout macros to cameo_ap94_*.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38150
- append the root squashfs directly after the kernel,
- use the 64kraw template instead of the 64k,
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on a WispStation M5 board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38148
The firmware generation part is the same for both
macros. Move that into a separate macro and use the
new macro for Image/Build/UB{NTXM,DEV}.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38146
- append the root squashfs directly after the kernel,
- use the 64kraw template instead of the 64k
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on the WHR-G301N board only.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38141
- remove the 'kernel' and 'rootfs' partitions from the mtd layout,
- move the .okli image into the uImage,
- append the root squashfs directly after the kernel,
- use the 64kraw template instead of the 64k
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on the MZK-W300NH board only.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38139
- append the root squashfs directly to the kernel,
- use the 64kraw-nojffs template instead of sqashfs-only
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on a TEW-712BR devices only.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38130
- append the root squashfs directly to the kernel,
- use the 64kraw/64kraw-nojffs template instead of 64k/squashfs-only,
- ensure, that the signature is placed at the correct offset in
the *-factory images,
- ensure that the generated images have enough erase blocks
for JFFS2 garbage collection,
Tested on DIR-600-A1 and TEW-632BR devices only.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38129
The MTD layout of the AP99 based devices is different.
Add new macros to reflect that and use the new macros
for the DIR-615-E4 board.
This prevents overwriting of the 'mac' partition which
contain vital informations. The disadvantage of the change
is that the usable space is reduced by 192KiB. Blame the
vendors for the unfriendly partition layout.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38128
Also remove the similar code from the Netgear
profile and use the new feature instead.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38126
- remove the kernel and rootfs partitions from the mtd layout,
the kernel creates those automatically,
- remove estimation step, it is not needed anymore
- put the root squashfs directly after the kernel
- use the 64kraw template
With the default configuration, this allows to use more space for
rootfs_data with 64KiB. Tested on WNDR3700 v1 only.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38120
The new macro will be used to determine the firmware
partition size from an MTD layout.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38117
This allows to build images for other boards, even if
the image is too big for Cameo devices.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38095
This patch adds support for building firmware images for the
TP-Link TL-MR3040 v2. Tested and working on v2.1 hardware.
Signed-off-by: Mads Hansen <d@taba.se>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37964
When the squashfs and jffs2 images are generated
in the same turn, the compressed kernel images
are generated twice with the same parameters.
Move compressed kernel generation into a separate
phase to avoid that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37881
Those are not needed since we are generating the
initramfs images along with the others.
Remove the variables and use the template names
directly.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37876
Initramfs images are not generated for profiles which
are using the squashfs-only template. Add the missing
'Image/Build/Template/squashfs-only/initramfs' to fix
that.
Also, 'Image/Build/Cameo933x/initramfs' uses wrong
parameters for 'MkuImageLzma/initramfs' due to a
misplaced commma. Remove that to fix the generated
initramfs images.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37871
Based on the original firmware, the file must have the tag
HORNET-PACKET-DIR505A1-3, not HORNET-RT-DIR505A1-3.
http://patchwork.openwrt.org/patch/3945/
Signed-off-by: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
SVN-Revision: 37781
Mercury MW4530R is a TP-Link TL-WDR4310 clone but
with a much lower price tag (~ $40). This patch
is tested to work at trunk r37525.
Signed-off-by: Leon Xu <ylxu72@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/3856/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37571
Create a separate board profile and update the profile
name in image/makefile. Also use the correct machtype
string in kernel command line.
Based on andelf's patch:
http://andelf.diandian.com/post/2013-05-22/40050677370
Signed-off-by: Oleg Titov <oleg.titov@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/3840/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37550
TL-WR941N v6 use almost same IC as WDR3500.
[juhosg: change subject, and change fw layout from 4M to 4Mlzma]
Patchwork: http://patchwork.openwrt.org/patch/3719/
Signed-off-by: ShuYu Wang <andelf@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37471
In order to support both normal images and initramfs, ensure that each
target sets KERNELNAME properly so that the generic kernel building code
can copy the corresponding files over $(KDIR) with the appropriate
extension. Update the various paths to the kernel and wrapper images
from $(LINUX_DIR)/arch/$(ARCH)/boot/$(foo) to $(KDIR)/$(foo).
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 37049
MR10U is closer to MR3040 than WR703N. This changes also
enable USB power on GPIO18.
Signed-off-by: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36726
This allow us to increase the kernel partition size,
and ensures, that the -factory image still usable via
the original interface.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36584
[juhosg: this has been created from the following patch:
http://patchwork.openwrt.org/patch/3620/ ]
Signed-off-by: Jacek Kikiewicz <jaceq@aol.pl>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36580
[juhosg: use different profile name for v1 and v2, and add
multi profile to build for both versions]
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36038
Added support for the TP-LINK TL-WA830RE v1 Range Extender.
Based on the WA901ND v1 support. Hardware IDs checked against
original firmware. Patch was successfully tested on hardware.
Signed-off-by: Ronald Hecht <ronald.hecht@gmx.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35789