aboutsummaryrefslogtreecommitdiffstats
path: root/target
Commit message (Collapse)AuthorAgeFilesLines
* ar71xx: compex wpj531 fix ethernet registrationJohn Crispin2016-03-011-2/+2
| | | | | | | | | | | | | In fb6f62e97733312053ab593fcf68eea47a21169e several settings are set on the ethernet device, but they are not working. Fix Ethernet by setting the right values. Signed-off-by: Christian Mehlis <christian@m3hlis.de> Backport of r46281 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48855 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: rework patch for qca953x/956xJohn Crispin2016-03-014-113/+339
| | | | | | | | | | | | | | | | | | | | | Patch cherry-picked from the following location: https://www.codeaurora.org/cgit/quic/qsdk/oss/system/openwrt/commit/?h=release/coconut_ioe4531_2.0&id=5c357bf6c763e4140dddcc9a3bc5f005525a9c0e Changelist, - add more register defines - add EHCI support - fix GPIO pin count to 18 - fix chained irq disabled - fix GMAC0/GMAC1 initial - fix WMAC irq number to 47 - merge the changes of dev-eth.c from the patch to file. Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org> Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r46207 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48854 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix ethernet initialization on QCA953x-based boards (TP-Link ↵John Crispin2016-03-012-0/+13
| | | | | | | | | | | | | | TL-WR841N/ND v9, Compex WPJ531) The initialization routines for these boards were relying on some (wrong) defaults for the QCA953x ethernet. Make these defaults explicit to prevent breaking them when the QCA953x defaults are fixed. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r46206 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48853 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx/lzma-loader: fix O32 ABI conformanceJohn Crispin2016-03-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | According to the calling convention of the o32 ABI the caller function must reserve stack space for $a0-$a3 registers in case the callee needs to save its arguments. The assembly code of the loader does not reserve stack space for these registers thus when the 'loader_main' function needs to save its arguments, those will be stored in the 'workspace' area instead of the stack. Because the workspace area is also used by other part of the code, the saved register values gets overwritten and this often leads to failed kernel boots. Fix the code to reserve stack space for the registers to avoid this error. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Backport of r48279 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48852 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: disable software protection bits for macronix flash chips at initJohn Crispin2016-03-011-0/+10
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport r47626 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48849 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx, firmware-utils: split ubdev01 flash layout from XMJohn Crispin2016-03-011-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> Backport of r48828 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48847 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix AR71XX_MODEL on TP-Link TL-WR703NJohn Crispin2016-03-011-1/+1
| | | | | | | | | | | The hwid check was wrong, causing the AR71XX_MODEL value to end with a space (as $hwver was unset). Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r47553 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48844 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for the TP-LINK TL-WR1043ND v3John Crispin2016-03-011-1/+2
| | | | | | | | | | | The hardware of the v3 is identical to the v2. Based-on-patch-by: Andreas Ziegler <github@andreas-ziegler.de> Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r47406 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48843 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: respect CONFIG_TARGET_IMAGES_GZIPJohn Crispin2016-03-011-0/+4
| | | | | | | | Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r46608 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48836 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: fix uboot install locationJohn Crispin2016-03-011-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> Backport of r46605 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48835 3c298f89-4303-0410-b956-a3cf2f4a3e73
* sunxi: don't copy DTS files to BIN_DIRJohn Crispin2016-03-011-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> Backport of r46604 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48834 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for TL-WR741ND v5John Crispin2016-03-011-1/+9
| | | | | | | | | | | This device is identical to the TL-WR740N v5, it even uses the same HWID (which wasn't the case for older TL-WR741ND revisions). Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r46238 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48833 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for tp-link wr740n v5.0 (EU)John Crispin2016-03-011-1/+9
| | | | | | | | | | | | | TP-Link ships wr740n v5.0 to Romania (so probably everywhere except China) with 4 MB flash and 32 MB memory (confirmed by their local support). This patch adds support for the v5.0 clone of v4, i just tested it on my own v5.0 router and it works. Signed-off-by: Daniel Petre <daniel.petre@posteo.net> Backport of r46115 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48832 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: take bcm47xx_nvram.h from kernel and not backportsJohn Crispin2016-03-014-122/+52
| | | | | | | | | | | | | | | | | | | | | compat-wireless/backports now contains a bcm47xx_nvram.h file to backport some of the functions in it which are used by the bcmfmac driver. This file just checks for the kernel versions and provide an empty implementations on older kernel versions. This is OK on most systems, but on bcm47xx / bcm53xx systems we want to call the real functions here. This commit removes the file from backports in our build process like we do it with the bcma and ssb header files. Instead we add a recent version into our kernel so all code uses only one header file. On bcm47xx / bcm53xx the real implementations of this code will be used. Reported-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [Backport of r47467. The recent mac80211 backport was missing this patch, breaking the build of the brcmfmac module] Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48831 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: backport ath10k firmware loading from trunk (as of r48711)Felix Fietkau2016-02-293-100/+71
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48825 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mac80211: backport from trunk r48782 + required kernel patches and mt76, mwlwifiFelix Fietkau2016-02-292-22/+395
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48822 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: reset ethernet tx ring on fast reset to prevent packet loss / irq issuesFelix Fietkau2016-02-291-3/+11
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48753 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48815 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Backport support for Netgear EX2700John Crispin2016-02-269-1/+205
| | | | | | | | | This patch adds support for the Netgear EX2700 in Chaos Calmer and builds approriate -sysupgrade and -factory images. Signed-off-by: Joseph C. Lehner <joseph.c.lehner@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48792 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm2708: Fix sysupgrade support for Raspberry PiJohn Crispin2016-02-261-1/+1
| | | | | | | | | | Backport patch for implementing sysupgrade support on brcm2708 target was incomplete, since it was missing the default packages (r47604). Add those packages in order to fully support sysupgrade. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48791 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: support bgmac on BCM47094Rafał Miłecki2016-02-264-8/+151
| | | | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48564 and r48756 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48790 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: backport trivial bcma patches from 4.6 for BCM47094Rafał Miłecki2016-02-261-0/+72
| | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48789 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: backport bcma init patch from 4.5Rafał Miłecki2016-02-262-65/+49
| | | | | | | | | This simply replaces init fix with a final version and puts it in a generic dir. This will allow backporting some trivial changes from 4.6. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48788 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: fix mt7628 ehci supportJohn Crispin2016-02-192-73/+127
| | | | | | | | | | the u2_phy init was missing Backport of r48747 Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48749 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: fix alsa mic in supportJohn Crispin2016-02-191-93/+71
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48748 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mvebu: add SolidRun ClearFog A1 supportLuka Perkov2016-02-178-0/+700
| | | | | | Signed-off-by: Andrej Vlasic <andrej.vlasic@sartura.hr> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48737 3c298f89-4303-0410-b956-a3cf2f4a3e73
* malta: add harddisk supportJohn Crispin2016-02-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Is it possible to backport commit r46269 (3c298f89-4303-0410-b956-a3cf2f4a3e73) to CC 15.05 in order to provide harddisk support. Backporting tested (info available at: https://forum.openwrt.org/viewtopic.php?id=62389). Thnx in advance! Here is the original patch from trunk: >From 76bfcd46bd55263947461e40bd02047922755c72 Mon Sep 17 00:00:00 2001 From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Wed, 8 Jul 2015 14:25:36 +0000 Subject: [PATCH] malta: add harddisk support works with: qemu-system-mipsel -M malta \ -hda openwrt-malta-le-root.ext4 \ -kernel openwrt-malta-le-vmlinux.elf \ -nographic -append "root=/dev/sda console=ttyS0" Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48666 3c298f89-4303-0410-b956-a3cf2f4a3e73
* bcm53xx: add Netgear R8500 GPIOsRafał Miłecki2016-02-053-7/+83
| | | | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48633 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48634 3c298f89-4303-0410-b956-a3cf2f4a3e73
* bcm53xx: start working on Netgear R8500Rafał Miłecki2016-02-046-0/+101
| | | | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48625 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48629 3c298f89-4303-0410-b956-a3cf2f4a3e73
* bcm53xx: support Netgear R8500 in sysupgradeRafał Miłecki2016-02-041-0/+1
| | | | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48572 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48628 3c298f89-4303-0410-b956-a3cf2f4a3e73
* bcm53xx: use proper CPU port in b53 for Netgear R8500Rafał Miłecki2016-02-041-1/+3
| | | | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48571 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48627 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: HiLink HLK-RM04 image name typo (RM02 -> RM04)John Crispin2016-01-211-1/+1
| | | | | | | | | | The image name for the HiLink HLK-RM04 module has a typo and should read "RM04" rather than "RM02" Backport of r48355 Signed-off-by: John Clark <inindev@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48430 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix module load issue in the dma-buf debloat patchFelix Fietkau2016-01-201-1/+10
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48409 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48411 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: modularize dma shared buffer code to eliminate kernel bloatFelix Fietkau2016-01-201-0/+35
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48371 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48392 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix keyring reference leak (CVE-2016-0728)Felix Fietkau2016-01-191-0/+75
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48372 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48373 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix ethernet MAC reset on DMA hangFelix Fietkau2016-01-151-38/+55
| | | | | | | | | | | Fully reset the chip like on a full up/down, but without the PHY statemachine restart. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48228 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48246 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: extend ethernet DMA stuck check to all ar724x (and newer) chipsFelix Fietkau2016-01-151-1/+1
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48227 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48245 3c298f89-4303-0410-b956-a3cf2f4a3e73
* CC: sdk: add base repository fallbackJo-Philipp Wich2016-01-121-0/+1
| | | | | | | | | | | | | | | | When the build system cannot infer its own repository url then let it fall back to http://git.openwrt.org/ for the base feed. The path to openwrt.git is guessed from the VERSION_NUMBER variable: "unknown" or "r12345" -> http://git.openwrt.org/openwrt.git "15.05.1" -> http://git.openwrt.org/15.05/openwrt.git Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> Backport of r48212 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48213 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: backport some bcma header file definitions from wireless-testingRafał Miłecki2016-01-101-0/+26
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47284 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48165 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: make bcm47xxpart work with TRX flashed at bad block(s)Rafał Miłecki2016-01-063-2/+102
| | | | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48061 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48140 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: drop bcm47xxpart patch for XiaomiRafał Miłecki2016-01-062-36/+2
| | | | | | | | | | | It was never tested, most likely not working (because of le32_to_cpu) and not upstreamed. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Backport of r48060 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48139 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: override features to disable mips16 support for rt288xFelix Fietkau2016-01-051-0/+1
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48137 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Disable all ethernet ports except port 4 on HT-TM02.John Crispin2016-01-031-0/+1
| | | | | | | | | Port 4 is the only ethernet port on this router, so disable all other PHYs in order to save power. Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48097 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Get rt3052 ethernet ports to be disabled from the device tree.John Crispin2016-01-031-3/+14
| | | | | | | | | | | | | | | This patch allows configuring ports to be disabled in the device tree; this saves power, since disabling ports here actually disables power to ethernet PHYs. Line 461 enables all ethernet ports, so line 508 is getting zero ports to be disabled, except for port 5 in SoCs where this is not implemented as it will be sticky disabled in register POC0. Because of this, the code will still read the switch configuration and OR it to the device tree setting. Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48096 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Fix comment in rt3052 ethernet switch driver.John Crispin2016-01-031-1/+1
| | | | | | | | | | | | Line 461 is actually enabling all switch ports by setting the disable bits to 0. This needs to be done because the bootloader sets all ports to disabled by default (which is the case for at least one router based on RT5350). So, this patch fixes the comment in line 460. Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48095 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Fix whitespace in the rt3052 switch driver.John Crispin2016-01-031-4/+4
| | | | | | Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48094 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix sysupgrade for wnr2200Felix Fietkau2016-01-031-1/+8
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48005 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48093 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix factory images for WNR2200 (#19807)Felix Fietkau2016-01-031-1/+1
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48085 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48092 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: on wnr2200, revert the mac0/mac1, the ethernet interfaces are ↵Felix Fietkau2016-01-031-3/+3
| | | | | | | | | | swapped. use MAC1 for wlan Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47873 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48091 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix MAC address swapping on WNR2200 and fix the WLAN MAC addressFelix Fietkau2016-01-031-3/+4
| | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47871 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48090 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: another fix to wndr3700_board_detectFelix Fietkau2016-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | My last bugfix (r47538) introduced a new bug in wndr3700_board_detect (again...). Assigning the result of ar71xx_get_mtd_offset_size_format to the model variable before stripping of garbage using awk will cause all NUL bytes to be removed before awk is applied, leading to model strings like "NETGEAR WNDRMACv2NETGEAR", where a NUL byte after the v2 is supposed to terminate the string. Fix by calling ar71xx_get_mtd_offset_size_format twice, once piping to awk directly. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Backport of r48075 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48089 3c298f89-4303-0410-b956-a3cf2f4a3e73