blogic [Mon, 17 Aug 2015 06:16:19 +0000 (06:16 +0000)]
mcs814x: use firmware partition splitter on dLAN USB Extender
to avoid editing the dts every time the kernel size changes.
uImage is now bigger than 1MB. Pad uImage to 64k erase block size.
Signed-off-by: Günther Kelleter <guenther.kelleter@devolo.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46648
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:16:08 +0000 (06:16 +0000)]
mcs814x: fix interrupt handling
Switch to generich chip irqs/irq domains.
Interrupts were broken since kernel 3.14. dLAN USB extender is now
booting again.
Signed-off-by: Günther Kelleter <guenther.kelleter@devolo.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46647
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:15:56 +0000 (06:15 +0000)]
mcs814x: fix debug UART
Switch to new 8250 debug uart code because the old
mach-mcs814x/include/mach/debug-macro.S tries to include
asm/hardware/debug-8250.S which no longer exists since kernel 3.14
Signed-off-by: Günther Kelleter <guenther.kelleter@devolo.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46646
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:15:49 +0000 (06:15 +0000)]
ramips: Fix MT7621 pinmux bits for uart3, uart2, mdio
The MT7621 uses a 2 bit wide configuration of the sdhci, spi, mdio, pcie,
wdt, uart2 and uart3 in the GPIO_MODE register. It was correctly done
for sdhci, spi, pcie and wdt, The same has to be done for uart3, uart2
and mdio.
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46645
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:15:44 +0000 (06:15 +0000)]
ramips: Fix amount of MT7621 pins controlled by spi group
The PINS conntrolled by the SPI bits in the GPIO_MODE register is always
7 and not 8 for nand mode.
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46644
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:15:34 +0000 (06:15 +0000)]
ramips: Fix uart2/uart3 pinmux order on MT7621
The uart3 setting in GPIO_MODE register is before the uart2 setting. Also
don't mix uart2 and uart3 function/groups.
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46643
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:04:48 +0000 (06:04 +0000)]
brcm2708: override disabled device tree module status from config.txt
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46642
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:04:39 +0000 (06:04 +0000)]
brcm2708: fix kmod-sound-soc-iqaudio-dac and add missing symbol
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46641
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:04:32 +0000 (06:04 +0000)]
brcm2708: update 4.1 patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46640
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:04:18 +0000 (06:04 +0000)]
brcm2708: use BuildDTB in image/Makefile
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46639
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:04:10 +0000 (06:04 +0000)]
brcm2708-gpu-fw: update to latest version
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46638
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:04:02 +0000 (06:04 +0000)]
oxnas: switch to kernel 4.1
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46637
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:03:57 +0000 (06:03 +0000)]
oxnas: prepare for kernel 4.1
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46636
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:03:42 +0000 (06:03 +0000)]
ramips: remove unnecessary LED declaration for WT1520 in diag.sh
This device doesn't have defined LEDs in its dts file.
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46635
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:02:59 +0000 (06:02 +0000)]
ramips: fix indentation, case statements structure and optimize base-files/etc/board.d/02_network
The following patch:
* fixes wrong indentation
* combines together boards with same configuration
* removes unnecessary spaces
* removes empty lines after ";;" and uses only "|\" (for consistency)
* orders boards alphabetically
in base-files/etc/board.d/02_network script.
One bug was left untouched: freestation5 board is listed twice in case statement, in ramips_setup_macs().
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46634
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:01:49 +0000 (06:01 +0000)]
ramips: be consistent with case statement in base-files/lib/upgrade/platform.sh
Always use "|\" (without spaces) and keep boards in alphabetical order.
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46633
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:01:44 +0000 (06:01 +0000)]
ramips: remove leading spaces, sort boards and optimize base-files/lib/ramips.sh
This patch:
* fixes various mistakes (leading spaces, wrong or missing model names)
* shortens model strings (we don't need to use whole model string from dts file, make it for consistency and as optimization)
* sorts boards alphabetically
in base-files/lib/ramips.sh script.
Case statement was tested after above changes with simple script, which:
* takes model string from dts{,i} file (model = "...")
* provides this value as case input ($machine)
* returns output ($name)
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46632
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:01:38 +0000 (06:01 +0000)]
ramips: fix various mistakes in subtargets *.mk profiles
This patch:
* fixes wrong indentation
* fixes wrong names and descriptions (ex. Dlink -> D-Link)
* changes filenames to manufacturer names
* moves oem/unknown manufacturers boards to misc.mk profiles
* combines profiles for boards from the same manufacturers in one file (ex. Olimex)
* fix profile files structure (keep the same convention as in other targets, ex. ar71xx)
in various .mk profiles, in ramips target.
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46631
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:01:23 +0000 (06:01 +0000)]
ramips: remove old code for Edimax BR-6524N
It seems that support for Edimax BR-6524N was dropped long time ago (dts file for this device is missing).
This patch removes remaining code.
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46630
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:01:06 +0000 (06:01 +0000)]
ramips: fix 7Links PX-4885 dts{, i}, board, image and profile names
The following patch changes 7Links PX-4885 dts{,i} filenames, board, image and profile names from "PX4885" to "PX-4885" (for consistency).
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46629
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 06:00:49 +0000 (06:00 +0000)]
ramips: fix Buffalo WMR-300 dts, board, image and profile names
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
blogic [Mon, 17 Aug 2015 06:00:11 +0000 (06:00 +0000)]
ramips: fix Omnima models, images and profiles names
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
blogic [Mon, 17 Aug 2015 05:59:57 +0000 (05:59 +0000)]
ramips: fix Edimax BR-6425 board name
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46626
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 05:59:47 +0000 (05:59 +0000)]
ramips: fix Tenda W150M model name
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46625
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 05:59:36 +0000 (05:59 +0000)]
ramips: fix Aigale Ai-BR100 dts and profile names
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
blogic [Mon, 17 Aug 2015 05:59:29 +0000 (05:59 +0000)]
ramips: fix Olimex models, images and profiles names
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
blogic [Mon, 17 Aug 2015 05:59:12 +0000 (05:59 +0000)]
ramips: fix Sitecom WL-341v3 board and image names
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
blogic [Mon, 17 Aug 2015 05:58:57 +0000 (05:58 +0000)]
ramips: fix Argus ATP-52B board and image names
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
blogic [Mon, 17 Aug 2015 05:58:44 +0000 (05:58 +0000)]
ramips: fix Belkin F7C027 image name
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
blogic [Mon, 17 Aug 2015 05:58:35 +0000 (05:58 +0000)]
ramips: fix Asus RT-N56U dts filename
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
blogic [Mon, 17 Aug 2015 05:58:20 +0000 (05:58 +0000)]
ramips: fix UPVEL model names
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46618
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 17 Aug 2015 05:58:15 +0000 (05:58 +0000)]
ramips: fix Xiaomi MiWiFi Mini board, image and profile names
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
blogic [Mon, 17 Aug 2015 05:58:07 +0000 (05:58 +0000)]
ramips: fix Asus RP-N53 and Lenovo Y1{, S} image names
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
blogic [Mon, 17 Aug 2015 05:57:55 +0000 (05:57 +0000)]
ramips: fix Asus WL-330N{, 3G} boards names
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
blogic [Mon, 17 Aug 2015 05:57:41 +0000 (05:57 +0000)]
ramips: fix Zbtlink ZBT-WR8305RT board name
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
blogic [Mon, 17 Aug 2015 05:57:18 +0000 (05:57 +0000)]
ramips: fix indentation and other mistakes in .dts{, i} files
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
hauke [Sun, 16 Aug 2015 20:37:47 +0000 (20:37 +0000)]
procd: fix seccomp build on some architectures
fix generating syscall-names.h
Sometimes the syscall number is not defined with a number but with an
offset to an other syscall and then make_syscall_h.sh created some
broken header file.
For example the bit/syscall.h from musl for i386 has this:
#define __NR_timer_create 259
#define __NR_timer_settime (__NR_timer_create+1)
With this patch the resulting array looks like this:
[259] = "timer_create",
[(__NR_timer_create+1)] = "timer_settime",
This closes #20195.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46612
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 16 Aug 2015 20:20:36 +0000 (20:20 +0000)]
toolchain: gcc: add gcc 5.2.0
This was boot tested on mipsel32, arm32 and x86 only.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46611
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 16 Aug 2015 20:16:43 +0000 (20:16 +0000)]
ubi-utils: fix build with gcc5
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46610
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sat, 15 Aug 2015 17:16:03 +0000 (17:16 +0000)]
kernel: yaffs2: update to version from 2015-06-02
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
wigyori [Sat, 15 Aug 2015 15:10:14 +0000 (15:10 +0000)]
sunxi: respect CONFIG_TARGET_IMAGES_GZIP
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46608
3c298f89-4303-0410-b956-
a3cf2f4a3e73
wigyori [Sat, 15 Aug 2015 14:56:21 +0000 (14:56 +0000)]
sunxi: create KDIR_TMP, build boot.img in it
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
hauke [Sat, 15 Aug 2015 14:49:06 +0000 (14:49 +0000)]
samba36: preserve smbpasswd across sysupgrade
Add /etc/samba/smbpasswd to list of samba conffiles
thus preserving samba passwords across sysupgrade
by default.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46606
3c298f89-4303-0410-b956-
a3cf2f4a3e73
wigyori [Sat, 15 Aug 2015 14:34:42 +0000 (14:34 +0000)]
sunxi: fix uboot install location
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
wigyori [Sat, 15 Aug 2015 13:39:41 +0000 (13:39 +0000)]
sunxi: don't copy DTS files to BIN_DIR
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
hauke [Sat, 15 Aug 2015 11:27:11 +0000 (11:27 +0000)]
tools: xz: update to version 5.2.1
This adds support for symbol versioning which is needed on
CentOs/RedHat 7 to fix #20134.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46603
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Fri, 14 Aug 2015 15:10:54 +0000 (15:10 +0000)]
ipq806x: switch to new image build system
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
jogo [Fri, 14 Aug 2015 15:10:47 +0000 (15:10 +0000)]
brcm63xx: move gzip build command to include/image.mk
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
jogo [Fri, 14 Aug 2015 15:10:42 +0000 (15:10 +0000)]
image.mk: add a fit recipe
Add a recipe to build a fit wrapped kernel (and optional dtb).
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46600
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Fri, 14 Aug 2015 15:10:11 +0000 (15:10 +0000)]
ipq806x: disable dma for spi on linux 4.1 as well
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
jogo [Fri, 14 Aug 2015 13:06:33 +0000 (13:06 +0000)]
kernel: update 4.1 to 4.1.5
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
jogo [Fri, 14 Aug 2015 13:05:22 +0000 (13:05 +0000)]
image.mk: store the device name variable
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
jogo [Fri, 14 Aug 2015 13:05:14 +0000 (13:05 +0000)]
image.mk: replace all Build/netgear-chk with a generic implementation
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
jogo [Fri, 14 Aug 2015 13:04:43 +0000 (13:04 +0000)]
brcm63xx: prefix netgear specific device variables with NETGEAR_
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
jogo [Fri, 14 Aug 2015 13:04:22 +0000 (13:04 +0000)]
brcm47xx: prefix netgear specific device variables with NETGEAR_
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
jogo [Fri, 14 Aug 2015 13:03:36 +0000 (13:03 +0000)]
bcm53xx: prefix netgear specific device variables with NETGEAR_
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
jogo [Fri, 14 Aug 2015 10:20:53 +0000 (10:20 +0000)]
image.mk: move KDIR_TMP definition to a central location
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
nbd [Thu, 13 Aug 2015 19:02:26 +0000 (19:02 +0000)]
image: fix handling of per-device kernel build commands
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46589
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Thu, 13 Aug 2015 19:02:21 +0000 (19:02 +0000)]
oprofile: fix path to kernel headers
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46588
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Thu, 13 Aug 2015 19:02:16 +0000 (19:02 +0000)]
ipq806x: disable DMA on the SPI flash
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
rmilecki [Wed, 12 Aug 2015 13:29:22 +0000 (13:29 +0000)]
brcm47xx: fix reading WGT634U CFE variables
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
rmilecki [Wed, 12 Aug 2015 00:57:53 +0000 (00:57 +0000)]
base-files: buttons: make power script return 0
It was missed in the r46471.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46582
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Mon, 10 Aug 2015 22:48:07 +0000 (22:48 +0000)]
procd: switch buttons to the new "button" hotplug handler
This allows requesting "timeout" ACTION in script by returning a
positive value.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46580
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Mon, 10 Aug 2015 21:56:54 +0000 (21:56 +0000)]
procd: update to the latest version, add "button" hotplug handler
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46578
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 9 Aug 2015 17:18:10 +0000 (17:18 +0000)]
kernel: crypto: fix depends in kmod-crypto-hmac
This module had two depends lines.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46576
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 9 Aug 2015 17:17:51 +0000 (17:17 +0000)]
kernel: crypto: fix module loading of cryptomgr.ko
There was no rule to load this module.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46575
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 9 Aug 2015 17:17:31 +0000 (17:17 +0000)]
kernel: crypto: fix module loading of aead.ko
The name of the module was wrong before.
This should fix #20283.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46574
3c298f89-4303-0410-b956-
a3cf2f4a3e73
wigyori [Sun, 9 Aug 2015 15:12:07 +0000 (15:12 +0000)]
kernel: add missing symbols for 4.1
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46573
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 9 Aug 2015 12:36:24 +0000 (12:36 +0000)]
ar71xx: export some clock functions used by some modules
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
wigyori [Sun, 9 Aug 2015 12:25:18 +0000 (12:25 +0000)]
sunxi: add support for 4.1
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46571
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Sun, 9 Aug 2015 11:09:52 +0000 (11:09 +0000)]
kernel: update 3.18 to 3.18.20
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
nbd [Fri, 7 Aug 2015 08:36:36 +0000 (08:36 +0000)]
ipq806x: enable NAND flash support in the kernel
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
nbd [Fri, 7 Aug 2015 08:36:31 +0000 (08:36 +0000)]
ipq806x: add NAND flash controller support
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
nbd [Fri, 7 Aug 2015 08:36:16 +0000 (08:36 +0000)]
ipq806x: Add ADM support
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
jogo [Wed, 5 Aug 2015 13:56:20 +0000 (13:56 +0000)]
mac80211: mwl8k: init devices synchronously
Make sure phys are probed and present before we detect wifis.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46566
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Wed, 5 Aug 2015 13:56:02 +0000 (13:56 +0000)]
kirkwood: add wpad-mini to router profiles
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
jogo [Wed, 5 Aug 2015 13:55:52 +0000 (13:55 +0000)]
image: fix jffs2(_nand) image generation
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
jogo [Wed, 5 Aug 2015 13:55:42 +0000 (13:55 +0000)]
brcm63xx: fix crash on 6358/6368 when booting from thread 1
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
jogo [Wed, 5 Aug 2015 13:55:37 +0000 (13:55 +0000)]
brcm63xx: Add support for Plusnet 2704N
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
jogo [Wed, 5 Aug 2015 13:55:18 +0000 (13:55 +0000)]
brcm63xx: build image for DSL-275XB D1
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
jogo [Wed, 5 Aug 2015 13:55:14 +0000 (13:55 +0000)]
kernel: update 4.1 to 4.1.4
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
nbd [Tue, 4 Aug 2015 23:10:18 +0000 (23:10 +0000)]
ipq806x: add ethernet (stmmac) support
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
nbd [Tue, 4 Aug 2015 23:10:12 +0000 (23:10 +0000)]
ipq806x: refresh kernel configs
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
nbd [Tue, 4 Aug 2015 23:10:03 +0000 (23:10 +0000)]
ipq806x: fix freeze in PCIe code when booting with an old u-boot
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
nbd [Tue, 4 Aug 2015 23:09:55 +0000 (23:09 +0000)]
ipq806x: fix pcie pinmux naming in ipq806x dts
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
nbd [Tue, 4 Aug 2015 23:09:43 +0000 (23:09 +0000)]
ipq806x: add support for non-dt enabled ap148 bootloader
Certain AP148 platforms (and derivative) use bootloaders which did not
have DT enabled.
In order to support these old platforms, we'll now make the following
modifications:
*explicitely add the memory node in the AP148 DT: this used to be added
by new u-boot through a run-time patch mechanism. We'll now add it
explicitely so it works on boots which don't support that feature. New
boots will have the node twice, the second one will be ignored.
*add the zImage generation next to the FIT image for AP148.
Other platforms using non-DT enabled bootloaders may want to leverage
this zImage code to generate their own firmare as well.
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46555
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Tue, 4 Aug 2015 23:09:38 +0000 (23:09 +0000)]
ipq806x: update bleeding-edge kernel from 4.0 to 4.1
Default kernel doesn't change and stays on 3.18 for now.
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46554
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Tue, 4 Aug 2015 23:09:28 +0000 (23:09 +0000)]
ar71xx: remove linux 3.18 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46553
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Mon, 3 Aug 2015 20:49:37 +0000 (20:49 +0000)]
acx-mac80211: update git url
use URL scheme documented at http://sourceforge.net/p/forge/documentation/Git/
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46552
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Mon, 3 Aug 2015 20:34:28 +0000 (20:34 +0000)]
cyassl: the upstream package in version 4.6.0 changed
Update the md5sum to the new version.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46551
3c298f89-4303-0410-b956-
a3cf2f4a3e73
hauke [Mon, 3 Aug 2015 20:33:57 +0000 (20:33 +0000)]
dnsmasq: Bump to dnsmasq2.75
Fixes a 100% cpu usage issue if using dhcp-script.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46550
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 2 Aug 2015 15:30:35 +0000 (15:30 +0000)]
ar71xx: Fix gpio_count setting for QCA953x in ath79_gpio_output_select
Reported-by: Steve Brown <sbrown@cortland.com>
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46547
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 2 Aug 2015 15:08:14 +0000 (15:08 +0000)]
ramips: Fix Ticket #20153 swap radio calibration data pointers on the RE6500
This patch fixes weak radio signal reported by nikola.georgiev
Signed-off-by: L. D. Pinney <ldpinney@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46545
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 2 Aug 2015 15:06:54 +0000 (15:06 +0000)]
ar71xx: fix lzma-loader kernel command line passing
The generic kernel cmdline parser ignores argv[0], this caused a
regression for all lzma-loader based boards with linux 4.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46544
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 2 Aug 2015 07:40:12 +0000 (07:40 +0000)]
build: disable kernel stack protector support for i386/x86_64
When stack protector support is disabled in libc (always the case for
!musl), gcc assumes that it needs to use __stack_chk_guard for the stack
canary.
This causes kernel build errors, because the kernel is only set up to
handle TLS stack canaries.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46543
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sat, 1 Aug 2015 15:13:10 +0000 (15:13 +0000)]
ar71xx: fix mr3220 device profile (#19990)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46541
3c298f89-4303-0410-b956-
a3cf2f4a3e73
wigyori [Fri, 31 Jul 2015 21:58:31 +0000 (21:58 +0000)]
packages: uboot-sunxi: bump to 2015.07
- switch to using kernel-supplied dtc
- refresh olimex-a13-som and lamobo-r1 patches (compile-tested only)
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46540
3c298f89-4303-0410-b956-
a3cf2f4a3e73
wigyori [Fri, 31 Jul 2015 21:49:37 +0000 (21:49 +0000)]
kernel: add missing symbol for 4.1
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46539
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Fri, 31 Jul 2015 20:55:30 +0000 (20:55 +0000)]
bcm53xx: allow device tree to override SPI flash partition layout
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46538
3c298f89-4303-0410-b956-
a3cf2f4a3e73
wigyori [Fri, 31 Jul 2015 19:50:05 +0000 (19:50 +0000)]
sunxi: fix networking on Olimex A20 Micro
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46536
3c298f89-4303-0410-b956-
a3cf2f4a3e73