aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
Commit message (Collapse)AuthorAgeFilesLines
...
* ramips: fix Buffalo WMR-300 dts, board, image and profile namesJohn Crispin2015-08-176-10/+10
| | | | | | | | The following patch changes Buffalo WMR-300 dts filename, board, image and profile names from "WMR300" to "WMR-300" (for consistency). Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46628 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Omnima models, images and profiles namesJohn Crispin2015-08-1710-47/+49
| | | | | | | | | | | | | | | | | | | | Official names for supported Omnima products are (as on website): * Omnima HPM * Omnima MiniEMBWiFi * Omnima MiniEMBPlug This patch changes: * board names * dts filenames * profile names * image filenames * LED names for Omnima devices, for consistency. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46627 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Edimax BR-6425 board nameJohn Crispin2015-08-173-3/+3
| | | | | | Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46626 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Tenda W150M model nameJohn Crispin2015-08-171-2/+2
| | | | | | Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46625 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Aigale Ai-BR100 dts and profile namesJohn Crispin2015-08-173-6/+6
| | | | | | | | The following patch changes dts filename and profile name for Aigale Ai-BR100 (for consistency). Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46624 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Olimex models, images and profiles namesJohn Crispin2015-08-177-25/+25
| | | | | | | | | | | | | | Official names for RT5350F based OLinuXino products are "RT5350F-OLinuXino{,-EVB}" as on official manufacturer website. The following patch: * changes board names from "olinuxino-rt5350f{,-evb}" to "rt5350f-olinuxino{,-evb}" * changes filenames of dts and profile files * changes image filenames for Olimex RT5350F-OLinuXino{,-EVB} devices. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46623 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Sitecom WL-341v3 board and image namesJohn Crispin2015-08-174-15/+15
| | | | | | | | | | | | | The following patch changes: * board name from "wl341v3" to "wl-341v3" * dts filename * LED names in dts file for Sitecom WL-341v3 device. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46622 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Argus ATP-52B board and image namesJohn Crispin2015-08-175-9/+9
| | | | | | | | | | | | | | The following patch: * changes board name from "argus-atp52b" to "atp-52b" * changes dts filename * fixes LED names in dts file and base-files scripts * removes manufacturer name from image filename for Argus ATP-52B device. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46621 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Belkin F7C027 image nameJohn Crispin2015-08-171-1/+1
| | | | | | | | This patch removes manufacturer from Belkin F7C027 image name ("belkinf7c027" -> "f7c027"). Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46620 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Asus RT-N56U dts filenameJohn Crispin2015-08-172-2/+2
| | | | | | | | Other Asus RT-N dts files are named "RT-N..." (not "RTN..."), so use the same for RT-N56U. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46619 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix UPVEL model namesJohn Crispin2015-08-173-4/+4
| | | | | | Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46618 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Xiaomi MiWiFi Mini board, image and profile namesJohn Crispin2015-08-178-16/+16
| | | | | | | | | | | | | | The following patch: * changes board name from "xiaomi-miwifi-mini" to "miwifi-mini" * changes filenames of dts and profile * fixes LED names in dts file and base-files scripts * removes manufacturer name from image filename for Xiaomi MiWiFi Mini device. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46617 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Asus RP-N53 and Lenovo Y1{, S} image namesJohn Crispin2015-08-171-3/+3
| | | | | | | | | | This patch: * fixes typo (rp_n53 -> rp-n53) in Asus RP-N53 image name * removes manufacturer from image names for Lenovo Y1{,S} devices Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46616 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Asus WL-330N{, 3G} boards namesJohn Crispin2015-08-173-6/+6
| | | | | | | | There are other Asus boards supported in ramips target, so use the same naming scheme for WL-330N{,3G} boards and their dts files. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46615 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix Zbtlink ZBT-WR8305RT board nameJohn Crispin2015-08-177-17/+17
| | | | | | | | There is another Zbtlink board (ZBT-WA05) supported in ramips target, so use the same naming scheme for ZBT-WR8305RT board and its dts file. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46614 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix indentation and other mistakes in .dts{, i} filesJohn Crispin2015-08-17158-433/+1113
| | | | | | | | | | | | | | | | | | | | The following patch fixes: * wrong indentations * doubled gpio-keys-polled nodes (DIR-300-B7, DIR-320-B1, DIR-610-A1) * duplicate spacings * empty lines at end of files and after last child nodes * trailing and leading whitespace * unnecessary and commented-out code * missing empty lines between nodes and between properties and nodes * unnecessary empty lines between nodes properties [1] in .dts{,i} files, for ramips target. [1] Some of empty lines in SOCs dtsi files were left untouched, because they seem to be there for a reason (readability?). Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46613 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: yaffs2: update to version from 2015-06-02Hauke Mehrtens2015-08-1514-175/+288
| | | | | | | | | | | In addition to the update this also fixes compile problems with kernel 4.1. This closes #20323. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46609 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: respect CONFIG_TARGET_IMAGES_GZIPZoltan HERPAI2015-08-151-0/+4
| | | | | | | | Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46608 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: create KDIR_TMP, build boot.img in itZoltan HERPAI2015-08-151-6/+8
| | | | | | | | | | | | | | | | | | | It's nice to have a distinction between files which are built during the normal OpenWrt build process and ones that are created by the ImageBuilder (like it already exists on some other targets). This also gives boot.img a profile-specific prefix as it contains profile- specific data. KDIR_TMP does not need to be specified since include/image.mk already sets it. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46607 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: fix uboot install locationZoltan HERPAI2015-08-151-2/+2
| | | | | | | | | | | | Install uboot files to KERNEL_BUILD_DIR instead of BIN_DIR to fix ImageBuilder. Similar fixes are necessary for many (all?) other uboot targets. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46605 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: don't copy DTS files to BIN_DIRZoltan HERPAI2015-08-151-25/+5
| | | | | | | | | | | The DTS files aren't useful (other targets don't copy them either) and clutter BIN_DIR with files unrelated to the chosen profile. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46604 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: switch to new image build systemJonas Gorski2015-08-141-24/+44
| | | | | | | | | Switch ipq806x to the new image build system. Image files might change slightly their names, but the generated files should not change. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46602 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm63xx: move gzip build command to include/image.mkJonas Gorski2015-08-141-5/+0
| | | | | | | | Allow other targets to make use of it. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46601 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: disable dma for spi on linux 4.1 as wellJonas Gorski2015-08-144-16/+3
| | | | | | | | | Linux 4.1 is also affected from the dma issue, so remove the dma proprties there as well. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46599 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update 4.1 to 4.1.5Jonas Gorski2015-08-1473-583/+330
| | | | | | | | | Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
* image.mk: store the device name variableJonas Gorski2015-08-142-15/+2
| | | | | | | | | Make the device name accessible for any build commands instead of forcing targets to define it themselves. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46597 3c298f89-4303-0410-b956-a3cf2f4a3e73
* image.mk: replace all Build/netgear-chk with a generic implementationJonas Gorski2015-08-143-21/+0
| | | | | | | | | Instead of letting each target define it themselves, create on in include/image.mk and let the targets use it. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46596 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm63xx: prefix netgear specific device variables with NETGEAR_Jonas Gorski2015-08-141-4/+4
| | | | | | | | Rename BOARD_ID to NETGEAR_BOARD_ID. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46595 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm47xx: prefix netgear specific device variables with NETGEAR_Jonas Gorski2015-08-141-5/+5
| | | | | | | | Rename BOARD_ID to NETGEAR_BOARD_ID and REGION to NETGEAR_REGION. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46594 3c298f89-4303-0410-b956-a3cf2f4a3e73
* bcm53xx: prefix netgear specific device variables with NETGEAR_Jonas Gorski2015-08-141-7/+7
| | | | | | | | Rename BOARD_ID to NETGEAR_BOARD_ID and REGION to NETGEAR_REGION. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46593 3c298f89-4303-0410-b956-a3cf2f4a3e73
* image.mk: move KDIR_TMP definition to a central locationJonas Gorski2015-08-144-8/+0
| | | | | | | | | | | Instead of each target defining it the same, move the KDIR_TMP definition to include/image.mk. In addition Image/Build/SysupgradeNAND already requires KDIR_TMP to be set, so it makes sense to have it globally defined. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46592 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: disable DMA on the SPI flashFelix Fietkau2015-08-134-16/+3
| | | | | | | | | | | | | Previous patch 6f2905eeb6ce5ddec8d12d677e1f377a940b537b enabled ADM in the kernel, which causes a kernel panic when accessing the SPI flash. As a workaround, We'll disable DMA for the flash for now. It was not enabled previously anyway so we'll just leave it as is. Reported-by: Jonas Gorski <jogo@openwrt.org> Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46587 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm47xx: fix reading WGT634U CFE variablesRafał Miłecki2015-08-121-6/+6
| | | | | | | | | | We got check for nvram_len placed too early and the code never tried reading CFE variables used on WGT634U. This is a regression introduced in r45942 and reported in #20291. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46584 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add missing symbols for 4.1Zoltan HERPAI2015-08-091-0/+8
| | | | | | | | Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46573 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: export some clock functions used by some modulesHauke Mehrtens2015-08-091-0/+28
| | | | | | | | | | | | | | | | | | This fixes this linking problem: ERROR: "clk_set_rate" [drivers/usb/phy/phy-generic.ko] undefined! ERROR: "clk_round_rate" [drivers/media/v4l2-core/videodev.ko] undefined! ERROR: "clk_set_rate" [drivers/media/v4l2-core/videodev.ko] undefined! In the upstream kernel it is fixed here: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=411520af8ec9456886359b42628e583ac58e7e44 This closes: #20162, #20172, #20196, #20197, #20202 and #20308 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46572 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: add support for 4.1Zoltan HERPAI2015-08-0965-0/+13870
| | | | | | | | Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46571 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update 3.18 to 3.18.20Hauke Mehrtens2015-08-098-26/+26
| | | | | | | | | | Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46570 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: enable NAND flash support in the kernelFelix Fietkau2015-08-073-3/+39
| | | | | | | | | | | | | | | | | Previous patch set backported the recently posted NAND flash driver to 3.18 and 4.1 kernel. This patch now enables it in the kernel config. There is no change to the partition layout and init yet. But the NAND flash can be seen in the mtd list on an AP148: root@OpenWrt:/# cat /proc/mtd dev: size erasesize name mtd0: 10000000 00020000 "qcom-nandc" ... Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46569 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: add NAND flash controller supportFelix Fietkau2015-08-0716-26/+4739
| | | | | | | | | | | | | These patches add support for ipq806x NAND flash controller. Most of these are cherry-picked & backported from LKML: *https://lkml.org/lkml/2015/8/3/16 This patch just modifies the kernel code, but doesn't change the config. It should be harmless. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46568 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: Add ADM supportFelix Fietkau2015-08-0718-8/+2448
| | | | | | | | | | | | | | | | These are cherry-picked & backported from LKML: *https://lkml.org/lkml/2015/3/17/19 They are enabled on both 3.18 and 4.1 kernel. Patches 150 to 154 are applying changes merged since 3.18; they enable mechanisms used by the ADM driver. ADM engine is used by the NAND controller, so it is necessary to bring-up NAND flash support. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46567 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kirkwood: add wpad-mini to router profilesJonas Gorski2015-08-051-2/+2
| | | | | | | | Without it the wifi isn't really usable. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46565 3c298f89-4303-0410-b956-a3cf2f4a3e73
* image: fix jffs2(_nand) image generationJonas Gorski2015-08-058-13/+23
| | | | | | | | | | | | Variables dependend on JFFS2_BLOCKSIZE and NANDBLOCK_SIZE are used for template generation, so need to be present before inclusion of image.mk in target image Makefiles. So move all declarations to before any includes. Fixes: r42878 ("image.mk: clean up and parallelize mkfs calls") Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46564 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm63xx: fix crash on 6358/6368 when booting from thread 1Jonas Gorski2015-08-051-0/+49
| | | | | | | | | | | It looks like RAC flushes cause random corruption(?) when the second thread is set as default. Fixes #20160. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46563 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm63xx: Add support for Plusnet 2704NJonas Gorski2015-08-059-0/+236
| | | | | | | | BCM6318: add support for Plusnet / Sagem 2704N (V1) Signed-off-by: Matt Goring <matt.goring@googlemail.com> Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46562 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm63xx: build image for DSL-275XB D1Jonas Gorski2015-08-051-1/+1
| | | | | | | | It boots fine, so no reason to not build it. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46561 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update 4.1 to 4.1.4Jonas Gorski2015-08-0516-316/+40
| | | | | | | | | | | Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 Signed-off-by: Daniel Golle <daniel@makrotopia.org> [jogo: fix brcm2708 patches, refresh target patches] Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46560 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: add ethernet (stmmac) supportFelix Fietkau2015-08-041-0/+5
| | | | | | | | | We forgot to enable the stmmac driver for 4.1 kernel, so ethernet interfaces don't show-up on this kernel. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46559 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: refresh kernel configsFelix Fietkau2015-08-042-13/+0
| | | | | | | | Remove options which have been moved into the generic config ever since. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46558 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: fix freeze in PCIe code when booting with an old u-bootFelix Fietkau2015-08-049-31/+757
| | | | | | | | | | | | | | | | | | | | Old bootloader (same ones which have DT disabled) don't perform any PCIe initialization. The consequence is a freeze during PCIe bring-up on these old u-boot. Same kernel with a newer bootloaders works fine as they contain the corresponding PCIe init code. In this change, we'll add the missing init and make sure the kernel doesn't rely on some preexisting init to get PCIe to work. That includes the following changes: *GPIOs: set function & drive strength *Clocks: add init code for aux & ref clocks *PCIe driver: additional init of the hardware controller Tested 3.18 and 4.1 on an AP148 with bootloader branch 0.0.1 Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46557 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ipq806x: fix pcie pinmux naming in ipq806x dtsFelix Fietkau2015-08-046-49/+40
| | | | | | | | | | PCIe controller nodes are numbers 0/1/2 in the chipset dtsi file, but the pinmux nodes are numbers 1/2/3. We'll make it consistent by changing the pinmux numbering to match the controller's one. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46556 3c298f89-4303-0410-b956-a3cf2f4a3e73