aboutsummaryrefslogtreecommitdiffstats
path: root/target
Commit message (Collapse)AuthorAgeFilesLines
* brcm2708: switch device tree compilation to linuxJohn Crispin2015-10-052-7/+3
| | | | | | Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47124 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm2708: fix kmod-sound-soc-bcm2708-i2s configJohn Crispin2015-10-051-0/+2
| | | | | | | | | | | Right now, selecting kmod-sound-soc-bcm2708-i2s causes build errors due to missing configs. kmod-regmap enables I2C and SPI, causing build errors due to depending variables not defined. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47123 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: improve systick timerJohn Crispin2015-10-051-6/+145
| | | | | | | | | | | | when sleep mode is disable use MIPS as clocksource and clockevent instead of systick. because MIPS timer has higher resolution 5ns less than systick 20us and larger counter bits 32 > 16. clean interrupt by write compare register at isr. fix typo cause sleep mode not enable. Signed-off-by: Michael Lee <igvtee@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47122 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix use remove_irq to release irqaction resourceJohn Crispin2015-10-051-1/+1
| | | | | | Signed-off-by: Michael Lee <igvtee@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47121 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: add support for 16MB VoCoreJohn Crispin2015-10-054-35/+93
| | | | | | Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47120 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: fix size-cells for spi nodesJohn Crispin2015-10-056-6/+6
| | | | | | Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47119 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Ralink RT3883 RGMII pinmux fix.John Crispin2015-10-051-2/+2
| | | | | | | | | Due to datasheet of rt3883 SoC rgmii1 port handles pins 84-95 and rgmii2 port handles pins 72-83. When this function ports gets added to rt3883_pinmux_data there's wrong pinmux bits set (RT3883_GPIO_MODE_GE1 manages 84-95 pins and RT3883_GPIO_MODE_GE2 manages 72-83). So when enabling rgmii2 as GPIO driver confuses hardware and nothing work, neither rgmii nor gpio. Also in '0030-pinctrl-ralink-add-pinctrl-driver.patch' typo in name of rgmii2 port. Signed-off-by: Nick Leiten <nickleiten@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47118 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Enable rx of 1536 bytes ethernet frames on MT7621John Crispin2015-10-051-4/+4
| | | | | | | | | | | The default switch frame size (with FCS + header) is 1536 bytes. But the GMAC only accepted frames up to 1522 bytes. Setting it to 1536 allows to receive ethernet frames using the full of MTU 1500 + an extra VLAN header + VLAN header added by the switch. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47117 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Fix too small rx bufferJohn Crispin2015-10-051-4/+12
| | | | | | | | | | | | | | | | | | The driver assumes that the maximum received buffer for non-jumbo frames is 1536 bytes. But the allocation of the rx fragment doesn't reflect that. It currently allocates fragments which will only be large enough to be used as rx buffer with the size of 1534 bytes. This is problematic because the GMAC will now try to write to 2 bytes which don't belong to its receive buffer when a large enough ethernet frame is received. This may already be a problem on existing chips but will at least become a problem when the 1536 byte rx modus is enabled on MT7621a. It is required on this SoC to receive ethernet frames which use their full 1500 bytes MTU and a VLAN header next to the switch VLAN tag. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47116 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Fix setting of rx buffer lengthJohn Crispin2015-10-052-2/+3
| | | | | | | | | | | | | | The length of the DMA rx buffer was always set to 0 because the function for extracting the length was used to calculate the value for setting it. Instead the macro has to be split in a get and set function similar to the TX_DMA_(GET_|)PLEN(0|1) macro. No problem was noticed on MT7621a before this was changed and thus maybe it was hidden by different problem which is not yet fixed. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47115 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Allow to receive vlan over untag ports on MT7530John Crispin2015-10-051-3/+33
| | | | | | | | | | | | | | | | | | | | The MT7530 switch driver with enable_vlan set will automatically set all ports to the user port mode. The hardware will remove the incoming vlan tag on these ports and use it for its internal vlan. This is usually not wanted and makes it impossible to communicate via vlan over the switch in both directions. It is possible to configure a switch port to "transparent mode" when this port is only used as untag in the switch VLANs. This will disable the VLAN untagging of packets when they were received on this port. The tagging on "tag" ports based on the vlan id is still working. The transparent port mode cannot be used when a port is both used in a VLAN as "tag" and in another one as "untag" port. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47114 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Add build files for HiWiFi HC5x61 modelsJohn Crispin2015-10-052-0/+53
| | | | | | | | | | | | | | HiWiFi HC5661/5761/5861 models are manufactured by http://www.hiwifi.com <http://www.hiwifi.com/>. These models have similar hardware specs(MT7620A + 128M DDR2 + 16M flash). This patch adds support for them. The original author is Justin Liu (rssnsj@gmail.com). I ported the patch to trunk and submitted it here with his approval. v3 fix 1: Spaces -> Tabs 2: Removed some packages Signed-off-by: Xiaoning Kang <kangxn@163.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47113 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Add DTS files for HiWiFi HC5x61 modelsJohn Crispin2015-10-054-0/+299
| | | | | | | | | | | | | | HiWiFi HC5661/5761/5861 models are manufactured by http://www.hiwifi.com. These models have similar hardware specs(MT7620A + 128M DDR2 + 16M flash). This patch adds support for them. The original author is Justin Liu (rssnsj@gmail.com). I ported the patch to trunk and submitted it here with his approval. v3 fix 1: Merged most stuff into dtsi file 2: Remove unnecessary empty lines. Signed-off-by: Xiaoning Kang <kangxn@163.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47112 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ramips: Add base-files for HiWiFi HC5x61 modelsJohn Crispin2015-10-055-10/+45
| | | | | | | | | | | | | | | HiWiFi HC5661/5761/5861 models are manufactured by http://www.hiwifi.com. These models have similar hardware specs(MT7620A + 128M DDR2 + 16M flash). This patch adds support for them. The original author is Justin Liu (rssnsj@gmail.com). I ported the patch to trunk and submitted it here with his approval. v3 fix 1: Fixed model order 2: Remove manufacturer name from model name 3: Use a hacky but prettier way to get mac address. Signed-off-by: Xiaoning Kang <kangxn@163.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47111 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Correct WeIO board nameJohn Crispin2015-10-051-1/+1
| | | | | | | | Trivial parch to correct WeIO board name in the system. Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47110 3c298f89-4303-0410-b956-a3cf2f4a3e73
* target/mpc85xx: check if 'generic' subtarget for image file ↵John Crispin2015-10-051-2/+5
| | | | | | | | | | | cuImage.tl-wdr4900-v1 Only add 'cuImage.tl-wdr4900-v1' to KERNEL_IMAGES if the selected subtarget is 'generic'. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47109 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: rename firmware for Chinese version of TL-WR941ND v6Rafał Miłecki2015-10-051-2/+3
| | | | | | | | | | | | | It seems there are two *different* versions on TL-WR941ND v6: Chinese and European one. Currently supported by OpenWrt is Chinese one. Rename firmware to make it clear. For details see: http://wiki.openwrt.org/toh/tp-link/tl-wr941nd https://forum.openwrt.org/viewtopic.php?id=59295 Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47107 3c298f89-4303-0410-b956-a3cf2f4a3e73
* lantiq: fix binutils 2.15.1 buildMatteo Croce2015-10-041-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47105 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update 4.1 to 4.1.10Hauke Mehrtens2015-10-0440-135/+88
| | | | | | | | | | | | | | | | | | | | Fixes a regression on spi flash devices (upstream commit 1583eaece6fa). Changelogs: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10 096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied upstream and dropped. Signed-off-by: Mathias Kresin <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47104 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: add irq to mt7628 gpio nodeJohn Crispin2015-10-011-0/+3
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47076 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: the mmc driver can now handle CD lines that are active lowJohn Crispin2015-10-011-4/+14
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47074 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ralink: speed selection was broken in spi-mt7621John Crispin2015-10-011-4/+5
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47073 3c298f89-4303-0410-b956-a3cf2f4a3e73
* uml: backport another upstream patch to fix compile errorsFelix Fietkau2015-09-282-1/+95
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47067 3c298f89-4303-0410-b956-a3cf2f4a3e73
* uml: fix build with gcc 5Felix Fietkau2015-09-271-0/+44
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47062 3c298f89-4303-0410-b956-a3cf2f4a3e73
* uml: update to linux 4.1Felix Fietkau2015-09-277-3977/+63
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47061 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm47xx: describe 300-fork_cacheflush.patch & 310-no_highpage.patchRafał Miłecki2015-09-272-0/+20
| | | | | | | | These were initially commited in r9285. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47058 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm47xx: describe 160-kmap_coherent.patchRafał Miłecki2015-09-271-0/+8
| | | | | | | | It was initially commited in r6642. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47057 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm47xx: describe 610-pci_ide_fix.patchRafał Miłecki2015-09-271-0/+27
| | | | | | | | It was initially commited in r20924. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47056 3c298f89-4303-0410-b956-a3cf2f4a3e73
* bcm53xx: add early support for Linksys EA6300 V1Rafał Miłecki2015-09-263-0/+96
| | | | | | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47052 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: crypto: fix ubsec_ssb.c compilation with 4.0+Rafał Miłecki2015-09-251-1/+1
| | | | | | | | | SSB_DEVTABLE_END was removed in 4.0 by upstream commit 673e2baaa6d9 ("treewide: Remove unnecessary SSB_DEVTABLE_END macro"). Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47047 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: backport some SPI layer improvements from 4.1 to 3.18, significantly ↵Felix Fietkau2015-09-243-0/+314
| | | | | | | | improves flash speed on ramips Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47045 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: remove old "rootfs" splitterRafał Miłecki2015-09-243-78/+1
| | | | | | | | | | | | | A year ago I made this old splitter obsolete (see r42828), it's time to completely remove it now. For all this time we got these warnings: "Dedicated partitioner didn't create "rootfs_data" partition, please fill a bug report!" and "Support for built-in "rootfs_data" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT" but I'm not aware of any bug reports related to that. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47040 3c298f89-4303-0410-b956-a3cf2f4a3e73
* oxnas: add platform_pre_upgrade for sysupgradeRafał Miłecki2015-09-241-0/+4
| | | | | | | | | | | | | | | | | We're in process of cleaning nand_do_platform_check. Currently it leaves a special mark in /tmp/sysupgrade-nand-path triggering some diffent code path in nand_upgrade_stage1. This can be a bit confusing. The plan is to have the check function only check the image and nothing else. Then platform code (platform_pre_upgrade) should trigger NAND specific upgrade path. This is what this patch implements. This follows all other targets making it finally possible to change nand_do_platform_check. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47039 3c298f89-4303-0410-b956-a3cf2f4a3e73
* oxnas: drop some unused sysupgrade codeRafał Miłecki2015-09-241-9/+0
| | | | | | | | | | | | First of all platform_do_upgrade_phase2 doesn't seem to be defined anywhere. Other than that platform_do_upgrade is not likely to be ever called. There is a call to nand_do_platform_check which triggers nand_upgrade_stage1 call with "exit 0" in it. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47038 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Add WeIO Board SupportFelix Fietkau2015-09-247-6/+187
| | | | | | | | | | Add support for WeIO board (http://we-io.net). This board is based on Carambola2 board form 8Devices. Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Signed-off-by: Felix Fietkau <nbd@openwrt.org> [some cleanups] git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47036 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix bogus hardcoded kernel image size for Seama images (fixes #20585)Felix Fietkau2015-09-241-3/+3
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47034 3c298f89-4303-0410-b956-a3cf2f4a3e73
* imx6: disable ext2/ext3 filesystem support (ext4 is enough)Felix Fietkau2015-09-241-8/+0
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47032 3c298f89-4303-0410-b956-a3cf2f4a3e73
* uml: disable ext2/ext3 filesystem support (ext4 is enough)Felix Fietkau2015-09-242-4/+0
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47031 3c298f89-4303-0410-b956-a3cf2f4a3e73
* arm64: disable ext2/ext3 filesystem support (ext4 is enough)Felix Fietkau2015-09-241-2/+0
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47030 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mxs: fixup permissions of image generation scriptsJo-Philipp Wich2015-09-232-0/+0
| | | | | | Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47029 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add a patch to fix crashes on pppoe disconnect/reconnectFelix Fietkau2015-09-224-4/+36
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47026 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mxs: re-work SD card image generationZoltan HERPAI2015-09-214-25/+68
| | | | | | | | | | | | - Duckbill uses a different partitioning approach than standard FSL and Olimex - use new sdimage to integrate U-Boot into the SD card images Signed-off-by: Michael Heimpold <mhei@heimpold.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47021 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mxs: adopt SD card generation to fixed U-Boot pathZoltan HERPAI2015-09-211-2/+2
| | | | | | | | Signed-off-by: Michael Heimpold <mhei@heimpold.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47019 3c298f89-4303-0410-b956-a3cf2f4a3e73
* omap: add Kernel 4.1Felix Fietkau2015-09-216-0/+1019
| | | | | | | | tested on Beagleboard C4 Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47013 3c298f89-4303-0410-b956-a3cf2f4a3e73
* arm64: switch to Kernel 4.1Felix Fietkau2015-09-183-14/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix Kernel dts subdir location - enable virtio networking we are using -M virt which supports virtio devices changes in symbols due to make kernel_oldconfig: - CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y : removed fix security: upstream id: d1fd836dcf00d2028c700c7e44d2c23404062c90 - CONFIG_ARM64_CPU_SUSPEND: removed commit id: af3cfdbf56b91785650f54e7c9a899d814b4b9fb - CONFIG_ARM64_PGTABLE_LEVELS=3 : renamed PGTABLE_LEVELS commit id: 9f25e6ad58e1fb3b4d441e4c55635c4598a6fa94 - CONFIG_GENERIC_CLOCKEVENTS_BUILD=y : removed upstream commit id: 9f083b74df3a7eaa100b456f2dc195512daf728e -# CONFIG_PREEMPT_RCU: unnecessary unknown remove reasons: -CONFIG_GENERIC_IOMAP=y -# CONFIG_POWER_RESET_GPIO is not set -# CONFIG_POWER_RESET_GPIO_RESTART is not set -# CONFIG_POWER_RESET_LTC2952 is not set -# CONFIG_POWER_RESET_SYSCON is not set -# CONFIG_XEN is not set tested and boot, networking work with qemu Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47005 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix dependencies of the sock_diag debloat patch (#20544)Felix Fietkau2015-09-182-0/+40
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46997 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: solos-pci: Increase headroom on received packetsFelix Fietkau2015-09-172-0/+108
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46993 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: ipv6: ip6_fragment: fix headroom tests and skb leakFelix Fietkau2015-09-173-1/+203
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46992 3c298f89-4303-0410-b956-a3cf2f4a3e73
* x86/geode: enable DMI and Geos support (fixes #20512)Felix Fietkau2015-09-171-0/+5
| | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46986 3c298f89-4303-0410-b956-a3cf2f4a3e73
* x86: fix Geode LX timekeeping (#20531)Felix Fietkau2015-09-171-0/+61
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46985 3c298f89-4303-0410-b956-a3cf2f4a3e73