aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
Commit message (Collapse)AuthorAgeFilesLines
* ar71xx: Add OOLITE to the Gainstrong profile, removed standalone profile.John Crispin2016-03-012-18/+11
| | | | | | | | | This patch moves the OOLITE profile code into the overarching Gainstrong profile and deletes the old single profile file. Signed-off by: Stijn Segers <francesco.borromini@inventati.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48866 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Added support for ZBT-826 / ZBT-1026John Crispin2016-03-017-0/+155
| | | | | | | | | Support for these MT7620-based routers: https://wiki.openwrt.org/toh/zbt/we-826 Based on Oskari’s patches found here: https://dev.openwrt.org/ticket/19996 Signed-off-by: Jamie Stuart <jamie@onebillion.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48865 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx, firmware-utils: split ubdev01 flash layout from XMFelix Fietkau2016-02-291-1/+1
| | | | | | | | | The ubdev01 profile defines its own MTDPARTS with smaller firmware partition, so give it its own UBNT_BOARD in mkfwimage. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48828 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: add sysupgrade support for mt7628Felix Fietkau2016-02-281-0/+1
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48813 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: create device tree node for MT7628 WMAC in preparation for future ↵Felix Fietkau2016-02-282-0/+17
| | | | | | | | work on driver support in mt76 Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48812 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Revert "ar71xx: WNR612v2: exclude USB modules from image"Felix Fietkau2016-02-261-1/+0
| | | | | | | | This reverts commit r48778. The issue has now been fixed properly Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48808 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: use upstream accepted bcm47xxpart patchesRafał Miłecki2016-02-262-3/+6
| | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48805 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: disable MIPS VDSO by default until the cache issues have been resolvedFelix Fietkau2016-02-261-0/+21
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48802 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Renamed Gainstrong MiniBox profile to Gainstrong (manufacturer) and ↵John Crispin2016-02-261-1/+1
| | | | | | | | | | | | | | | | updated copyright This is the first patch of a series of three to tidy up the profiles for Gainstrong devices. Right now there are two Gainstrong profiles, each for a single device built by this manufacturer. This patch renames the MiniBox profile to Gainstrong and updates the copyright notice. The series applies cleanly to current trunk. Resent with the architecture in the subject, forgot that the first time. Signed-off by: Stijn Segers <francesco.borromini@inventati.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48797 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix GPIO names for RT5350F-OLinuXino-EVBJohn Crispin2016-02-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, the board in subject (RT5350F-OLinuXino-EVB) still ships from vendor with a RC3 image built upon a .dts file which declares GPIO12 and GPIO14 as relay2 and relay1 respectively, as you can see from their rt5350f branch on GitHub. For some reason in the official stable build both the GPIOs are swapped and the wrong names are declared in the gpio-export directive. I'm submitting this patch which should roll back the wrong changes, so that we get backward compatibility with any script developed on RC3 which controls the relays. After patching correct operation is restored: root@OpenWrt:/# cat /sys/kernel/debug/gpio GPIOs 0-21, platform/10000600.gpio, 10000600.gpio: gpio-0 (button ) in hi gpio-12 (relay2 ) out lo gpio-14 (relay1 ) out lo Thank you, Signed-off-by: Lorenzo Cafaro <lorenzo@ibisco.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48796 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mpc85xx/tl-wdr4900: correct address of the gpio controllerJohn Crispin2016-02-261-1/+1
| | | | | | | | since linux 3.19 the address of the gpio-controller changed Signed-off-by: Alexander Couzens <lynxis@fe80.eu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48794 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: deactivate the vdso gettimeofday function.Hauke Mehrtens2016-02-251-0/+9
| | | | | | | | | | | The vdso version of this function has some problems with the cache. Very often it works on dated data which causes problem. We are currently working on fixing this in upstream Linux kernel. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48787 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update kernel 4.4 to version 4.4.3Hauke Mehrtens2016-02-2529-314/+83
| | | | | | | Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48783 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: WNR612v2: fix for random WLAN MACFelix Fietkau2016-02-251-1/+7
| | | | | | | | | | Fix for invalid/random WLAN MAC address in WNR612v2. Permanent platform MAC is calculated and assigned during system startup. WLAN MAC follows wired Ethernet interface addresses. This is the same fix as for WNR2000v3. Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48779 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: WNR612v2: exclude USB modules from imageFelix Fietkau2016-02-251-0/+1
| | | | | | | | | Netgear WNR612v2 has no USB port yet default system image includes USB kernel modules. This patch fixes that. Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48778 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: WNR2000v3: fix for random WLAN MACFelix Fietkau2016-02-251-6/+41
| | | | | | | | | | Fix for invalid/random WLAN MAC address in WNR2000v3. Permanent platform MAC is calculated and assigned during system startup. WLAN MAC follows wired Ethernet interface addresses. Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48777 3c298f89-4303-0410-b956-a3cf2f4a3e73
* switch: allow Ethernet port LEDs to show specific port speeds onlyFelix Fietkau2016-02-251-5/+99
| | | | | | | | | | | | | This patch adds speed_mask special file to LEDs connected to switch ports via 'switch' trigger. It allows to choose which speeds to signal when link is up. If router has more than one LED per port, they may light up differently depending on how fast connection is. Default setting is 'all speeds' so backward compatibility with system scripts (for example uci) is maintained. Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48775 3c298f89-4303-0410-b956-a3cf2f4a3e73
* switch: make LED port_mask file write handler use kstrtoul() functionFelix Fietkau2016-02-251-25/+16
| | | | | | | | | | | This patch changes swconfig_trig_port_mask_store() handler to utilize kstrtoul() function instead of call to obsolete simple_strtoul(). Thanks to this change, new handler takes less memory and makes port_mask special file accept not only hexadecimal, but also decimal and octal numbers. Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48774 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: mt7620: fix failsafe switch configJohn Crispin2016-02-251-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | As indicated in the bug tracker[1], failsafe mode is broken on at least some devices using the mt7620 switch (and possibly mt7621). The thread explicitly mentions the Xiaomi MiWifi, and the Nexx WT3020, and an unspecified device using the mt7621 switch; the issue also applies to the Netgear EX2700. The problem is that failsafe mode uses eth0, but enable_vlan is always set to 1 by the switch driver. Connecting to and/or pinging the device fails. This patch fixes the failsafe preinit config, by making sure that vlan support is disabled. It currently only fixes the switch config on mt7620, but might apply to the mt7621 as well, so the patch has been designed with this in mind. A similar (line wrapped) patch was submitted in December by Simon Peter, but never accepted and/or discussed. This patch applies to both Chaos Calmer and trunk. [1] https://dev.openwrt.org/ticket/18768 Signed-off-by: Joseph C. Lehner <joseph.c.lehner@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48772 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: build factory images for Netgear EX2700John Crispin2016-02-252-1/+27
| | | | | | | | | | | | | | | | This patch adds support for building factory and sysupgrade images for the Netgear EX2700 that don't require modification of u-boot environment variables. The bootloader on this device expects the kernel partition to end on a 64k block boundary. The last 64 byte of the kernel partition must contain a valid uImage header - in the stock firmware, this is the uImage header of the root filesystem. For this patch, we're using the uImage header of a 0 byte partition (ex2700-fakeroot.uImage). Signed-off-by: Joseph C. Lehner <joseph.c.lehner@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48771 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: correct imagename for TPlink WA730REJohn Crispin2016-02-251-2/+2
| | | | | | | | - insert missing "-" to separate model and version Signed-off-by: Sven Roederer <devel-sven@geroedel.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48769 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: correct imagename for TPlink WA701NDJohn Crispin2016-02-251-2/+2
| | | | | | | | - it seems there was never a 701N-model build Signed-off-by: Sven Roederer <devel-sven@geroedel.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48768 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: matchup of TPlink WR841N(D)-namesJohn Crispin2016-02-251-8/+8
| | | | | | | | | | | | | - remove the suffix (N, ND) to indicate that the image is for all WR841-models - some of these models have a "N"-suffix, others have (ND)-suffix, but the boards are the same - only difference is the detachable antenna on "D"-models - discussed this idea to remove the suffix in IRC with jow and Borromini Signed-off-by: Sven Roederer <devel-sven@geroedel.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48767 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm2708: remove linux 4.1 supportJohn Crispin2016-02-25216-151539/+10
| | | | | | Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48766 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm2708: switch to linux 4.4 and update patchesJohn Crispin2016-02-25155-272/+5594
| | | | | | | | | As usual these patches were extracted from: https://github.com/raspberrypi/linux/commits/rpi-4.4.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48765 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: add descriptor files for wifi+bt modules (AP6181/6210), add brcmfmac ↵Zoltan HERPAI2016-02-243-1/+110
| | | | | | | | | | to bananapro profile Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48757 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: replace bgmac patches for BCM47094 with final onesRafał Miłecki2016-02-245-41/+57
| | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48756 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: mtdsplit: support uimage with UBIRafał Miłecki2016-02-241-3/+7
| | | | | | | | This patch adds uimage firmware split support for ubi. Signed-off-by: YounJae Rho <luxflow@live.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48755 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: mtdsplit: add missing digest field to Seama headerRafał Miłecki2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | | Seama format has 2 similar headers: container (seal) header and entity header. The first one has size always set to 0 and doesn't contain MD5 digest. When dealing with Seama on a flash we deal directly with an entity. You can see mtdsplit_parse_seama reads from offset 0 and expects entity to be there. Seama container is used by bootloader / interface only which extract entity out of it and flash it. That said we should fix our header struct. This is important as we calculate possible rootfs offset assuming it may be placed right after Seama entity. So far calculate offset was always 16B too low. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48754 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: reset ethernet tx ring on fast reset to prevent packet loss / irq issuesFelix Fietkau2016-02-221-3/+11
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48753 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix WSR-1166 partition tableFelix Fietkau2016-02-221-2/+2
| | | | | | | | | - Fix typo in board_data partition start address - Increase board_data partition size in order to exploit all flash size Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48751 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: fix mt7628 ehci supportJohn Crispin2016-02-192-7/+61
| | | | | | | | the u2_phy init was missing Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48747 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: unbreak port4 on mt7620John Crispin2016-02-191-1/+1
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48746 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add missing symbol to Linux 4.4 config (#21878)Jo-Philipp Wich2016-02-181-0/+1
| | | | | | Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48742 3c298f89-4303-0410-b956-a3cf2f4a3e73
* archs38: remove network config overrideJohn Crispin2016-02-181-3/+0
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48741 3c298f89-4303-0410-b956-a3cf2f4a3e73
* linux: add support of Synopsys ARCHS38-based boardsJohn Crispin2016-02-1817-0/+887
| | | | | | | | | | | | | | | | | | | | | | This patch introduces support of new boards with ARC HS38 cores. ARC HS38 is a new generation of ARC cores which utilize ARCv2 ISA. As with ARC770 we're addind support for 2 boards for now: [1] Synopsys SDP board (AXS103) This is the same base-board as in AXS101 but with FPGA-based CPU-tile where ARCHs38 core is implemented. [2] nSIM Again this is the same simulation engine but configured for new instruction set and features of new CPU. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Felix Fietkau <nbd@openwrt.org> Cc: Jo-Philipp Wich <jow@openwrt.org> Cc: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48740 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mvebu: add SolidRun ClearFog A1 supportLuka Perkov2016-02-178-0/+640
| | | | | | Signed-off-by: Andrej Vlasic <andrej.vlasic@sartura.hr> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48736 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add missing symbols to config-4.4John Crispin2016-02-161-0/+5
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48730 3c298f89-4303-0410-b956-a3cf2f4a3e73
* at91: udc driver was missing depsJohn Crispin2016-02-161-1/+1
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48726 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mvebu: add missing symbols.John Crispin2016-02-162-0/+2
| | | | | | | | this broke full builds of the mvebu target Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48725 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Add support for Phicomm PSG1208John Crispin2016-02-158-1/+142
| | | | | | | | | | This patch adds support for Phicomm PSG1208.This is a router with MT7620A SoC with 8M flash and 64M ram. The WPS led is uesd as status_led because the power light can't be controlled with GPIO. It seems that the 5g wifi led is connected to MT7612E and it can't be controlled with GPIO too. Signed-off-by: Chuanhong Guo <gch981213@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48721 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add missing kernel symbol (#21849)Jo-Philipp Wich2016-02-124-2/+4
| | | | | | | | Also reorder subtarget kernel configs. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48717 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Support LEDs on D-Link DIR-860L B1John Crispin2016-02-121-0/+20
| | | | | | | | Adds the required gpio definitions. Signed-off-by: Johannes Wienke <languitar@semipol.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48715 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Support for Ubiquiti UniFi AP AC LITEJohn Crispin2016-02-1213-2/+154
| | | | | | | Add support for the Ubiquiti UniFi AP AC LITE Signed-off-by: P.Wassi <p.wassi at gmx.at> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48711 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Make code formatting consistent on ath79/machtypes.hJohn Crispin2016-02-121-10/+10
| | | | | | Signed-off-by: Tiziano Bacocco <tizbac2@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48706 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Added support for TL-WA801NDv3John Crispin2016-02-128-3/+160
| | | | | | Signed-off-by: Tiziano Bacocco <tizbac2@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48705 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: WNR2000v3: exclude USB modules from imageJohn Crispin2016-02-121-0/+1
| | | | | | | | | Netgear WNR2000v3 has no USB port yet default system image includes USB kernel modules. This patch fixes that. Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48701 3c298f89-4303-0410-b956-a3cf2f4a3e73
* use "-gt" instead of ">" with [ in /lib/functions/lantiq_dsl.shJohn Crispin2016-02-121-2/+2
| | | | | | | | | Avoids inadvertent file creation when executing `/etc/init.d/dsl_control status`. Signed-off-by: Jonathan A. Kollasch <jakllsch@kollasch.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48700 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Add support for Netgear EX2700John Crispin2016-02-128-1/+177
| | | | | | | | | | | | | | | | This patch adds support for the Netgear EX2700 and builds an approriate sysupgrade image. What's missing is the option to build a factory image flashable via the router's stock web interface, but this approach is hindered by the fact that u-boot operforms an additional integrity check, which expects a uImage header in the last 64 bytes of the "kernel" partition, which the bootloader expects to be 960k, a size exceeded by the standard OpenWrt kernel. Signed-off-by: Joseph C. Lehner <joseph.c.lehner@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48698 3c298f89-4303-0410-b956-a3cf2f4a3e73
* zynq: add new targetJohn Crispin2016-02-1210-0/+1101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Xilinx ZC702 Dev board Zynq target is using 4.4 kernel and mainline 2016.1 u-boot. Patch is tested with Xilinx ZC702 Dev board with SD boot mode. known issues: - no QSPI driver in 4.4 kernel: no QSPI flash support - USB is not working in 4.4 kernel Signed-off-by: Jason Wu <jason.wu.misc@gmail.com> create mode 100644 package/boot/uboot-zynq/Makefile create mode 100644 target/linux/zynq/Makefile create mode 100644 target/linux/zynq/base-files.mk create mode 100755 target/linux/zynq/base-files/etc/board.d/02_network create mode 100644 target/linux/zynq/base-files/etc/config/network create mode 100644 target/linux/zynq/base-files/etc/inittab create mode 100644 target/linux/zynq/config-4.4 create mode 100644 target/linux/zynq/image/Makefile create mode 100755 target/linux/zynq/image/mkits.sh create mode 100644 target/linux/zynq/patches-4.4/0001-arm-dts-zynq-zc702.dts-Set-default-rdinit-to-sbin-in.patch create mode 100644 target/linux/zynq/profiles/zc702.mk git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48697 3c298f89-4303-0410-b956-a3cf2f4a3e73