The 3.10.x infrastructure has been present for some time, and seems to
run fine here.
Signed-off-by: Russell Senior <russell@personaltelco.net>
SVN-Revision: 39483
It was recently sent to linux-mips for comments. It adds workaround for
WNR3500L to enable USB port.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 39469
This does not add any new features, just some changes to the patches
and a first try to use dt to set the irqs.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39466
The original dragino2 board support was missing some changes from the
upstream svn repository (http://svn.dragino.com/dragino2) that supported
sysupgrade.
[juhosg: change subject]
Signed-off-by: Karl Palsson <karlp@remake.is>
Patchwork: http://patchwork.openwrt.org/patch/4801/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39429
Since the yaffs code update (r39084), it is not
possible to install OpenWrt on RouterBoards with
small-page NAND chips. Fix the yaffs code to make
it work again.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39409
The 3.6 kernel isn't used by any of the x86 subtargets, so remove it.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39403
Use the 'swconfig_trig_set_brightness' function to set
the brightness value of the LED when the link goes down.
This ensures that the last brighness value is saved into
a local variable which is used to track the actual LED
status.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39402
On recent TL-WDR4300 boards the external LNAs of the 2.4GHz
interface are connected to GPIO lines. Because these GPIO
lines are disabled by default, the RX sensitivity of the
device is quite bad.
Setup the GPIOs of the external LNAs to fix the issue.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39392
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
This reverts r38197.
The automatically created firmware partition includes
the partition_table partition. Apart from the partition
table, this partition contains sensitive data on some
Compex devices which data can be destroyed when the
firmware partition gets modified. Revert the change to
prevent that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39382
Since that was the last configuration in defconfig directory we can drop the
defconfig init script too.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39373
The default inittab uses "askconsole" which is implemented by procd
and uses the console provided by the kernel command line.
Hence, this platform specific workaround is not necessary anymore.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39367
Add kernel support for the BCM963269BHR board, USB and Ethernet switch,
LEDs and buttons are working.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39363
Allow using the HSSPI controller since it works just fine, as well as
the integrated switch core, since that one works too.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39362
The HIFN driver is a PCI driver, thus requires PCI support to be enabled
to compile. Therefore let it depend on PCI..
Should fix mvebu builds.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39357
The eth5 LED on the RB2011 is not working because the
LED control rule is missing. Fix it.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39335
Update a few devices with their actual port numbers, especially those
with two ports.
Should allow properly using the second port on the Neufboxen and HW553
and HW556.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39325
Allow setting the number of available usb host ports for boards with
additional sanity checks to allow using the second port on devices
where it is available.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39324
USB will fail to work if compiling with BCM6318 only if BCM63XX_HAS_EHCI
and BCM63XX_HAS_OHCI are not selected.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39322
Return the same clock for usbh and usbd on BCM6318 to prevent the clock
getting disabled despite being supposed to be enabled, e.g. by the
following sequence:
clk_enable(usbh); <- usbh->usage = 1, enabled
clk_enable(usbd); <- usbd->usage = 1, enabled (no effect)
clk_disable(usbd); <- usbd->usage = 0, -> disabled!
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39321
Changeset r39302 updated a board section and added twice .has_ehci0,
this is not necessary, so fix it.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39304
BCM6318 has a special initialization sequence which involves touching
PLL control registers in the USBH_PRIV register space, as well as
toggling a bit the Simulation control register.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39302
The rt2x00 wifi driver may still need updating to
function with this device.
Signed-off-by: Christopher Lais <chris+openwrt@zenthought.org>
SVN-Revision: 39298
Enable the use of the USB gadget device at the board level so we can use
bcm63xx_udc on this board.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39292
Also fixing a build warning due to a misplaced parenthesis in the
previous submission.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39291
Very similar to the BCM96318REF board except for the name and the
SDRAM/DDR configuration which is totally transparent for us.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39286
Add basic support for the BCM96318REF board which is comprised of:
- HS-SPI flash support
- Ethernet switch support
- USB slave device support
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39283
Provide clock toggling for the USB host and slave controller as well as
for the Ethernet Switch. The bcm63xx_enetsw driver is changed not to use
request_mem_region() as the Roboswitch register overlaps with the
Roboswitch IUDMA channels, hence making the driver return -EBUSY. A
future fix might be to use variable size RSET_ENETSW sizes depending on
the chip we are targetting.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39282
While adding support for BCM6345 Ethernet, some changes in the macros
ENETDMA{C,S} where introduced which now make the bcm63xx USB gadget
driver fail to build. Fix this.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39279
A missing condition check in dev-hsspi.c prevented the controller from
being registered on 6318 where it is fully functional.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39278
varid might both unused and unitialized when building for e.g: bcm6318,
fix these two warnings turned into errors.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39277
BCM63XX's ohci controller does not need the frame number shift, but that
was guarded with a PPC symbol. Fix this by making the no-fix generally
available.
This is a regression from the previous conversion to ohci platform driver.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39274
CFE seems to leave the SPI flash mapping in an invalid state after
loading the kernel on some reference boards, so fix it up on boot.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39273
Add inital support for BCM6318, but keep it disabled for now until
most things are supported.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39272
Add initial support for the BCM63268 family of SoCs, but keep it
disabled for now as most things don't work yet.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39271
Some SoCs have variants which are mostly the same, but use a different
chip id (or not). Add code for detecting them and handling them as
their standard counterparts.
This adds support for e.g. BCM6369.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39269
Remove the non runtime detect code since its effectiveness is dubious
and almost never used.
Also update affinity patches to work on top of it.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39268
Update bmips cleanup patches with upstream submission and backport a few
bmips fixes.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39267
Fixes generic SPI flash accesses on BCM6358/BCM6368. BCM6338 still needs
additional fixes for M25P80, so it remains broken for now.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39266
Fixes e.g. SPI flash access on BCM6358/BCM6368. Transfers < 256 bytes
are not affected.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39265
Update the HSSPI driver with the upstream submitted one that has a
workaround for the auto cs down issue.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39264
Instead of looking into the proc entry provided by broadcom-diag use
the board info from /proc/cpuinfo to get the board we are on.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39256
Use the new led api also on brcm47xx.
The led for failsafe indication is searched for.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39255
Remove the code used on the old switch driver.
The Ethernet drive is loaded as a module and needs some time to get up
therefor we added some wait function.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39254
This makes brcm47xx target use the default gpio led and button driver
and not broadcom-diag any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39253
Arcadyan ARV4510PW has already a build profile in OpenWrt, but it is
severely lacking. This patch brings it up-to-date.
Signed-off-by: Matti Laakso <malaakso@elisanet.fi>
SVN-Revision: 39230
The r39147 commit introduces a regression: at lease on some routers
with ar8216 switch large packets get lost if 802.1q tagged port is
used on the interface connected to the aforementioned switch.
The r39147 changes code in the way so interface is set to accept
packets no longer than max ethernet frame length for a given mtu.
Unfortunately ar8216 has a feature: it sends two additional bytes
as a packet header and those this header needs to be added to the
max frame length. Otherwise long enough packets get lost.
The problem only manuifests itself if interface is used in vlan
tagged mode. If interface is untagged then ar8216's header fits
into space used by 802.1q tag and not packets are lost.
Include two additional bytes in the max frame length calculation
to fix the issue.
This patch is tested and works with Trendnet TEW-632BRP.
Signed-off-by Nikolay Martynov <mar.kolya@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/4656/
[juhosg:
- simplify the patch to include the additional bytes of the
switch header unconditionally,
- change subject and update commit message]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39219
The built-in wireless MAC of the AR934x SoC can handle
external LNAs and the control signal of the LNAs can be
routed to any GPIO line. Add a helper function which
can be used to configure the GPIO lines.
The helper function will be used for AR934x boards
which are using externel LNAs to improve sensitivity.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39215
The LNAs need to be enabled by setting their respective GPIO to high even
though the original firmware's setting sets them to low on initialization.
Obviously the LNAs are then later initialized by the driver on the OEM
firmware. Without this fix the device is mostly "deaf".
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Tested-by: Steven Haigh <netwiz@crc.id.au>
Patchwork: http://patchwork.openwrt.org/patch/4689/
[juhosg:
- remove the GPIO LED changes, the My Net N600 has no yellow LEDs at all,
- change subject and update the commit message]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39214
The LNAs need to be enabled by setting their respective GPIO to high even
though the original firmware's setting sets them to low on initialization.
Obviously the LNAs are then later initialized by the driver on the OEM
firmware. Without this fix the device is mostly "deaf".
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Patchwork: http://patchwork.openwrt.org/patch/4688/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39213
This fixes the DMA problems with the Ethernet driver.
This also updates some other parts of the patches.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39203
The PHY always says there is no link
Instead of doing this dma sync a mdelay does the same trick and it is as unreliable.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39202
hexdump is already added to new temporary file system while less is not used at
all. While at it, remove some trailing whitespaces.
Signed-off-by: Luka Perkov <luka@openwrt.org>
CC: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39181
This updates the bgmac backport patch to the current upstream version
and adds some more patches mostly for BCM4707.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39165
added dts file and userspace scripts modified to support Asus RT-N14U board
current support status:
usb works
ethernet works
buttons reset, wps
leds asus:blue:[usb|lan|wan|air|power]
i2c not tested
uart not tested
wifi not yet
Signed-off-by: Pavel Löbl <lobl.pavel@gmail.com>
SVN-Revision: 39163
The hardware supports large ethernet frames. Override
the maximum frame length and packet lenght mask in the
platform data to allow to use large MTU on the ethernet
interfaces.
Limit the feature to AR934x SoCs for now. It should work
on some other SoCs as well, but those has not been tested
yet.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39149
The currently used bitmask of the maximum frame length field
is wrong for both models. On AR724x/AR933x the largest frame
size is 2047 bytes, on the AR934x it is 16383 bytes.
Make the MTU setup code model specific, and use the correct
bitmask for both models. Also change the value to the maximum.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39148
Set the MAX_FRAME_LEN register to zero in ag71xx_hw_init()
and write the correct value into that from the ag71xx_open()
and ag71xx_fast_reset() functions.
Also recalculate the RX buffer size based on the actual
maximum frame length value to optimize memory allocation.
Additionaly, disallow to change the MTU value while the
interface it running.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39147
The currently used bitmask is not correct for all SoCs.
Introduce a new field in struct ag71xx and store the
bitmask in that. Use the current value for now, it will
be adjusted for each SoCs in further patches.
Aslo use the new field directly in the ag71xx_rx_packets
and ag71xx_hard_start_xmit() functions and remove the
ag71xx_desc_pktlen() helper.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39144
Without it in some occasions oops is shown on network restart. Problem was
noticed on imx6 targed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39134
The previous patch was not the proper fix for PCI devices that require io
resources. The new patch is the proper fix backported from mainline.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 39133
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
Now that the switch is working correctly I had the chance to actually
test the LED config.
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Patchwork: http://patchwork.openwrt.org/patch/4616/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39129
The bootloader on the WD My Net N750 disables the ports on it's internal
AR8327N switch by powering them down. The stock firmware then brings the
ports back up again by starting the auto negotiation process on each
port.
This fix implements just that.
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Patchwork: http://patchwork.openwrt.org/patch/4615/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39128
This enables us to add fixups to the board specific code for boards that
require special treatment of PHYs on mdio bus reset.
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
http://patchwork.openwrt.org/patch/4614/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39127
This enables us to modify the ag71xx_mdio_platform_data from within the
board support files.
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Patchwork: http://patchwork.openwrt.org/patch/4613/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39126
Currently, the AG71XX_RX_PKT_SIZE value limits the received
frame size to 1514/1516 bytes with/without a VLAN header
respectively. However the hardware limit is controlled by
the value the AG71XX_REG_MAC_MFL register which contains
the value of the max_frame_len field.
Compute the RX buffer size from the max_frame_len field
to get rid of the 1514/1516 byte limitation. Also remove
the unused AG71XX_RX_PKT_SIZE definition.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39121
The ar7240_probe function uses the network device name
in the kernel log messages, however the name is not yet
initialized when the ar7240_probe function is called.
Use the mdio bus name in the messages to avoid ugly
log lines like the following one:
eth%d: Found an AR7240/AR9330 built-in switch
Reported-by: Ronald Wahl <ronald.wahl@raritan.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39116
The ag71xx debugfs code uses the network device name
for the device specific debugfs directory. Since r38689
'ar71xx: ag71xx: fix a race involving netdev registration'
the debugfs initialization happens before the ethernet
device gets registered and the network device name contains
'eth%d' at this point. If the board setup code registers
multiple ag71xx devices, the debugfs code tries to create
the device specific dir with the same name which causes
an error like this:
eth0: Atheros AG71xx at 0xba000000, irq 5, mode:GMII
ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.1:04 [uid=004dd041, driver=Generic PHY]
ag71xx: probe of ag71xx.0 failed with error -12
Use the device name for the debugfs directory to avoid the
collisions. Also add an error message and change the return
code if the debugfs_create_dir call fails.
Reported-by: Ronald Wahl <ronald.wahl@raritan.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39115
Some of the Gateworks Ventana boards have CAN bus support, therefore
we will install the userspace utils.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 39113
All Gateworks Ventana boards have a Gateworks System Controller
which emulates the following:
- ds1672 RTC
- pca953x GPIO expander
- hardware monitor
- at24 eeprom
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 39112
It is only on RB911G-5HPnD and RB912UAG-5HPnD boards.
The LEDs and the USB port is not working yet.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39102
Use the latest version of the yaffs code. Fetched from the
yaffs2 git tree and it is based on the following commit:
commit bc76682d93955cfb33051beb503ad9f8a5450578
Merge: 3a8580e ffa781d
Author: Charles Manning <cdhmanning@gmail.com>
Date: Thu Jul 11 17:46:25 2013 +1200
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39084
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
[juhosg: remove the image generation part until the ethernet
switch issue is resolved]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39078
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
[juhosg: use a separate patch for kernel changes]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39077
This patch enables jumbo frames on AR8327 switch by default.
I have tested it on TP-Link TL-WDR3600.
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39076
The TL-WA801ND v2 board has only one LAN port which makes
it more similar to the TL-WR[78]50RE devices. Move the
board setup code into the mach-tl-wax50re.c file.
Based-on: http://patchwork.openwrt.org/patch/4506/
Signed-off-by: Martijn Zilverschoon <thefriedzombie@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39072
This way it is a bit easier to add other TP-LINK devices based on the
Atheros AP123 reference board with one LAN port.
Based-on: http://patchwork.openwrt.org/patch/4506/
Signed-off-by: Martijn Zilverschoon <thefriedzombie@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39071
Patch to add the user space support for the TL-WA801ND v2
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Patchwork: http://patchwork.openwrt.org/patch/4501/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39064
Patch to add kernel support for the TP-LINK WA801ND v2
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Patchwork: http://patchwork.openwrt.org/patch/4500/
[juhosg:
- the TL-WA801ND v2 does not have a sliding switch, it uses a push button
for WPS instead. Use the tl_mr3420v2_gpio_keys array to reflect that,
- rename kernel patch]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39063
This breaks some devices where the serial console is not at port 0 but
somewhere else.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39060
The Gateworks GW53xx family of products is based on the Freescale
i.MX6DL SoC and offers a small form-factor with peripherals such as:
* i.MX6DL
* NAND FLASH
* 4x PCIe
* 4x USB EHCI (1x front-panel; 3x PCIe sockets)
* 1x USB OTG
* 1x uSD
* LVDS connector (VLDS for display, PWM/GPIO for backlight, i2c for touch)
* HDMI Audio/Video out
* Analog Video in
* Digital IO
* Gateworks System Controller
* Accelerometer
* Canbus
* Optional GPS
* Industrial temp (-40C to +85C)
* DC input voltage 8 to 42V (Passive PoE and 802.3af)
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 39012
