Re: [LEDE-DEV] [PATCH v2 00/10] at91 patch series

[Hauke Mehrtens]

On 05/04/2018 07:27 PM, Sandeep Sheriker Mallikarjun wrote:
> resending all patches again due with rebase.
> 
> Sandeep Sheriker Mallikarjun (10):
>   at91bootstrap:update to v3.8.10
>   at91: fix sdcard create image
>   uboot-at91: fetch uboot src from u-boot-at91 github
>   kernel: fix build error for external kernel.
>   at91: Add SAMA5D27 SOM1 EK board
>   at91: sdcard image with ext4 rootfs
>   uboot-at91: fix DTC command not found.
>   at91: reorganize at91 subtargets
>   at91: Add SAMA5D2 PTC EK board
>   at91: refreshing kernel configurations.
> 
>  package/boot/at91bootstrap/Makefile|  49 +-
>  package/boot/at91bootstrap/at91bootstrap.mk|   2 +-
>  package/boot/uboot-at91/Makefile   |  65 +-
>  package/kernel/linux/modules/other.mk  |   6 +-
>  package/kernel/mac80211/Makefile   |  15 +-
>  target/linux/at91/Makefile |   2 +-
>  target/linux/at91/base-files/lib/at91.sh   |   6 +
>  target/linux/at91/config-4.9   | 445 --
>  target/linux/at91/image/Makefile   |  53 +-
>  target/linux/at91/image/sama5.mk   |  90 --
>  target/linux/at91/image/sama5d2.mk |  31 +
>  target/linux/at91/image/sama5d3.mk |  33 +
>  target/linux/at91/image/sama5d4.mk |  19 +
>  target/linux/at91/legacy/config-default| 239 ++
>  ...4-ARM-at91-build-dtb-for-sama5d27-SOM1-Ek.patch | 908 
> +
>  ...105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch | 442 ++
>  target/linux/at91/sama5/config-default |  52 --
>  target/linux/at91/sama5/target.mk  |   9 -
>  target/linux/at91/sama5d2/config-default   | 287 +++
>  target/linux/at91/sama5d2/target.mk|  10 +
>  target/linux/at91/sama5d3/config-default   | 287 +++
>  target/linux/at91/sama5d3/target.mk|  10 +
>  target/linux/at91/sama5d4/config-default   | 287 +++
>  target/linux/at91/sama5d4/target.mk|  10 +
>  24 files changed, 3124 insertions(+), 233 deletions(-)
>  delete mode 100644 target/linux/at91/image/sama5.mk
>  create mode 100644 target/linux/at91/image/sama5d2.mk
>  create mode 100644 target/linux/at91/image/sama5d3.mk
>  create mode 100644 target/linux/at91/image/sama5d4.mk
>  create mode 100644 
> target/linux/at91/patches-4.9/104-ARM-at91-build-dtb-for-sama5d27-SOM1-Ek.patch
>  create mode 100644 
> target/linux/at91/patches-4.9/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch
>  delete mode 100644 target/linux/at91/sama5/config-default
>  delete mode 100644 target/linux/at91/sama5/target.mk
>  create mode 100644 target/linux/at91/sama5d2/config-default
>  create mode 100644 target/linux/at91/sama5d2/target.mk
>  create mode 100644 target/linux/at91/sama5d3/config-default
>  create mode 100644 target/linux/at91/sama5d3/target.mk
>  create mode 100644 target/linux/at91/sama5d4/config-default
>  create mode 100644 target/linux/at91/sama5d4/target.mk
> 
This caused a build problem found by build bot:

http://phase1.builds.lede-project.org/builders/at91%2Flegacy/builds/820/steps/kmods/logs/stdio
The kernel configuration option CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC is
not set.

The build bot previously used this configuration:
https://downloads.lede-project.org/snapshots/targets/at91/legacy/config.seed

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/4] Gemini forward-port to kernel v4.14

[Hauke Mehrtens]

On 05/05/2018 11:25 AM, Linus Walleij wrote:
> On Fri, May 4, 2018 at 11:49 PM, Linus Walleij  
> wrote:
>> On Fri, May 4, 2018 at 11:37 PM, Roman Yeryomin  wrote:
>>
 The GPIO LEDs does not come up though?
 CONFIG_LEDS_GPIO is not in config, and
 /sys/class/leds is empty.

 Does it need  a separate kmod?
>>>
>>> kmod-leds-gpio is part of DEFAULT_PACKAGES now
>>> I guess you should run menuconfig and/or clean tmp/ to refresh profile
>>> package set.
>>
>> Hm I ran menuconfig and it doesn't work, and removing
>> tmp/ didn't help either, but selecting a different target
>> and then selecting CS351x again worked... shaky.
>>
>> OK rebuilding this overnight and retesting.
> 
> It is still not working. Do you get GPIO LEDs on your
> device with this?
> 
> AFAICT the problem is that there is no script in
> /etc/modules-boot.d to load the GPIO LED module.
> 
> I'm digging into it to figure out more about how this
> module load is supposed to work...

AutoProbe has a optional 2. parameter for boot flags, please try to replace
AUTOLOAD:=$(call AutoProbe,)
with:
AUTOLOAD:=$(call AutoProbe,, 1)

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH v2] dropbear: bump to 2018.76

[Hauke Mehrtens]

On 05/02/2018 05:37 PM, Koen Vandeputte wrote:
> Config moved from option.h to localoptions.h
> refreshed all patches
> 
> deleted upstreamed patches:
> - 010-runtime-maxauthtries.patch
> - 610-skip-default-keys-in-custom-runs.patch
> 
> introduced new patch:
> - 610-disable-ec-by-default.patch
> 
> This patch adds the EC definitions which are altered by the Makefile when
> (de)selecting EC options.
> 
> Tested on both LE (arm) and BE (mips) architectures.
> Tested with all dropbear menuoptions on/off
> 
> Binary sizes in bytes:
> 
> 2017.75
> ---
> 
> Openwrt default : 172405
> Openwrt default IPK : 86512
> 
> Openwrt default + ECC + zlib: 197301
> Openwrt default IPK + ECC + zlib: 98709
> 
> 2018.76
> ---
> 
> Openwrt default : 277260
> Openwrt default IPK : 130534
> 
> Openwrt default + ECC + zlib: 322928
> Openwrt default IPK + ECC + zlib: 149187
> 
> Signed-off-by: Koen Vandeputte 
> ---

I think the size increase is too big, someone should investigate what
happened here and try to reduce the size of the new version.

> 
> V2:
> --> Added binary sizes
> --> Disabled 2 more options (DROPBEAR_USE_PASSWORD_ENV  &  
> DROPBEAR_SFTPSERVER)
> 
> Skipped adding the sftp server as a menuconfig option, as it's not integrated 
> into dropbear itself
> 
> Binary size seems to have exploded compared to the previous version.
> Checking all configfile options and the buildoptions for Configure, I cannot 
> pinpoint the rootcause for this massive increase.
> 
> The libtom's seem to be build using Os.
> 
> 
> 
> 
>  package/network/services/dropbear/Makefile |  28 ++---
>  .../patches/010-runtime-maxauthtries.patch | 130 
> -
>  .../dropbear/patches/100-pubkey_path.patch |  28 +++--
>  .../dropbear/patches/110-change_user.patch |   2 +-
>  .../dropbear/patches/120-openwrt_options.patch |  96 +++
>  .../dropbear/patches/130-ssh_ignore_x_args.patch   |   4 +-
>  .../patches/150-dbconvert_standalone.patch |  21 ++--
>  .../patches/600-allow-blank-root-password.patch|   2 +-
>  .../patches/610-disable-ec-by-default.patch|  10 ++
>  .../610-skip-default-keys-in-custom-runs.patch |  18 ---
>  10 files changed, 64 insertions(+), 275 deletions(-)
>  delete mode 100644 
> package/network/services/dropbear/patches/010-runtime-maxauthtries.patch
>  create mode 100644 
> package/network/services/dropbear/patches/610-disable-ec-by-default.patch
>  delete mode 100644 
> package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch
> 
> diff --git a/package/network/services/dropbear/Makefile 
> b/package/network/services/dropbear/Makefile
> index 21ac09f72452..e89043531f78 100644
> --- a/package/network/services/dropbear/Makefile
> +++ b/package/network/services/dropbear/Makefile
> @@ -8,14 +8,14 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=dropbear
> -PKG_VERSION:=2017.75
> -PKG_RELEASE:=5
> +PKG_VERSION:=2018.76
> +PKG_RELEASE:=1
>  
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>  PKG_SOURCE_URL:= \
>   http://matt.ucc.asn.au/dropbear/releases/ \
>   https://dropbear.nl/mirror/releases/
> -PKG_HASH:=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c
> +PKG_HASH:=f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
>  
>  PKG_LICENSE:=MIT
>  PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
> @@ -57,7 +57,7 @@ endef
>  
>  define Package/dropbear/conffiles
>  /etc/dropbear/dropbear_rsa_host_key
> -/etc/config/dropbear 
> +/etc/config/dropbear
>  endef
>  
>  define Package/dropbearconvert
> @@ -89,24 +89,24 @@ define Build/Configure
>   $(Build/Configure/Default)
>  
>   $(SED) 's,^#define DEFAULT_PATH .*,#define DEFAULT_PATH 
> "$(TARGET_INIT_PATH)",g' \
> - $(PKG_BUILD_DIR)/options.h
> + $(PKG_BUILD_DIR)/default_options.h
>  
>   awk 'BEGIN { rc = 1 } \
> -  /'DROPBEAR_CURVE25519'/ { 0 = "$(if 
> $(CONFIG_DROPBEAR_CURVE25519),,// )#define 'DROPBEAR_CURVE25519'"; rc = 0 } \
> +  /'DROPBEAR_CURVE25519'/ { 0 = "$(if 
> $(CONFIG_DROPBEAR_CURVE25519),#define 'DROPBEAR_CURVE25519' 1,#define 
> 'DROPBEAR_CURVE25519' 0)"; rc = 0 } \
>{ print } \
> -  END { exit(rc) }' $(PKG_BUILD_DIR)/options.h \
> -  >$(PKG_BUILD_DIR)/options.h.new && \
> - mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h
> +  END { exit(rc) }' $(PKG_BUILD_DIR)/localoptions.h \
> +  >$(PKG_BUILD_DIR)/localoptions.h.new && \
> + mv $(PKG_BUILD_DIR)/localoptions.h.new $(PKG_BUILD_DIR)/localoptions.h
>  
> - # Enforce that all replacements are made, otherwise options.h has 
> changed
> + # Enforce that all replacements are made, otherwise localoptions.h has 
> changed
>   # format and this logic is broken.
>   for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH; do \

Re: [LEDE-DEV] [PATCH] dropbear: bump to 2018.76

[Hauke Mehrtens]

On 04/27/2018 05:58 PM, Koen Vandeputte wrote:
> Config moved from option.h to localoptions.h
> refreshed all patches
> 
> deleted upstreamed patches:
> - 010-runtime-maxauthtries.patch
> - 610-skip-default-keys-in-custom-runs.patch
> 
> introduced new patch:
> - 610-disable-ec-by-default.patch
> 
> This patch adds the EC definitions which are altered by the Makefile when
> (de)selecting EC options.
> 
> Tested on both LE (arm) and BE (mips) architectures.
> Tested with all dropbear menuoptions on/off

Please post the size of the binary and the ipkg with and without this patch.

I think it compiles the math library by default with O2 or O3 and not
with Os can you check this too please.

Hauke
> 
> Signed-off-by: Koen Vandeputte 
> ---
>  package/network/services/dropbear/Makefile |  28 ++---
>  .../patches/010-runtime-maxauthtries.patch | 130 
> -
>  .../dropbear/patches/100-pubkey_path.patch |  28 +++--
>  .../dropbear/patches/110-change_user.patch |   2 +-
>  .../dropbear/patches/120-openwrt_options.patch |  94 ++-
>  .../dropbear/patches/130-ssh_ignore_x_args.patch   |   4 +-
>  .../patches/150-dbconvert_standalone.patch |  21 ++--
>  .../patches/600-allow-blank-root-password.patch|   2 +-
>  .../patches/610-disable-ec-by-default.patch|  10 ++
>  .../610-skip-default-keys-in-custom-runs.patch |  18 ---
>  10 files changed, 62 insertions(+), 275 deletions(-)
>  delete mode 100644 
> package/network/services/dropbear/patches/010-runtime-maxauthtries.patch
>  create mode 100644 
> package/network/services/dropbear/patches/610-disable-ec-by-default.patch
>  delete mode 100644 
> package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch
> 
> diff --git a/package/network/services/dropbear/Makefile 
> b/package/network/services/dropbear/Makefile
> index 21ac09f72452..e89043531f78 100644
> --- a/package/network/services/dropbear/Makefile
> +++ b/package/network/services/dropbear/Makefile
> @@ -8,14 +8,14 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=dropbear
> -PKG_VERSION:=2017.75
> -PKG_RELEASE:=5
> +PKG_VERSION:=2018.76
> +PKG_RELEASE:=1
>  
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>  PKG_SOURCE_URL:= \
>   http://matt.ucc.asn.au/dropbear/releases/ \
>   https://dropbear.nl/mirror/releases/
> -PKG_HASH:=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c
> +PKG_HASH:=f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
>  
>  PKG_LICENSE:=MIT
>  PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
> @@ -57,7 +57,7 @@ endef
>  
>  define Package/dropbear/conffiles
>  /etc/dropbear/dropbear_rsa_host_key
> -/etc/config/dropbear 
> +/etc/config/dropbear
>  endef
>  
>  define Package/dropbearconvert
> @@ -89,24 +89,24 @@ define Build/Configure
>   $(Build/Configure/Default)
>  
>   $(SED) 's,^#define DEFAULT_PATH .*,#define DEFAULT_PATH 
> "$(TARGET_INIT_PATH)",g' \
> - $(PKG_BUILD_DIR)/options.h
> + $(PKG_BUILD_DIR)/default_options.h
>  
>   awk 'BEGIN { rc = 1 } \
> -  /'DROPBEAR_CURVE25519'/ { 0 = "$(if 
> $(CONFIG_DROPBEAR_CURVE25519),,// )#define 'DROPBEAR_CURVE25519'"; rc = 0 } \
> +  /'DROPBEAR_CURVE25519'/ { 0 = "$(if 
> $(CONFIG_DROPBEAR_CURVE25519),#define 'DROPBEAR_CURVE25519' 1,#define 
> 'DROPBEAR_CURVE25519' 0)"; rc = 0 } \
>{ print } \
> -  END { exit(rc) }' $(PKG_BUILD_DIR)/options.h \
> -  >$(PKG_BUILD_DIR)/options.h.new && \
> - mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h
> +  END { exit(rc) }' $(PKG_BUILD_DIR)/localoptions.h \
> +  >$(PKG_BUILD_DIR)/localoptions.h.new && \
> + mv $(PKG_BUILD_DIR)/localoptions.h.new $(PKG_BUILD_DIR)/localoptions.h
>  
> - # Enforce that all replacements are made, otherwise options.h has 
> changed
> + # Enforce that all replacements are made, otherwise localoptions.h has 
> changed
>   # format and this logic is broken.
>   for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH; do \
> awk 'BEGIN { rc = 1 } \
> -/'OPTION'/ { 0 = "$(if $(CONFIG_DROPBEAR_ECC),,// 
> )#define 'OPTION'"; rc = 0 } \
> +/'OPTION'/ { 0 = "$(if $(CONFIG_DROPBEAR_ECC),#define 
> 'OPTION' 1,#define 'OPTION' 0)"; rc = 0 } \
>  { print } \
> -END { exit(rc) }' $(PKG_BUILD_DIR)/options.h \
> ->$(PKG_BUILD_DIR)/options.h.new && \
> -   mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h || exit 
> 1; \
> +END { exit(rc) }' $(PKG_BUILD_DIR)/localoptions.h \
> +>$(PKG_BUILD_DIR)/localoptions.h.new && \
> +   mv $(PKG_BUILD_DIR)/localoptions.h.new 
> $(PKG_BUILD_DIR)/localoptions.h || exit 1; \
>   done
>  
>   # remove protocol idented software version number
> diff --git 
> 

Re: [LEDE-DEV] [PATCH 1/2] firmware-utils: mkdapimg2: Fix potential buffer overflow

[Hauke Mehrtens]

On 04/23/2018 01:22 AM, Rosen Penev wrote:
> If GCC is built with stack smashing protection enabled (SSP), it errors when 
> compiling lzma-loader.
> 
> Switching to strncpy seems to be an easy way to fix this. It's probably 
> better to use snprintf or strlcpy but the latter is not available for glibc 
> systems.

I also saw this problem, because my version number got too long and it
just failed because the first byte of the signature contained now the
terminating NULL byte of the version.

Does anybody know if the version number, signature and so on has to be
NULL terminated or not?

I created this patch some days ago to not run into this problem any more:
https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=commitdiff;h=b69a5d5ee4c7611a45693eec481f259520eb6422


> Output of crash below:
> 
> *** buffer overflow detected ***: 
> /home/mangix/devstuff/openwrt/staging_dir/host/bin/mkdapimg2 terminated
> === Backtrace: =
> /lib/x86_64-linux-gnu/libc.so.6(+0x777e5)[0x7f6318ea77e5]
> /lib/x86_64-linux-gnu/libc.so.6(__fortify_fail+0x5c)[0x7f6318f4915c]
> /lib/x86_64-linux-gnu/libc.so.6(+0x117160)[0x7f6318f47160]
> /home/mangix/devstuff/openwrt/staging_dir/host/bin/mkdapimg2[0x400ab7]
> /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0)[0x7f6318e50830]
> /home/mangix/devstuff/openwrt/staging_dir/host/bin/mkdapimg2[0x400e69]
> === Memory map: 
> 0040-00402000 r-xp  00:00 223275 
> /home/mangix/devstuff/openwrt/staging_dir/host/bin/mkdapimg200601000-00602000 
> r--p 1000 00:00 223275 
> /home/mangix/devstuff/openwrt/staging_dir/host/bin/mkdapimg200602000-00603000 
> rw-p 2000 00:00 223275 
> /home/mangix/devstuff/openwrt/staging_dir/host/bin/mkdapimg2018c2000-018e3000 
> rw-p  00:00 0  [heap]
> 7f6318c1-7f6318c26000 r-xp  00:00 122040 
> /lib/x86_64-linux-gnu/libgcc_s.so.1
> 7f6318c26000-7f6318e25000 ---p 00016000 00:00 122040 
> /lib/x86_64-linux-gnu/libgcc_s.so.1
> 7f6318e25000-7f6318e26000 rw-p 00015000 00:00 122040 
> /lib/x86_64-linux-gnu/libgcc_s.so.1
> 7f6318e3-7f6318ff r-xp  00:00 123971 
> /lib/x86_64-linux-gnu/libc-2.23.so
> 7f6318ff-7f6318ff9000 ---p 001c 00:00 123971 
> /lib/x86_64-linux-gnu/libc-2.23.so
> 7f6318ff9000-7f63191f ---p 001c9000 00:00 123971 
> /lib/x86_64-linux-gnu/libc-2.23.so
> 7f63191f-7f63191f4000 r--p 001c 00:00 123971 
> /lib/x86_64-linux-gnu/libc-2.23.so
> 7f63191f4000-7f63191f6000 rw-p 001c4000 00:00 123971 
> /lib/x86_64-linux-gnu/libc-2.23.so
> 7f63191f6000-7f63191fa000 rw-p  00:00 0
> 7f631920-7f6319226000 r-xp  00:00 123969 
> /lib/x86_64-linux-gnu/ld-2.23.so
> 7f6319425000-7f6319426000 r--p 00025000 00:00 123969 
> /lib/x86_64-linux-gnu/ld-2.23.so
> 7f6319426000-7f6319427000 rw-p 00026000 00:00 123969 
> /lib/x86_64-linux-gnu/ld-2.23.so
> 7f6319427000-7f6319428000 rw-p  00:00 0
> 7f631946-7f6319461000 rw-p  00:00 0
> 7f631947-7f6319471000 rw-p  00:00 0
> 7f631948-7f6319481000 rw-p  00:00 0
> 7f631949-7f6319491000 rw-p  00:00 0
> 7fffca52e000-7fffcad2e000 rw-p  00:00 0  [stack]
> 7fffcb121000-7fffcb122000 r-xp  00:00 0  [vdso]
> make -r world: build failed. Please re-run make with -j1 V=s to see what's 
> going on
> 
> Signed-off-by: Rosen Penev 
> ---
>  tools/firmware-utils/src/mkdapimg2.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/firmware-utils/src/mkdapimg2.c 
> b/tools/firmware-utils/src/mkdapimg2.c
> index aef003c..59c9f00 100644
> --- a/tools/firmware-utils/src/mkdapimg2.c
> +++ b/tools/firmware-utils/src/mkdapimg2.c
> @@ -119,7 +119,7 @@ main(int ac, char *av[])
>   progname, MAX_SIGN_LEN);
>   exit(1);
>   }
> - strcpy(signature, optarg);
> + strncpy(signature, optarg, MAX_SIGN_LEN);
>   break;
>   case 'v':
>   if (strlen(optarg) > MAX_FW_VER_LEN + 1) {
> @@ -127,7 +127,7 @@ main(int ac, char *av[])
>   progname, MAX_FW_VER_LEN);
>   exit(1);
>   }
> - strcpy(version, optarg);
> + strncpy(version, optarg, MAX_FW_VER_LEN);
>   break;
>   case 'r':
>   if (strlen(optarg) > MAX_REG_LEN + 1) {
> @@ -135,7 +135,7 @@ main(int ac, char *av[])
>   progname, MAX_REG_LEN);
>   exit(1);
>   }
> - strcpy(region, optarg);
> +   

Re: [LEDE-DEV] [PATCH v2 4/5] mtd-utils: update to 2.0.2

[Hauke Mehrtens]

On 04/20/2018 01:01 AM, Syrone Wong wrote:
> Hi,
> 
> Thanks for the update.
> I would prefer the git way, it's easier to include upstream commits.

I normally prefer tars compared to git when we reference a specific
version. They are easier to mirror, but we also have our own method now
to generate nice tars from git trees.

If you want to go to a different version without a tar you can switch
back to git at any time.

Hauke
> Best Regards,
> Syrone Wong
> 
> 
> On Fri, Apr 20, 2018 at 6:12 AM, Hauke Mehrtens <ha...@hauke-m.de> wrote:
>> From: Syrone Wong <wong.syr...@gmail.com>
>>
>> 010-fix-rpmatch.patch is upstream, removed from our patchset
>> The file structure is changed, modify patch accordingly
>> use CONFIGURE_ARGS to disable tests, xattr and lzo
>>
>> Compile and run tested on mvebu and x86_64
>>
>> Signed-off-by: Syrone Wong <wong.syr...@gmail.com>
>> ---
>>
>> changes since v1:
>> * Update to version 2.0.2
>> * use ftp to download the tar
>>
>>  package/utils/mtd-utils/Makefile   | 22 
>>  .../utils/mtd-utils/patches/010-fix-rpmatch.patch  | 19 ---
>>  .../utils/mtd-utils/patches/100-fix_includes.patch |  2 +-
>>  .../utils/mtd-utils/patches/130-lzma_jffs2.patch   | 66 
>> --
>>  4 files changed, 47 insertions(+), 62 deletions(-)
>>  delete mode 100644 package/utils/mtd-utils/patches/010-fix-rpmatch.patch
>>
>> diff --git a/package/utils/mtd-utils/Makefile 
>> b/package/utils/mtd-utils/Makefile
>> index 1e3c281156..2ce7d671fe 100644
>> --- a/package/utils/mtd-utils/Makefile
>> +++ b/package/utils/mtd-utils/Makefile
>> @@ -8,15 +8,15 @@
>>  include $(TOPDIR)/rules.mk
>>
>>  PKG_NAME:=mtd-utils
>> -PKG_VERSION:=1.5.2
>> +PKG_VERSION:=2.0.2
>>  PKG_RELEASE:=1
>>
>> -PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
>> -PKG_SOURCE_PROTO:=git
>> -PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
>> -PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
>> +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>> +PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
>> +PKG_HASH:=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8
>>
>>  PKG_INSTALL:=1
>> +PKG_FIXUP:=autoreconf
>>
>>  PKG_FLAGS:=nonshared
>>
>> @@ -54,12 +54,12 @@ define Package/nand-utils/description
>>Utilities for NAND devices.
>>  endef
>>
>> -MAKE_FLAGS += \
>> -   DESTDIR="$(PKG_INSTALL_DIR)" \
>> -   BUILDDIR="$(PKG_BUILD_DIR)" \
>> -   LDLIBS+="$(LIBGCC_S)" \
>> -   WITHOUT_XATTR=1 \
>> -   WITHOUT_LZO=1
>> +MAKE_FLAGS += LDLIBS+="$(LIBGCC_S)"
>> +
>> +CONFIGURE_ARGS += \
>> +   --disable-tests \
>> +   --without-xattr \
>> +   --without-lzo
>>
>>  define Package/ubi-utils/install
>> $(INSTALL_DIR) $(1)/usr/sbin
>> diff --git a/package/utils/mtd-utils/patches/010-fix-rpmatch.patch 
>> b/package/utils/mtd-utils/patches/010-fix-rpmatch.patch
>> deleted file mode 100644
>> index 8374a26e9b..00
>> --- a/package/utils/mtd-utils/patches/010-fix-rpmatch.patch
>> +++ /dev/null
>> @@ -1,19 +0,0 @@
>>  a/include/common.h
>> -+++ b/include/common.h
>> -@@ -152,10 +152,12 @@ static inline bool prompt(const char *ms
>> -   }
>> -
>> -   if (strcmp("\n", line) != 0) {
>> --  switch (rpmatch(line)) {
>> --  case 0: ret = false; break;
>> --  case 1: ret = true; break;
>> --  case -1:
>> -+  switch (line[0]) {
>> -+  case 'N':
>> -+  case 'n': ret = false; break;
>> -+  case 'Y':
>> -+  case 'y': ret = true; break;
>> -+  default:
>> -   puts("unknown response; please try again");
>> -   continue;
>> -   }
>> diff --git a/package/utils/mtd-utils/patches/100-fix_includes.patch 
>> b/package/utils/mtd-utils/patches/100-fix_includes.patch
>> index 7dad28b472..cc75052c5e 100644
>> --- a/package/utils/mtd-utils/patches/100-fix_includes.patch
>> +++ b/package/utils/mtd-utils/patches/100-fix_includes.patch
>> @@ -5,6 +5,6 @@
>>   #include 
>>   #include 
>>  +#include 
>> + #include &q

Re: [LEDE-DEV] [PATCH v2 1/5] tools/zlib: move zlib build to tools

[Hauke Mehrtens]

On 04/20/2018 12:12 AM, Hauke Mehrtens wrote:
> This allows us to link the other tools against our libz and we do not
> need the system zlib any more.
> 
> Only the static linked library is copied to the staging directory so we
> have a statically linked library on all systems and not only on Linux.
> This also adds the new dependencies of the packages which are depending
> on zlib.
> 
> Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
> ---
> 
> changes since v1:
> * add HOST_CFLAGS +=-fPIC
> 
>  include/prereq-build.mk |  5 ---
>  package/libs/zlib/Makefile  |  2 --
>  tools/Makefile  | 14 ++---
>  tools/lzma-old/Makefile |  2 ++
>  tools/lzma-old/patches/120-add-cflags.patch | 11 +++
>  tools/make-ext4fs/Makefile  |  8 +
>  tools/make-ext4fs/patches/100-add-ldflags.patch | 11 +++
>  tools/squashfs4/Makefile|  2 +-
>  tools/zlib/Makefile | 41 
> +
>  9 files changed, 76 insertions(+), 20 deletions(-)
>  create mode 100644 tools/lzma-old/patches/120-add-cflags.patch
>  create mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch
>  create mode 100644 tools/zlib/Makefile
> 
> diff --git a/include/prereq-build.mk b/include/prereq-build.mk
> index 6917716342..5b9a7e049d 100644
> --- a/include/prereq-build.mk
> +++ b/include/prereq-build.mk
> @@ -76,11 +76,6 @@ else
>zlib_link_flags := -lz
>  endif
>  
> -$(eval $(call TestHostCommand,zlib, \
> - Please install a static zlib. (Missing libz.a or zlib.h), \
> - echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' 
> | \
> - gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - 
> $(zlib_link_flags)))
> -
>  $(eval $(call TestHostCommand,perl-thread-queue, \
>   Please install the Perl Thread::Queue module, \
>   perl -MThread::Queue -e 1))
> diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
> index a7c61f7dd0..4a2a0e53b0 100644
> --- a/package/libs/zlib/Makefile
> +++ b/package/libs/zlib/Makefile
> @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:gnu:zlib
>  
>  PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
>  
> -include $(INCLUDE_DIR)/host-build.mk
>  include $(INCLUDE_DIR)/package.mk
>  include $(INCLUDE_DIR)/cmake.mk
>  
> @@ -95,6 +94,5 @@ define Package/zlib-dev/install
> $(1)/usr/lib/pkgconfig/
>  endef
>  
> -$(eval $(call HostBuild))
>  $(eval $(call BuildPackage,zlib))
>  $(eval $(call BuildPackage,zlib-dev))
> diff --git a/tools/Makefile b/tools/Makefile
> index 50bd552d75..8dfab9892b 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -22,7 +22,7 @@ ifneq 
> ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar
>  endif
>  
>  tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat
> -tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs
> +tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib
>  tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
>  tools-y += firmware-utils patch-image quilt padjffs2
>  tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt 
> patchelf
> @@ -43,16 +43,16 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
>  $(curdir)/flex/compile := $(curdir)/libtool/compile
>  $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
> $(curdir)/automake/compile $(curdir)/missing-macros/compile
>  $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
> -$(curdir)/squashfs4/compile := $(curdir)/xz/compile
> +$(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
>  $(curdir)/quilt/compile := $(curdir)/autoconf/compile 
> $(curdir)/findutils/compile
>  $(curdir)/autoconf/compile := $(curdir)/m4/compile
>  $(curdir)/automake/compile := $(curdir)/m4/compile 
> $(curdir)/autoconf/compile $(curdir)/pkg-config/compile $(curdir)/xz/compile
>  $(curdir)/gmp/compile := $(curdir)/libtool/compile
>  $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
>  $(curdir)/mpfr/compile := $(curdir)/gmp/compile
> -$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile
> +$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
> $(curdir)/zlib/compile
>  $(curdir)/mklibs/compile := $(curdir)/libtool/compile
> -$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile
> +$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
>  $(curdir)/upslug2/compile := $(curdir)/libtool/compile
>  $(curdir)/mm-macros/compile := $(curdir)/libtool/compile
>  $(curdir)/missing-macros/compile 

Re: [LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

[Hauke Mehrtens]

On 04/20/2018 01:10 PM, Koen Vandeputte wrote:
> 
> 
> On 2018-04-20 00:15, Hauke Mehrtens wrote:
>> On 04/18/2018 12:24 AM, Koen Vandeputte wrote:
> 
>> 
> 
>>>> I tested the patch series because I have a linking problem with zlib
>>>> and python an I wanted to see if this fixes it (it does not) but on
>>>> i686 I have this error
>>>>
>>>>
>>>> make[8]: Entering directory
>>>> '/home/build/proxy/build_dir/hostpkg/glib-2.56.1/gio'
>>>>    CCLD libgio-2.0.la
>>>> /usr/bin/ld: /home/build/proxy/staging_dir/host/lib/libz.a(deflate.o):
>>>> relocation R_X86_64_PC32 against symbol `_length_code' can not be used
>>>> when making a shared object; recompile with -fPIC
>>>> /usr/bin/ld: final link failed: Bad value
>>>> collect2: error: ld returned 1 exit status
>>>> Makefile:2183: recipe for target 'libgio-2.0.la' failed
>>>>
>>>>
>>> Hi Hauke,
>>>
>>> Probably related to the above?
>>>
>>> When I'm building using this patch series, I'm getting a python build
>>> error.
>>> Please see attached logfile.
>>> Reverting the series fixes the build issue.
>>>
>>>
>>> Do note that I'm also using my own config, which adds all feeds and uses
>>> a lot more packages than default OpenWrt.
>>>
>>> Thanks,
>>>
>>> Koen
>> I am not able to reproduce this problem and it looks strange because you
>> have some compile problems related to OpenSSL functions.
>>
>> Can you provide me with a configuration which triggers this problem
>> please? Are you only using these 5 patches on top of master or do you
>> use also some other patches on top of master?
>>
>> Hauke
> Hi Hauke,
> 
> I'm currently testing the V2 series.
> The fpic addition fixes the build issues.
> 
> 
> Also,
> 
> Previously I mentioned the following issue on imx6 (ubi):
> 
> - Make owrt build
> - Add custom files using imagebuilder
> - Flash (jtag or tftp via uboot)
> - Boot 1st time (all is OK)
> - Boot 2nd time (custom files are corrupt now)
> 
> 
> After testing this a few times using JTAG on the same board (which had a
> repro rate of 100%) .. the issue seems fixed at first glance.
> I wasn't able to reproduce it in the last 5 tests.

Interesting problem, this is fixed now with the v2 patches, so probably
with the update to version 2.0.2, but there are not so many changes in
there.

> There are 2 warnings left:
> 
> WARNING: Makefile 'package/feeds/packages/python/Makefile' has a build
> dependency on 'zlib/host', which does not exist
> WARNING: Makefile 'package/feeds/packages/python3/Makefile' has a build
> dependency on 'zlib/host', which does not exist
> 
> 
> So when applying the series, an extra fix is probably needed in the
> package repo to get rid of the warnings.

I will take care of these later.

> Besides this, no regression seen so far ..

Thanks for testing.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

[Hauke Mehrtens]

On 04/18/2018 09:44 AM, Lucian Cristian wrote:
> On 18.04.2018 01:24, Koen Vandeputte wrote:
>>
>>
>> On 17-04-18 19:16, Lucian Cristian wrote:
>>> On 16.04.2018 01:53, Hauke Mehrtens wrote:
>>>> This allows us to link the other tools against our libz and we do not
>>>> need the system zlib any more.
>>>>
> [...]
>>>> +endef
>>>> +
>>>> +$(eval $(call HostBuild))
>>>
>>> I tested the patch series because I have a linking problem with zlib
>>> and python an I wanted to see if this fixes it (it does not) but on
>>> i686 I have this error
>>>
>>>
>>> make[8]: Entering directory
>>> '/home/build/proxy/build_dir/hostpkg/glib-2.56.1/gio'
>>>   CCLD libgio-2.0.la
>>> /usr/bin/ld:
>>> /home/build/proxy/staging_dir/host/lib/libz.a(deflate.o): relocation
>>> R_X86_64_PC32 against symbol `_length_code' can not be used when
>>> making a shared object; recompile with -fPIC
>>> /usr/bin/ld: final link failed: Bad value
>>> collect2: error: ld returned 1 exit status
>>> Makefile:2183: recipe for target 'libgio-2.0.la' failed
>>>
>>>
>> Hi Hauke,
>>
>> Probably related to the above?
>>
>> When I'm building using this patch series, I'm getting a python build
>> error.
>> Please see attached logfile.
>> Reverting the series fixes the build issue.
>>
>>
>> Do note that I'm also using my own config, which adds all feeds and
>> uses a lot more packages than default OpenWrt.
>>
>> Thanks,
>>
>> Koen
> 
> /usr/bin/ld:
> /mnt/ramdisk/test/firmware/builds/generic_imx6/staging_dir/host/lib/libz.a(crc32.o):
> relocation R_X86_64_32S against `.rodata' can not be used when making a
> shared object; recompile with -fPIC
> /mnt/ramdisk/test/firmware/builds/generic_imx6/staging_dir/host/lib/libz.a:
> error adding symbols: Bad value
> collect2: error: ld returned 1 exit status
> 
> I looked in Makefile and there is TARGET_CFLAGS += $(FPIC) so it means
> it should already have -fPIC ?
> 

H,

I fixed the build error in glib2 by adding a -fPIC host cflag to the zlib.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

[Hauke Mehrtens]

On 04/18/2018 12:24 AM, Koen Vandeputte wrote:
> 
> 
> On 17-04-18 19:16, Lucian Cristian wrote:
>> On 16.04.2018 01:53, Hauke Mehrtens wrote:
>>> This allows us to link the other tools against our libz and we do not
>>> need the system zlib any more.
>>>
>>> Only the static linked library is copied to the staging directory so we
>>> have a statically linked library on all systems and not only on Linux.
>>> This also adds the new dependencies of the packages which are depending
>>> on zlib.
>>>
>>> Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
>>> ---
>>>   include/prereq-build.mk |  5 
>>>   package/libs/zlib/Makefile  |  2 --
>>>   tools/Makefile  | 14 +
>>>   tools/lzma-old/Makefile |  2 ++
>>>   tools/lzma-old/patches/120-add-cflags.patch | 11 +++
>>>   tools/make-ext4fs/Makefile  |  8 +
>>>   tools/make-ext4fs/patches/100-add-ldflags.patch | 11 +++
>>>   tools/squashfs4/Makefile    |  2 +-
>>>   tools/zlib/Makefile | 40
>>> +
>>>   9 files changed, 75 insertions(+), 20 deletions(-)
>>>   create mode 100644 tools/lzma-old/patches/120-add-cflags.patch
>>>   create mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch
>>>   create mode 100644 tools/zlib/Makefile
>>>
>>> diff --git a/include/prereq-build.mk b/include/prereq-build.mk
>>> index 6917716342..5b9a7e049d 100644
>>> --- a/include/prereq-build.mk
>>> +++ b/include/prereq-build.mk
>>> @@ -76,11 +76,6 @@ else
>>>     zlib_link_flags := -lz
>>>   endif
>>>   -$(eval $(call TestHostCommand,zlib, \
>>> -    Please install a static zlib. (Missing libz.a or zlib.h), \
>>> -    echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return
>>> 0; }' | \
>>> -    gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -
>>> $(zlib_link_flags)))
>>> -
>>>   $(eval $(call TestHostCommand,perl-thread-queue, \
>>>   Please install the Perl Thread::Queue module, \
>>>   perl -MThread::Queue -e 1))
>>> diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
>>> index a7c61f7dd0..4a2a0e53b0 100644
>>> --- a/package/libs/zlib/Makefile
>>> +++ b/package/libs/zlib/Makefile
>>> @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:gnu:zlib
>>>     PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
>>>   -include $(INCLUDE_DIR)/host-build.mk
>>>   include $(INCLUDE_DIR)/package.mk
>>>   include $(INCLUDE_DIR)/cmake.mk
>>>   @@ -95,6 +94,5 @@ define Package/zlib-dev/install
>>>     $(1)/usr/lib/pkgconfig/
>>>   endef
>>>   -$(eval $(call HostBuild))
>>>   $(eval $(call BuildPackage,zlib))
>>>   $(eval $(call BuildPackage,zlib-dev))
>>> diff --git a/tools/Makefile b/tools/Makefile
>>> index 50bd552d75..8dfab9892b 100644
>>> --- a/tools/Makefile
>>> +++ b/tools/Makefile
>>> @@ -22,7 +22,7 @@ ifneq
>>> ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar
>>>
>>>   endif
>>>     tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat
>>> -tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs
>>> +tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs
>>> zlib
>>>   tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
>>>   tools-y += firmware-utils patch-image quilt padjffs2
>>>   tools-y += mm-macros missing-macros cmake scons bc findutils
>>> gengetopt patchelf
>>> @@ -43,16 +43,16 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
>>>   $(curdir)/flex/compile := $(curdir)/libtool/compile
>>>   $(curdir)/libtool/compile := $(curdir)/m4/compile
>>> $(curdir)/autoconf/compile $(curdir)/automake/compile
>>> $(curdir)/missing-macros/compile
>>>   $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
>>> -$(curdir)/squashfs4/compile := $(curdir)/xz/compile
>>> +$(curdir)/squashfs4/compile := $(curdir)/xz/compile
>>> $(curdir)/zlib/compile
>>>   $(curdir)/quilt/compile := $(curdir)/autoconf/compile
>>> $(curdir)/findutils/compile
>>>   $(curdir)/autoconf/compile := $(curdir)/m4/compile
>>>   $(curdir)/automake/compile := $(curdir)/m4/compile
>>> $(curdir)/autoconf/compile $(curdir)/pkg-config/

[LEDE-DEV] [PATCH v2 3/5] tools/mtd-utils: update to version 2.0.2

[Hauke Mehrtens]

This version now uses autotools to configure the build system. They are
also using the newly added zlib package.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---

changes since v1:
* Update to version 2.0.2
* use ftp to download the tar

 tools/Makefile |   2 +-
 tools/mtd-utils/Makefile   |  46 +++-
 tools/mtd-utils/patches/100-sscanf_fix.patch   |   6 +-
 tools/mtd-utils/patches/110-portability.patch  |  51 +
 .../mtd-utils/patches/120-include_sysmacros.patch  |  25 -
 tools/mtd-utils/patches/130-lzma_jffs2.patch   |  65 +--
 .../patches/135-mkubifs_optional_lzo.patch | 119 -
 ...igen-add-ubigen_write_terminator-function.patch |   8 +-
 .../201-ubinize-add-terminator-support.patch   |  23 ++--
 .../patches/310-add-static-linking-option.patch|  43 
 .../patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch |  16 +--
 11 files changed, 101 insertions(+), 303 deletions(-)
 delete mode 100644 tools/mtd-utils/patches/120-include_sysmacros.patch
 delete mode 100644 tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
 delete mode 100644 tools/mtd-utils/patches/310-add-static-linking-option.patch

diff --git a/tools/Makefile b/tools/Makefile
index 8dfab9892b..d2b5daf18c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -50,7 +50,7 @@ $(curdir)/automake/compile := $(curdir)/m4/compile 
$(curdir)/autoconf/compile $(
 $(curdir)/gmp/compile := $(curdir)/libtool/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
$(curdir)/zlib/compile
+$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile 
$(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/mklibs/compile := $(curdir)/libtool/compile
 $(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/upslug2/compile := $(curdir)/libtool/compile
diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 7b4a91a73d..1527d10579 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,44 +7,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=1.5.2
+PKG_VERSION:=2.0.2
 
-PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
-PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
-PKG_SOURCE_PROTO:=git
-PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
+PKG_HASH:=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8
+
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
-CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) 
-L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
-ifneq ($(HOST_OS),Linux)
-CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include endian.h 
-I$(CURDIR)/include -include fls.h
-MTD_STATIC := 0
-else
-MTD_STATIC := 1
-endif
-
-MTD_MAKEOPTS = \
-   CFLAGS="$(CFLAGS)" \
-   LDFLAGS="$(HOST_LDFLAGS)" \
-   WITHOUT_LZO=1 WITHOUT_XATTR=1 \
-   SUBDIRS="" \
-   BUILDDIR="$(HOST_BUILD_DIR)" \
-   STATIC=$(MTD_STATIC) \
-   V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1)
-
-define Host/Compile
-   $(MAKE) -C $(HOST_BUILD_DIR) \
-   $(MTD_MAKEOPTS) \
-   TARGETS="mkfs.jffs2 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
-endef
+
+HOST_CONFIGURE_VARS+= \
+   UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
+
+HOST_CONFIGURE_ARGS+= \
+   --disable-tests \
+   --without-xattr \
+   --without-lzo
 
 define Host/Install
$(CP) \
$(HOST_BUILD_DIR)/mkfs.jffs2 \
-   $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
-   $(HOST_BUILD_DIR)/ubi-utils/ubinize \
+   $(HOST_BUILD_DIR)/mkfs.ubifs \
+   $(HOST_BUILD_DIR)/ubinize \
$(STAGING_DIR_HOST)/bin/
 endef
 
diff --git a/tools/mtd-utils/patches/100-sscanf_fix.patch 
b/tools/mtd-utils/patches/100-sscanf_fix.patch
index 0af583f4cb..ae6f86722b 100644
--- a/tools/mtd-utils/patches/100-sscanf_fix.patch
+++ b/tools/mtd-utils/patches/100-sscanf_fix.patch
@@ -1,6 +1,6 @@
 a/mkfs.jffs2.c
-+++ b/mkfs.jffs2.c
-@@ -422,7 +422,7 @@ static int interpret_table_entry(struct
+--- a/jffsX-utils/mkfs.jffs2.c
 b/jffsX-utils/mkfs.jffs2.c
+@@ -427,7 +427,7 @@ static int interpret_table_entry(struct
  
if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu 
%lu",
SCANF_STRING(name), , , , , 
, ,
diff --git a/tools/mtd-utils/patches/110-portability.patch 
b/tools/mtd-utils/patches/110-portability.patch
index c4cdab928a..a2942270d7 100644
--- a/tools/mtd-u

[LEDE-DEV] [PATCH v2 2/5] tools/mtd-utils: Mark some lzma functions as static

[Hauke Mehrtens]

These functions are not declared in any header file and only used in
same compile unit, mark them as static to remove one gcc warning and
make it easier for the compiler to optimize them out.

This also fixes some style problems to make this patch match the version
in the packages folder.

This is copied from this commit to the mtd-utils we pack into the image:
56d0dd56e9c6efa79 ("mtd-utils: Mark some lzma functions as static")

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 tools/mtd-utils/patches/130-lzma_jffs2.patch | 74 ++--
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch 
b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index b04f019922..05ced4f42c 100644
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -26,7 +26,7 @@
jffs2_lzo_init();
  #endif
 +#ifdef CONFIG_JFFS2_LZMA
-+jffs2_lzma_init();
++  jffs2_lzma_init();
 +#endif
return 0;
  }
@@ -36,7 +36,7 @@
jffs2_lzo_exit();
  #endif
 +#ifdef CONFIG_JFFS2_LZMA
-+jffs2_lzma_exit();
++  jffs2_lzma_exit();
 +#endif
return 0;
  }
@@ -119,7 +119,7 @@
 +  return -1;
 +  }
 +
-+return 0;
++  return 0;
 +}
 +
 +STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char 
*cpage_out,
@@ -175,26 +175,26 @@
 +
 +int INIT jffs2_lzma_init(void)
 +{
-+int ret;
++  int ret;
 +  CLzmaEncProps props;
 +  LzmaEncProps_Init();
 +
-+props.dictSize = LZMA_BEST_DICT(0x2000);
-+props.level = LZMA_BEST_LEVEL;
-+props.lc = LZMA_BEST_LC;
-+props.lp = LZMA_BEST_LP;
-+props.pb = LZMA_BEST_PB;
-+props.fb = LZMA_BEST_FB;
++  props.dictSize = LZMA_BEST_DICT(0x2000);
++  props.level = LZMA_BEST_LEVEL;
++  props.lc = LZMA_BEST_LC;
++  props.lp = LZMA_BEST_LP;
++  props.pb = LZMA_BEST_PB;
++  props.fb = LZMA_BEST_FB;
 +
 +  ret = lzma_alloc_workspace();
-+if (ret < 0)
-+return ret;
++  if (ret < 0)
++  return ret;
 +
 +  ret = jffs2_register_compressor(_lzma_comp);
 +  if (ret)
 +  lzma_free_workspace();
 +  
-+return ret;
++  return ret;
 +}
 +
 +void jffs2_lzma_exit(void)
@@ -245,7 +245,7 @@
 +  #define LZMA_FREE free
 +  #define PRINT_ERROR(msg) fprintf(stderr, msg)
 +  #define INIT
-+  #define STATIC
++  #define STATIC static
 +#endif
 +
 +#include "lzma/LzmaDec.h"
@@ -261,16 +261,16 @@
 +
 +static void *p_lzma_malloc(void *p, size_t size)
 +{
-+if (size == 0)
-+return NULL;
++  if (size == 0)
++  return NULL;
 +
-+return LZMA_MALLOC(size);
++  return LZMA_MALLOC(size);
 +}
 +
 +static void p_lzma_free(void *p, void *address)
 +{
-+if (address != NULL)
-+LZMA_FREE(address);
++  if (address != NULL)
++  LZMA_FREE(address);
 +}
 +
 +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
@@ -949,9 +949,9 @@
 +}
 +
 +Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; 
}
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
 +
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
 +
 +void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
 +{
@@ -2357,7 +2357,7 @@
 +  p->needFlush = 0;
 +}
 +
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) 
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool 
initState) 
 +{ 
 +  p->needFlush = 1; 
 +  p->remainLen = 0; 
@@ -2777,7 +2777,7 @@
 +#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
 +#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
 +
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
 +{
 +  int c = 2, slotFast;
 +  g_FastPos[0] = 0;
@@ -3031,7 +3031,7 @@
 +  CSaveState saveState;
 +} CLzmaEnc;
 +
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
++static void LzmaEnc_SaveState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
 +  CSaveState *dest = >saveState;
@@ -3057,7 +3057,7 @@
 +  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
 +}
 +
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++static void LzmaEnc_RestoreState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *dest = (CLzmaEnc *)pp;
 +  const CSaveState *p = >saveState;
@@ -3300,7 +3300,7 @@
 +  while (symbol < 0x1);
 +}
 +
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
 +{
 

[LEDE-DEV] [PATCH v2 1/5] tools/zlib: move zlib build to tools

[Hauke Mehrtens]

This allows us to link the other tools against our libz and we do not
need the system zlib any more.

Only the static linked library is copied to the staging directory so we
have a statically linked library on all systems and not only on Linux.
This also adds the new dependencies of the packages which are depending
on zlib.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---

changes since v1:
* add HOST_CFLAGS +=-fPIC

 include/prereq-build.mk |  5 ---
 package/libs/zlib/Makefile  |  2 --
 tools/Makefile  | 14 ++---
 tools/lzma-old/Makefile |  2 ++
 tools/lzma-old/patches/120-add-cflags.patch | 11 +++
 tools/make-ext4fs/Makefile  |  8 +
 tools/make-ext4fs/patches/100-add-ldflags.patch | 11 +++
 tools/squashfs4/Makefile|  2 +-
 tools/zlib/Makefile | 41 +
 9 files changed, 76 insertions(+), 20 deletions(-)
 create mode 100644 tools/lzma-old/patches/120-add-cflags.patch
 create mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch
 create mode 100644 tools/zlib/Makefile

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 6917716342..5b9a7e049d 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -76,11 +76,6 @@ else
   zlib_link_flags := -lz
 endif
 
-$(eval $(call TestHostCommand,zlib, \
-   Please install a static zlib. (Missing libz.a or zlib.h), \
-   echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' 
| \
-   gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - 
$(zlib_link_flags)))
-
 $(eval $(call TestHostCommand,perl-thread-queue, \
Please install the Perl Thread::Queue module, \
perl -MThread::Queue -e 1))
diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index a7c61f7dd0..4a2a0e53b0 100644
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:gnu:zlib
 
 PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
 
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -95,6 +94,5 @@ define Package/zlib-dev/install
  $(1)/usr/lib/pkgconfig/
 endef
 
-$(eval $(call HostBuild))
 $(eval $(call BuildPackage,zlib))
 $(eval $(call BuildPackage,zlib-dev))
diff --git a/tools/Makefile b/tools/Makefile
index 50bd552d75..8dfab9892b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,7 +22,7 @@ ifneq 
($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar
 endif
 
 tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat
-tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs
+tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib
 tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
 tools-y += firmware-utils patch-image quilt padjffs2
 tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf
@@ -43,16 +43,16 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
 $(curdir)/flex/compile := $(curdir)/libtool/compile
 $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
$(curdir)/automake/compile $(curdir)/missing-macros/compile
 $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
-$(curdir)/squashfs4/compile := $(curdir)/xz/compile
+$(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile 
$(curdir)/findutils/compile
 $(curdir)/autoconf/compile := $(curdir)/m4/compile
 $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
$(curdir)/pkg-config/compile $(curdir)/xz/compile
 $(curdir)/gmp/compile := $(curdir)/libtool/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile
+$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
$(curdir)/zlib/compile
 $(curdir)/mklibs/compile := $(curdir)/libtool/compile
-$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile
+$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/upslug2/compile := $(curdir)/libtool/compile
 $(curdir)/mm-macros/compile := $(curdir)/libtool/compile
 $(curdir)/missing-macros/compile := $(curdir)/autoconf/compile
@@ -69,8 +69,12 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile
 $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile 
$(curdir)/automake/compile
 $(curdir)/libressl/compile := $(curdir)/pkg-config/compile
 $(curdir)/mkimage/compile += $(curdir)/libressl/compile
-$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile
+$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile 
$(curdir)/zlib/compile
 $(curdir)/cmake/compile += $(curdir)/libressl/compile
+$(curdir)/zlib/compile := $(curdir)/cmake/c

[LEDE-DEV] [PATCH v2 4/5] mtd-utils: update to 2.0.2

[Hauke Mehrtens]

From: Syrone Wong 

010-fix-rpmatch.patch is upstream, removed from our patchset
The file structure is changed, modify patch accordingly
use CONFIGURE_ARGS to disable tests, xattr and lzo

Compile and run tested on mvebu and x86_64

Signed-off-by: Syrone Wong 
---

changes since v1:
* Update to version 2.0.2
* use ftp to download the tar

 package/utils/mtd-utils/Makefile   | 22 
 .../utils/mtd-utils/patches/010-fix-rpmatch.patch  | 19 ---
 .../utils/mtd-utils/patches/100-fix_includes.patch |  2 +-
 .../utils/mtd-utils/patches/130-lzma_jffs2.patch   | 66 --
 4 files changed, 47 insertions(+), 62 deletions(-)
 delete mode 100644 package/utils/mtd-utils/patches/010-fix-rpmatch.patch

diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile
index 1e3c281156..2ce7d671fe 100644
--- a/package/utils/mtd-utils/Makefile
+++ b/package/utils/mtd-utils/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=1.5.2
+PKG_VERSION:=2.0.2
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
-PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
+PKG_HASH:=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8
 
 PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
 
 PKG_FLAGS:=nonshared
 
@@ -54,12 +54,12 @@ define Package/nand-utils/description
   Utilities for NAND devices.
 endef
 
-MAKE_FLAGS += \
-   DESTDIR="$(PKG_INSTALL_DIR)" \
-   BUILDDIR="$(PKG_BUILD_DIR)" \
-   LDLIBS+="$(LIBGCC_S)" \
-   WITHOUT_XATTR=1 \
-   WITHOUT_LZO=1
+MAKE_FLAGS += LDLIBS+="$(LIBGCC_S)"
+
+CONFIGURE_ARGS += \
+   --disable-tests \
+   --without-xattr \
+   --without-lzo
 
 define Package/ubi-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
diff --git a/package/utils/mtd-utils/patches/010-fix-rpmatch.patch 
b/package/utils/mtd-utils/patches/010-fix-rpmatch.patch
deleted file mode 100644
index 8374a26e9b..00
--- a/package/utils/mtd-utils/patches/010-fix-rpmatch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 a/include/common.h
-+++ b/include/common.h
-@@ -152,10 +152,12 @@ static inline bool prompt(const char *ms
-   }
- 
-   if (strcmp("\n", line) != 0) {
--  switch (rpmatch(line)) {
--  case 0: ret = false; break;
--  case 1: ret = true; break;
--  case -1:
-+  switch (line[0]) {
-+  case 'N':
-+  case 'n': ret = false; break;
-+  case 'Y':
-+  case 'y': ret = true; break;
-+  default:
-   puts("unknown response; please try again");
-   continue;
-   }
diff --git a/package/utils/mtd-utils/patches/100-fix_includes.patch 
b/package/utils/mtd-utils/patches/100-fix_includes.patch
index 7dad28b472..cc75052c5e 100644
--- a/package/utils/mtd-utils/patches/100-fix_includes.patch
+++ b/package/utils/mtd-utils/patches/100-fix_includes.patch
@@ -5,6 +5,6 @@
  #include 
  #include 
 +#include 
+ #include "libfec.h"
  
  /*
-  * stuff used for testing purposes only
diff --git a/package/utils/mtd-utils/patches/130-lzma_jffs2.patch 
b/package/utils/mtd-utils/patches/130-lzma_jffs2.patch
index c6454fed57..d9cbfeebec 100644
--- a/package/utils/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/package/utils/mtd-utils/patches/130-lzma_jffs2.patch
@@ -1,25 +1,29 @@
 a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
+--- a/jffsX-utils/Makemodule.am
 b/jffsX-utils/Makemodule.am
+@@ -4,11 +4,19 @@ mkfs_jffs2_SOURCES = \
+   jffsX-utils/compr_zlib.c \
+   jffsX-utils/compr.h \
+   jffsX-utils/rbtree.c \
+-  jffsX-utils/compr_lzo.c \
++  jffsX-utils/compr_lzma.c \
++  jffsX-utils/lzma/LzFind.c \
++  jffsX-utils/lzma/LzmaEnc.c \
++  jffsX-utils/lzma/LzmaDec.c \
+   jffsX-utils/compr.c \
+   jffsX-utils/compr_rtime.c
++
++if !WITHOUT_LZO
++mkfs_jffs2_SOURCES += jffsX-utils/compr_lzo.c
++endif
++
+ mkfs_jffs2_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS)
+-mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
++mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) 
-I./include/linux/lzma
  
- VERSION = 1.5.2
- 
--CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include 
-I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS)
-+CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include 
-I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) 
-I./include/linux/lzma
- 
- ifeq ($(WITHOUT_XATTR), 1)
-   CPPFLAGS += -DWITHOUT_XATTR
-@@ -84,7 +84,7 @@ 

[LEDE-DEV] [PATCH v2 5/5] mtd-utils: activate --gc-sections

[Hauke Mehrtens]

This reduces the size of the binary a bit:

old:
 37556 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 81697 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

new:
 27450 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 71796 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/utils/mtd-utils/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile
index 2ce7d671fe..ca60726d81 100644
--- a/package/utils/mtd-utils/Makefile
+++ b/package/utils/mtd-utils/Makefile
@@ -61,6 +61,9 @@ CONFIGURE_ARGS += \
--without-xattr \
--without-lzo
 
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
 define Package/ubi-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) \
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] mbedtls: change libmbedcrypto.so soversion back to 0

[Hauke Mehrtens]

On 04/16/2018 01:01 AM, Syrone Wong wrote:
> Why? the lib version bump means ABI incompatibility. The correct way
> is to bump release to rebuild instead of decreasing it.
> 
> 
> Best Regards,
> Syrone Wong

Let me explain what happened in mbedtls first.

This change was added on version 2.7.0:
https://github.com/ARMmbed/mbedtls/commit/bee0635b1593d879504e04136c3d10ce36cd6e34
It adds new functions with _ext postfix (renamed to _ret before the
2.7.0 release) and the old functions are replaced with a static inline.
This was a binary incompatible change.
The soversion for the 2.7.0 release was changed to 1.

With version 2.8.0 the static inline of the old functions was replaced
with a real function being implemented in the binary, this way binaries
linked against the old version will still work with the new version, see:
https://github.com/ARMmbed/mbedtls/commit/041039f81e61191581f5112bb8e9d27a95d3d873

2.8.0 still uses the soversion 1.

The version 2.7.2 also contains the changeset which replaced the static
inline and made it binary compatible again, here the soversion was
increased to 2.

After thinking again about this, I would stay with soversion 1 in master
and increase the pkg release of the packages which depend on mbedtls.
On lede 17.01 I decreases the soversion to 0 again and use the mbedtls
version 2.7.2 that should be save.
I hope there are no more ABI changes in the code, then it should be save
to use applications linked against old mbedtls versions in lede 17.01
with a recent mbedtls version.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH 3/5] tools/mtd-utils: update to version 2.0.1

[Hauke Mehrtens]

On 04/16/2018 11:22 AM, Koen Vandeputte wrote:
> Hi Hauke,
> 
> Thank you very much for this patch!!
> I will try to give it a spin today on imx6 hardware and specifically by
> using the imagebuilder.

Yes that would be nice, please report back if it worked or if you saw
any problems.
It would also be nice if someone could test this with MacOSX as the libz
changes could cause some regressions there.

> Noticing the upstream git repo, there were a few important fixes
> (especially for ubifs).
> Would you be in favor of:
> 
> - Skip these until considered stable
> - Backport them
> - Bump mtd-utils to git head iso this specific tag?

Version 2.0.2 was release 4 hours ago, so I would suggest to directly
upgrade to that version.

> Commits:
> 
> ba145d80e239 ("misc-utils: flash_erase: Fix Jffs2 type flash erase
> problem")
> 044ed4c0dd78 "(mtd-utils: ubifs: fix typo in without_lzo definition")
> 80de29a464c7 "(mkfs.ubifs: Allow root entry in device table")
> 3b421ab6144c "(mkfs.ubifs: ignore EOPNOTSUPP when listing extended
> attributes")
> afba4fc3b7e9 "(mkfs.ubifs: Apply squash-uids to the root node")

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] mbedtls: change libmbedcrypto.so soversion back to 0

[Hauke Mehrtens]

mbedtls changed in version 2.7.0 the soversion of the libmbedcrypto.so
library, use the old version again to be able to use the new library
with binaries compiled against the old mbedtls library.

Some binaries got rebuild to for the 2.7.0 release and are now using
libmbedcrypto.so.1, the older ones are still using libmbedcrypto.so.0.
Go back to libmbedcrypto.so.0 and make the system rebuild the binaries
which were rebuild for 2.7.0 again.

This should make the libmbedcrypto.so library be compatible with the old
version shipped with 17.01.

Fixes: 75c5ab4ca ("mbedtls: update to version 2.7.0")
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/libs/mbedtls/Makefile  |  2 +-
 .../patches/300-soversion-compatibility.patch  | 26 ++
 package/libs/ustream-ssl/Makefile  |  2 +-
 package/network/services/openvpn/Makefile  |  2 +-
 package/network/utils/curl/Makefile|  2 +-
 package/utils/px5g/Makefile|  2 +-
 6 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 
package/libs/mbedtls/patches/300-soversion-compatibility.patch

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 8ac4e3b13e..6b9f6d73bd 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mbedtls
 PKG_VERSION:=2.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
diff --git a/package/libs/mbedtls/patches/300-soversion-compatibility.patch 
b/package/libs/mbedtls/patches/300-soversion-compatibility.patch
new file mode 100644
index 00..159257abab
--- /dev/null
+++ b/package/libs/mbedtls/patches/300-soversion-compatibility.patch
@@ -0,0 +1,26 @@
+mbedtls changed in version 2.7.0 and 2.7.2 the soversion of the
+libmbedcrypto.so library, use the old version again to be able to use
+the new library with binaries compiled against the old library.
+
+--- a/library/CMakeLists.txt
 b/library/CMakeLists.txt
+@@ -141,7 +141,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
+ 
+ if(USE_SHARED_MBEDTLS_LIBRARY)
+ add_library(mbedcrypto SHARED ${src_crypto})
+-set_target_properties(mbedcrypto PROPERTIES VERSION 2.8.0 SOVERSION 1)
++set_target_properties(mbedcrypto PROPERTIES VERSION 2.8.0 SOVERSION 0)
+ target_link_libraries(mbedcrypto ${libs})
+ 
+ add_library(mbedx509 SHARED ${src_x509})
+--- a/library/Makefile
 b/library/Makefile
+@@ -33,7 +33,7 @@ endif
+ 
+ SOEXT_TLS=so.10
+ SOEXT_X509=so.0
+-SOEXT_CRYPTO=so.1
++SOEXT_CRYPTO=so.0
+ 
+ DLEXT=so
+ # OSX shared library extension:
diff --git a/package/libs/ustream-ssl/Makefile 
b/package/libs/ustream-ssl/Makefile
index b5e773ba7f..1a8e0e78b0 100644
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustream-ssl
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
diff --git a/package/network/services/openvpn/Makefile 
b/package/network/services/openvpn/Makefile
index 552ed158b3..374e14f7bd 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/utils/curl/Makefile 
b/package/network/utils/curl/Makefile
index 77af54fae8..e521e99b92 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
 PKG_VERSION:=7.59.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile
index 8d1f04d60f..4ea495867c 100644
--- a/package/utils/px5g/Makefile
+++ b/package/utils/px5g/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=px5g
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_LICENSE:=LGPL-2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/px5g-$(BUILD_VARIANT)
 
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] ath10k-ct: make it depend on PCI support again

[Hauke Mehrtens]

The missing dependency causes build problems on systems without PCI
support.
The ath10k_pci kernel module depends on PCI support so this dependency
should be added. ath10k now also supported the ahb interface on the
IPQ4019 SoC, but this SoC also has PCI support so this extra dependency
is not as problem.

Fixes: d0f3dd5b9f34176 ("ath10k-ct: update to latest version, enable AHB.")
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/kernel/ath10k-ct/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kernel/ath10k-ct/Makefile 
b/package/kernel/ath10k-ct/Makefile
index 1725bb7d17..9c69dee72f 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/ath10k-ct
   SUBMENU:=Wireless Drivers
   TITLE:=ath10k-ct driver optimized for CT ath10k firmware
-  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT 
+@DRIVER_11W_SUPPORT +kmod-hwmon-core
+  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT 
+@DRIVER_11W_SUPPORT @PCI_SUPPORT +kmod-hwmon-core
   FILES:=\
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] tools/libressl: update to version 2.7.2

[Hauke Mehrtens]

Libressl version 2.7.0 and later implement more of the OpenSSL 1.1 API
and this needs some modifications of the code using it.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 .../patches/120-curl-fix-libressl-linking.patch|  6 +-
 tools/cmake/patches/140-curl-fix-libressl.patch| 68 ++
 .../patches/150-libarchive-fix-libressl.patch  | 37 
 tools/libressl/Makefile|  4 +-
 4 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 tools/cmake/patches/140-curl-fix-libressl.patch
 create mode 100644 tools/cmake/patches/150-libarchive-fix-libressl.patch

diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch 
b/tools/cmake/patches/120-curl-fix-libressl-linking.patch
index ad5b89750e..a345a8c16a 100644
--- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch
+++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <j...@mein.io>
 ---
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -461,6 +461,10 @@ if(CMAKE_USE_OPENSSL)
+@@ -461,6 +461,14 @@ if(CMAKE_USE_OPENSSL)
set(USE_OPENSSL ON)
set(HAVE_LIBCRYPTO ON)
set(HAVE_LIBSSL ON)
@@ -28,6 +28,10 @@ Signed-off-by: Jo-Philipp Wich <j...@mein.io>
 +  if(HAVE_LIBRT)
 +list(APPEND OPENSSL_LIBRARIES rt)
 +  endif()
++  check_library_exists("pthread" pthread_once "" HAVE_PTHREAD)
++  if(HAVE_PTHREAD)
++list(APPEND OPENSSL_LIBRARIES pthread)
++  endif()
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR})
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
diff --git a/tools/cmake/patches/140-curl-fix-libressl.patch 
b/tools/cmake/patches/140-curl-fix-libressl.patch
new file mode 100644
index 00..9caed96f53
--- /dev/null
+++ b/tools/cmake/patches/140-curl-fix-libressl.patch
@@ -0,0 +1,68 @@
+From 7c90c93c0b061da81f69fabdd57125b2783c15fb Mon Sep 17 00:00:00 2001
+From: Bernard Spil <br...@freebsd.org>
+Date: Mon, 2 Apr 2018 19:04:06 +0200
+Subject: [PATCH] openssl: fix build with LibreSSL 2.7
+
+ - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
+
+Fixes #2319
+Closes #2447
+Closes #2448
+
+Signed-off-by: Bernard Spil <br...@freebsd.org>
+---
+ lib/vtls/openssl.c | 15 +--
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/Utilities/cmcurl/lib/vtls/openssl.c
 b/Utilities/cmcurl/lib/vtls/openssl.c
+@@ -104,7 +104,8 @@
+ #endif
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x1010L) && /* OpenSSL 1.1.0+ */ \
+-  !defined(LIBRESSL_VERSION_NUMBER)
++!(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
+ #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
+ #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
+@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num
+ #endif
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
+-  !defined(LIBRESSL_VERSION_NUMBER)
++!(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #define HAVE_X509_GET0_SIGNATURE 1
+ #endif
+ 
+@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num
+  * Whether SSL_CTX_set_keylog_callback is available.
+  * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
+  * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
+- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
++ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
+  *   lies and pretends to be OpenSSL 2.0.0).
+  */
+ #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
+@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl,
+   if(!session || !keylog_file_fp)
+ return;
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && \
++!(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+   /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
+* we have a valid SSL context if we have a non-NULL session. */
+   SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
+@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struc
+   case CURL_SSLVERSION_TLSv1_2:
+   case CURL_SSLVERSION_TLSv1_3:
+ /* it will be handled later with the context options */
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010L) && \
+-!defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010L)
+ req_method = TLS_client_method();
+ #else
+ req_method = SSLv23_client_method();
diff --git a/tools/cmake/patches/150-libarchive-fix-libressl.patch 
b/tools/cmake/patches/150-libarchive-fix-libres

[LEDE-DEV] [PATCH 3/5] tools/mtd-utils: update to version 2.0.1

[Hauke Mehrtens]

This version now uses autotools to configure the build system. They are
also using the newly added zlib package.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 tools/Makefile |   2 +-
 tools/mtd-utils/Makefile   |  42 +++-
 tools/mtd-utils/patches/100-sscanf_fix.patch   |   6 +-
 tools/mtd-utils/patches/110-portability.patch  |  45 
 .../mtd-utils/patches/120-include_sysmacros.patch  |  25 -
 tools/mtd-utils/patches/130-lzma_jffs2.patch   |  65 +--
 .../patches/135-mkubifs_optional_lzo.patch | 119 -
 ...igen-add-ubigen_write_terminator-function.patch |   8 +-
 .../201-ubinize-add-terminator-support.patch   |  23 ++--
 .../patches/310-add-static-linking-option.patch|  43 
 .../patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch |  16 +--
 11 files changed, 95 insertions(+), 299 deletions(-)
 delete mode 100644 tools/mtd-utils/patches/120-include_sysmacros.patch
 delete mode 100644 tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
 delete mode 100644 tools/mtd-utils/patches/310-add-static-linking-option.patch

diff --git a/tools/Makefile b/tools/Makefile
index 8dfab9892b..d2b5daf18c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -50,7 +50,7 @@ $(curdir)/automake/compile := $(curdir)/m4/compile 
$(curdir)/autoconf/compile $(
 $(curdir)/gmp/compile := $(curdir)/libtool/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
$(curdir)/zlib/compile
+$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile 
$(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/mklibs/compile := $(curdir)/libtool/compile
 $(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/upslug2/compile := $(curdir)/libtool/compile
diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 7b4a91a73d..c94de3acf8 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,44 +7,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=1.5.2
+PKG_VERSION:=2.0.1
 
-PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
+PKG_SOURCE_VERSION:=81049e599775bac4238361752f659a86f67328e6
 PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
+PKG_MIRROR_HASH:=a79784eb52c77dbc73a08863ce6651b3d22931e7c670cd1782168f9bba13f5a8
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
-CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) 
-L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
-ifneq ($(HOST_OS),Linux)
-CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include endian.h 
-I$(CURDIR)/include -include fls.h
-MTD_STATIC := 0
-else
-MTD_STATIC := 1
-endif
-
-MTD_MAKEOPTS = \
-   CFLAGS="$(CFLAGS)" \
-   LDFLAGS="$(HOST_LDFLAGS)" \
-   WITHOUT_LZO=1 WITHOUT_XATTR=1 \
-   SUBDIRS="" \
-   BUILDDIR="$(HOST_BUILD_DIR)" \
-   STATIC=$(MTD_STATIC) \
-   V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1)
-
-define Host/Compile
-   $(MAKE) -C $(HOST_BUILD_DIR) \
-   $(MTD_MAKEOPTS) \
-   TARGETS="mkfs.jffs2 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
-endef
+
+HOST_CONFIGURE_VARS+= \
+   UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
+
+HOST_CONFIGURE_ARGS+= \
+   --disable-tests \
+   --without-xattr \
+   --without-lzo
 
 define Host/Install
$(CP) \
$(HOST_BUILD_DIR)/mkfs.jffs2 \
-   $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
-   $(HOST_BUILD_DIR)/ubi-utils/ubinize \
+   $(HOST_BUILD_DIR)/mkfs.ubifs \
+   $(HOST_BUILD_DIR)/ubinize \
$(STAGING_DIR_HOST)/bin/
 endef
 
diff --git a/tools/mtd-utils/patches/100-sscanf_fix.patch 
b/tools/mtd-utils/patches/100-sscanf_fix.patch
index 0af583f4cb..ae6f86722b 100644
--- a/tools/mtd-utils/patches/100-sscanf_fix.patch
+++ b/tools/mtd-utils/patches/100-sscanf_fix.patch
@@ -1,6 +1,6 @@
 a/mkfs.jffs2.c
-+++ b/mkfs.jffs2.c
-@@ -422,7 +422,7 @@ static int interpret_table_entry(struct
+--- a/jffsX-utils/mkfs.jffs2.c
 b/jffsX-utils/mkfs.jffs2.c
+@@ -427,7 +427,7 @@ static int interpret_table_entry(struct
  
if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu 
%lu",
SCANF_STRING(name), , , , , 
, ,
diff --git a/tools/mtd-utils/patches/110-portability.patch 
b/tools/mtd-utils/patches/110-portability.patch
index c4cdab928a..033c865830 100644
--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@@ -1,5 +1,5 @@
 a/compr_

[LEDE-DEV] [PATCH 2/5] tools/mtd-utils: Mark some lzma functions as static

[Hauke Mehrtens]

These functions are not declared in any header file and only used in
same compile unit, mark them as static to remove one gcc warning and
make it easier for the compiler to optimize them out.

This also fixes some style problems to make this patch match the version
in the packages folder.

This is copied from this commit to the mtd-utils we pack into the image:
56d0dd56e9c6efa79 ("mtd-utils: Mark some lzma functions as static")

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 tools/mtd-utils/patches/130-lzma_jffs2.patch | 74 ++--
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch 
b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index b04f019922..05ced4f42c 100644
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -26,7 +26,7 @@
jffs2_lzo_init();
  #endif
 +#ifdef CONFIG_JFFS2_LZMA
-+jffs2_lzma_init();
++  jffs2_lzma_init();
 +#endif
return 0;
  }
@@ -36,7 +36,7 @@
jffs2_lzo_exit();
  #endif
 +#ifdef CONFIG_JFFS2_LZMA
-+jffs2_lzma_exit();
++  jffs2_lzma_exit();
 +#endif
return 0;
  }
@@ -119,7 +119,7 @@
 +  return -1;
 +  }
 +
-+return 0;
++  return 0;
 +}
 +
 +STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char 
*cpage_out,
@@ -175,26 +175,26 @@
 +
 +int INIT jffs2_lzma_init(void)
 +{
-+int ret;
++  int ret;
 +  CLzmaEncProps props;
 +  LzmaEncProps_Init();
 +
-+props.dictSize = LZMA_BEST_DICT(0x2000);
-+props.level = LZMA_BEST_LEVEL;
-+props.lc = LZMA_BEST_LC;
-+props.lp = LZMA_BEST_LP;
-+props.pb = LZMA_BEST_PB;
-+props.fb = LZMA_BEST_FB;
++  props.dictSize = LZMA_BEST_DICT(0x2000);
++  props.level = LZMA_BEST_LEVEL;
++  props.lc = LZMA_BEST_LC;
++  props.lp = LZMA_BEST_LP;
++  props.pb = LZMA_BEST_PB;
++  props.fb = LZMA_BEST_FB;
 +
 +  ret = lzma_alloc_workspace();
-+if (ret < 0)
-+return ret;
++  if (ret < 0)
++  return ret;
 +
 +  ret = jffs2_register_compressor(_lzma_comp);
 +  if (ret)
 +  lzma_free_workspace();
 +  
-+return ret;
++  return ret;
 +}
 +
 +void jffs2_lzma_exit(void)
@@ -245,7 +245,7 @@
 +  #define LZMA_FREE free
 +  #define PRINT_ERROR(msg) fprintf(stderr, msg)
 +  #define INIT
-+  #define STATIC
++  #define STATIC static
 +#endif
 +
 +#include "lzma/LzmaDec.h"
@@ -261,16 +261,16 @@
 +
 +static void *p_lzma_malloc(void *p, size_t size)
 +{
-+if (size == 0)
-+return NULL;
++  if (size == 0)
++  return NULL;
 +
-+return LZMA_MALLOC(size);
++  return LZMA_MALLOC(size);
 +}
 +
 +static void p_lzma_free(void *p, void *address)
 +{
-+if (address != NULL)
-+LZMA_FREE(address);
++  if (address != NULL)
++  LZMA_FREE(address);
 +}
 +
 +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
@@ -949,9 +949,9 @@
 +}
 +
 +Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; 
}
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
 +
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
 +
 +void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
 +{
@@ -2357,7 +2357,7 @@
 +  p->needFlush = 0;
 +}
 +
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) 
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool 
initState) 
 +{ 
 +  p->needFlush = 1; 
 +  p->remainLen = 0; 
@@ -2777,7 +2777,7 @@
 +#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
 +#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
 +
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
 +{
 +  int c = 2, slotFast;
 +  g_FastPos[0] = 0;
@@ -3031,7 +3031,7 @@
 +  CSaveState saveState;
 +} CLzmaEnc;
 +
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
++static void LzmaEnc_SaveState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
 +  CSaveState *dest = >saveState;
@@ -3057,7 +3057,7 @@
 +  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
 +}
 +
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++static void LzmaEnc_RestoreState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *dest = (CLzmaEnc *)pp;
 +  const CSaveState *p = >saveState;
@@ -3300,7 +3300,7 @@
 +  while (symbol < 0x1);
 +}
 +
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
 +{
 

[LEDE-DEV] [PATCH 5/5] mtd-utils: activate --gc-sections

[Hauke Mehrtens]

This reduces the size of the binary a bit:

old:
 37556 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 81697 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

new:
 27450 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 71796 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/utils/mtd-utils/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile
index a9905e4207..b9c3c19568 100644
--- a/package/utils/mtd-utils/Makefile
+++ b/package/utils/mtd-utils/Makefile
@@ -62,6 +62,9 @@ CONFIGURE_ARGS += \
--without-xattr \
--without-lzo
 
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
 define Package/ubi-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) \
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

[Hauke Mehrtens]

This allows us to link the other tools against our libz and we do not
need the system zlib any more.

Only the static linked library is copied to the staging directory so we
have a statically linked library on all systems and not only on Linux.
This also adds the new dependencies of the packages which are depending
on zlib.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 include/prereq-build.mk |  5 
 package/libs/zlib/Makefile  |  2 --
 tools/Makefile  | 14 +
 tools/lzma-old/Makefile |  2 ++
 tools/lzma-old/patches/120-add-cflags.patch | 11 +++
 tools/make-ext4fs/Makefile  |  8 +
 tools/make-ext4fs/patches/100-add-ldflags.patch | 11 +++
 tools/squashfs4/Makefile|  2 +-
 tools/zlib/Makefile | 40 +
 9 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 tools/lzma-old/patches/120-add-cflags.patch
 create mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch
 create mode 100644 tools/zlib/Makefile

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 6917716342..5b9a7e049d 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -76,11 +76,6 @@ else
   zlib_link_flags := -lz
 endif
 
-$(eval $(call TestHostCommand,zlib, \
-   Please install a static zlib. (Missing libz.a or zlib.h), \
-   echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' 
| \
-   gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - 
$(zlib_link_flags)))
-
 $(eval $(call TestHostCommand,perl-thread-queue, \
Please install the Perl Thread::Queue module, \
perl -MThread::Queue -e 1))
diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index a7c61f7dd0..4a2a0e53b0 100644
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:gnu:zlib
 
 PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
 
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -95,6 +94,5 @@ define Package/zlib-dev/install
  $(1)/usr/lib/pkgconfig/
 endef
 
-$(eval $(call HostBuild))
 $(eval $(call BuildPackage,zlib))
 $(eval $(call BuildPackage,zlib-dev))
diff --git a/tools/Makefile b/tools/Makefile
index 50bd552d75..8dfab9892b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,7 +22,7 @@ ifneq 
($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar
 endif
 
 tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat
-tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs
+tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib
 tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
 tools-y += firmware-utils patch-image quilt padjffs2
 tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf
@@ -43,16 +43,16 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
 $(curdir)/flex/compile := $(curdir)/libtool/compile
 $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
$(curdir)/automake/compile $(curdir)/missing-macros/compile
 $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
-$(curdir)/squashfs4/compile := $(curdir)/xz/compile
+$(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile 
$(curdir)/findutils/compile
 $(curdir)/autoconf/compile := $(curdir)/m4/compile
 $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
$(curdir)/pkg-config/compile $(curdir)/xz/compile
 $(curdir)/gmp/compile := $(curdir)/libtool/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile
+$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
$(curdir)/zlib/compile
 $(curdir)/mklibs/compile := $(curdir)/libtool/compile
-$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile
+$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/upslug2/compile := $(curdir)/libtool/compile
 $(curdir)/mm-macros/compile := $(curdir)/libtool/compile
 $(curdir)/missing-macros/compile := $(curdir)/autoconf/compile
@@ -69,8 +69,12 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile
 $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile 
$(curdir)/automake/compile
 $(curdir)/libressl/compile := $(curdir)/pkg-config/compile
 $(curdir)/mkimage/compile += $(curdir)/libressl/compile
-$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile
+$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile 
$(curdir)/zlib/compile
 $(curdir)/cmake/compile += $(curdir)/libressl/compile
+$(curdir)/zlib/compile := $(curdir)/cmake/compile
+$(curdir)/wrt350nv2-builder/compile := $(curd

[LEDE-DEV] [PATCH] tools/mkimage: update to version 2018.03

[Hauke Mehrtens]

This activates support for fit images and some other new mkimage
features. Some of the patches were applied upstream and could be
removed.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---

Could someone please test this with MacOSX.
There are still some patches to fix problems on FreeBSD in this package.

 tools/mkimage/Makefile |  21 +-
 tools/mkimage/patches/010-freebsd-ulong-fix.patch  |   6 +-
 .../patches/030-allow-to-use-different-magic.patch |  78 +--
 tools/mkimage/patches/040-include_order.patch  |  11 -
 .../mkimage/patches/050-image_h_portability.patch  |   2 +-
 .../patches/060-remove_kernel_includes.patch   |   2 +-
 .../patches/070-socfpgaimage_portability.patch |  52 --
 .../patches/080-remove_compiler_check.patch|  14 +-
 .../090-reproducible-SOURCE_DATE_EPOCH.patch   |  82 ---
 tools/mkimage/patches/100-freebsd-compat.patch |   2 +-
 tools/mkimage/patches/110-fix_musl_build.patch |  67 --
 tools/mkimage/patches/200-compiler-support.patch   | 702 -
 .../200-rsa-sign-add-support-for-libressl.patch|  68 ++
 .../patches/210-link-libcrypto-static.patch|  14 +
 .../mkimage/patches/210-openssl-1.1.x-compat.patch |  97 ---
 15 files changed, 147 insertions(+), 1071 deletions(-)
 delete mode 100644 tools/mkimage/patches/040-include_order.patch
 delete mode 100644 tools/mkimage/patches/070-socfpgaimage_portability.patch
 delete mode 100644 
tools/mkimage/patches/090-reproducible-SOURCE_DATE_EPOCH.patch
 delete mode 100644 tools/mkimage/patches/110-fix_musl_build.patch
 delete mode 100644 tools/mkimage/patches/200-compiler-support.patch
 create mode 100644 
tools/mkimage/patches/200-rsa-sign-add-support-for-libressl.patch
 create mode 100644 tools/mkimage/patches/210-link-libcrypto-static.patch
 delete mode 100644 tools/mkimage/patches/210-openssl-1.1.x-compat.patch

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 00f85ae272..c7e1dfd672 100644
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,14 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2014.10
+PKG_VERSION:=2018.03
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
http://mirror2.openwrt.org/sources \
ftp://ftp.denx.de/pub/u-boot
-PKG_HASH:=d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71
-PKG_CAT:=bzcat
+PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
 
@@ -22,17 +21,17 @@ include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Prepare
$(Host/Prepare/Default)
-   rm -f \
-   $(HOST_BUILD_DIR)/include/errno.h \
-   $(HOST_BUILD_DIR)/include/malloc.h \
-   $(HOST_BUILD_DIR)/tools/.depend
-   touch $(HOST_BUILD_DIR)/include/config.mk
-   touch $(HOST_BUILD_DIR)/include/config.h
+   mkdir -p $(HOST_BUILD_DIR)/include/config
+   touch $(HOST_BUILD_DIR)/include/config/auto.conf
 endef
 
 define Host/Compile
-   $(MAKE) -C $(HOST_BUILD_DIR) defconfig   HOSTCFLAGS="$(HOST_CPPFLAGS) 
$(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_LOADLIBES="(pkg-config 
--static --libs libcrypto)"
-   $(MAKE) -C $(HOST_BUILD_DIR) tools-only  HOSTCFLAGS="$(HOST_CPPFLAGS) 
$(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_LOADLIBES="(pkg-config 
--static --libs libcrypto)"
+   $(MAKE) -C $(HOST_BUILD_DIR) \
+   HOSTCFLAGS="$(HOST_CFLAGS)" \
+   HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+   no-dot-config-targets=tools-only \
+   CONFIG_FIT_SIGNATURE=y \
+   tools-only
 endef
 
 define Host/Install
diff --git a/tools/mkimage/patches/010-freebsd-ulong-fix.patch 
b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
index 1101e72d15..7d891657f8 100644
--- a/tools/mkimage/patches/010-freebsd-ulong-fix.patch
+++ b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
@@ -1,6 +1,6 @@
 --- a/include/image.h
 +++ b/include/image.h
-@@ -44,6 +44,10 @@ struct lmb;
+@@ -51,6 +51,10 @@ struct lmb;
  
  #endif /* USE_HOSTCC */
  
@@ -8,6 +8,6 @@
 +#define ulong unsigned long
 +#endif
 +
- #if defined(CONFIG_FIT)
+ #if IMAGE_ENABLE_FIT
  #include 
- #include 
+ #include 
diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch 
b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
index dcab48894c..c6de9a0aaf 100644
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -1,6 +1,6 @@
 --- a/tools/mkimage.c
 +++ b/tools/mkimage.c
-@@ -24,6 +24,7 @@ struct image_tool_params params = {
+@@ -21,6 +21,7 @@ static struct image_tool_params params =
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
@@ -8,52 +8,58 @@
.dtc = MKIMAGE_DEFAULT_DTC_OPTIO

Re: [LEDE-DEV] Bump tools/mtd-utils

[Hauke Mehrtens]

On 04/05/2018 11:58 AM, Syrone Wong wrote:
> Hi,
> 
> I closed my PR due to
> https://github.com/openwrt/openwrt/commit/56d0dd56e9c6efa79d03b6417dc0ae5449343001.
> I tried to understand patches in tools/mtd-utils but failed. I
> appreciate if anyone keeps going.
> 
> 
> Best Regards,
> Syrone Wong
> 
> 
> On Thu, Apr 5, 2018 at 4:59 PM, Koen Vandeputte
>  wrote:
>> Hi Syrone,
>>
>> Following your patch to update mtd-utils in packages, currently staged in
>> Hauke's tree:
>> Are you also planning to upgrade mtd-utils within tools/ too?
>>
>> I'm asking to avoid double effort on this.
>>
>>
>> Some background info:
>>
>> Reason for me to update this is trying to fix a ubi issue in imx6:
>>
>> - Build OpenWrt master
>> - Use Imagebuilder to add/alter some files (ex: some files in /etc/config)
>> - Flash this image
>>
>> --> When the board boots for the first time, all is ok and UBI initializes
>> properly.
>> --> On the 2nd boot, nearly all files that got added/altered during the
>> imagebuild phase are now corrupted.
>>
>> Repro rate: 100%
>>
>> Looking at the mtd-utils log, a lot got changed regarding ubi since 1.5.2 ..
>>
>>
>>
>> Thanks,
>>
>> Koen
Hi,

I had a closer look at the jffs2 changes and I think they are only used
by the mtd-utils in tools/ and we only added the to packages to keep
them in sync. The jffs2 tools are not packaged into the package.
I did this change becasue I saw some compile warnings when looking at
the patches which bring it to version 2.0.1.

My patch to 130-lzma_jffs2.patch is more or less unrelated to the to the
bump to the version 2.0.1, I would support if also the version in tools
gets to this new version.

Probably the patches should be synced between the two mtd-utils versions.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] kernel: update kernel 4.14 to 4.14.32

[Hauke Mehrtens]

The following patches are now included upstream:
* 0052-MIPS-lantiq-fix-usb-clocks.patch
* 0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch
* 0060-lantiq-ase-enable-MFD-SYSCON.patch

Closes: FS#1466

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 include/kernel-version.mk  |  4 +--
 .../generic/hack-4.14/207-disable-modorder.patch   |  4 +--
 .../hack-4.14/702-phy_add_aneg_done_function.patch |  2 +-
 ...c_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch |  2 +-
 ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++---
 .../generic/pending-4.14/701-phy_extension.patch   |  2 +-
 ...-add-detach-callback-to-struct-phy_driver.patch |  2 +-
 .../generic/pending-4.14/834-ledtrig-libata.patch  |  8 ++---
 .../0001-MIPS-lantiq-add-pcie-driver.patch |  4 +--
 .../0052-MIPS-lantiq-fix-usb-clocks.patch  | 25 ---
 .../0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch  | 37 --
 .../0060-lantiq-ase-enable-MFD-SYSCON.patch| 24 --
 .../0048-net-core-add-RPS-balancer.patch   |  6 ++--
 .../patches-4.14/0052-net-phy-add-FC.patch |  2 +-
 .../patches-4.14/411-sfp-add-sfp-compatible.patch  |  2 +-
 .../mvebu/patches-4.14/450-reprobe_sfp_phy.patch   | 16 --
 .../patches-4.14/0034-NET-multi-phy-support.patch  |  6 ++--
 17 files changed, 33 insertions(+), 123 deletions(-)
 delete mode 100644 
target/linux/lantiq/patches-4.14/0052-MIPS-lantiq-fix-usb-clocks.patch
 delete mode 100644 
target/linux/lantiq/patches-4.14/0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch
 delete mode 100644 
target/linux/lantiq/patches-4.14/0060-lantiq-ase-enable-MFD-SYSCON.patch

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 43f891c1c9..4be674ccdd 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
 LINUX_VERSION-4.9 = .91
-LINUX_VERSION-4.14 = .29
+LINUX_VERSION-4.14 = .32
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
 LINUX_KERNEL_HASH-4.9.91 = 
60caa752ec9fa1c426f6a2f37db3f268d0961b67a723b6443949112167b39832
-LINUX_KERNEL_HASH-4.14.29 = 
18f67b70ce9922c7ef95791bfd91f46e52ee9eb3e310978bb6ef6d2e93c14619
+LINUX_KERNEL_HASH-4.14.32 = 
cb0979bec663089a43b10cfbeae0cf9673544b0ff5968c33ede614ec0f43b680
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst 
-,_,$(subst /,_,$(1)))
diff --git a/target/linux/generic/hack-4.14/207-disable-modorder.patch 
b/target/linux/generic/hack-4.14/207-disable-modorder.patch
index 8f817f32a7..8f99cde617 100644
--- a/target/linux/generic/hack-4.14/207-disable-modorder.patch
+++ b/target/linux/generic/hack-4.14/207-disable-modorder.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1224,7 +1224,6 @@ all: modules
+@@ -1233,7 +1233,6 @@ all: modules
  
  PHONY += modules
  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
@$(kecho) '  Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  
-@@ -1253,7 +1252,6 @@ _modinst_:
+@@ -1262,7 +1261,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi
diff --git 
a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch 
b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch
index 61e460fda7..0453112a1f 100644
--- a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch
+++ b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch
@@ -15,7 +15,7 @@
  
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1451,6 +1451,9 @@ int genphy_update_link(struct phy_device
+@@ -1458,6 +1458,9 @@ int genphy_update_link(struct phy_device
  {
int status;
  
diff --git 
a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
 
b/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
index 43a1483c56..5ee89be5ad 100644
--- 
a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ 
b/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-n...@vplace.de>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -6156,7 +6156,7 @@ static void __ref alloc_node_mem_map(str
+@@ -6147,7 +6147,7 @@ static void __ref alloc_node_mem_map(str
mem_map = NODE_DATA(0)->node_mem_map;
  #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP

[LEDE-DEV] [PATCH] kernel: Activate CONFIG_BRIDGE_VLAN_FILTERING

[Hauke Mehrtens]

This allows to configure VLAN aware bridges in Linux, it is also
possible to offload these VLAN aware bridges with DSA to some hardware,
which is supported by most of the DSA drivers.

This adds support for the VLAN features mentioned in bridge man page:
http://man7.org/linux/man-pages/man8/bridge.8.html

This increases the kernel size of an lzma compressed Lantiq xrx200
kernel by 4.774 Bytes.

Without brdige vlan:
1.771.351 bt_homehub-v5a-kernel.bin

With brdige vlan:
1.776.125 bt_homehub-v5a-kernel.bin

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 target/linux/generic/config-4.14 | 2 +-
 target/linux/generic/config-4.9  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index a27198335d..05dbc834f3 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -625,7 +625,7 @@ CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BSD_DISKLABEL is not set
diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9
index 3f050c205c..b34a094f69 100644
--- a/target/linux/generic/config-4.9
+++ b/target/linux/generic/config-4.9
@@ -597,7 +597,7 @@ CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BSD_DISKLABEL is not set
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] kernel version status

[Hauke Mehrtens]

On 04/02/2018 10:54 AM, Jaap Buurman wrote:
> Dear Hauke,
> 
> Quick question from my side: I was wondering why Ramips will probably
> stay with 4.9, even though the patches for 4.14 have been in master
> for quite a while. Since flow_offload is part of master, and it
> requires 4.14, I think 4.14 would be a very welcome addition for
> Ramips. My 2 cents :)
> 
> Yours sincerely,
> 
> Jaap Buurman

Hi Jaap,

I do not know what Felix's and John's plans are for this target. Fi this
should go to kernel 4.14 we should switch soon.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] CONFIG_BRIDGE_VLAN_FILTERING

[Hauke Mehrtens]

On 04/02/2018 11:28 AM, Gio wrote:
> On Wednesday, 14 June 2017 20:41:12 CEST Daniel Golle wrote:
>> I noticed that the Linux built-in bridge now supports filtering by VLAN
>> tags. This can be much more efficient than using ebtables for the same
>> task, hence I wonder if there is any reason to keep this disabled or
>> if there is interest in enabling it (I'd evaluate the space
>> requirements on most space-critical platforms).
> 
> Any news about this?

This feature would probably be nice, as far as I understand this can
also be offloaded to an DSA capable switch.

This increases the lzma compressed kernel size for a 4.9 Lantiq xrx200
kernel by 4.774 bytes.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] 18.05 status

[Hauke Mehrtens]

On 02/16/2018 01:46 PM, John Crispin wrote:
> Hi,
> 
> whats on the critical todo list for the upcoming release ? i still have
> a few minor things that I'll be adding shortly, apart from that I am
> currently not aware of any huge problems. the release will be a mix
> between 4.9 and 4.14 afaik !?

Hi,

For me the current status of master looks good.

1. All important targets are either on kernel 4.9 or 4.14, the rest will
probably get removed.

2. We did the move to GCC 7.3 and binutils 2.29.1 and this went pretty
well, I am only aware of one problem with perl on the apm821xx (powerpc)
target https://bugs.openwrt.org/index.php?do=details_id=1464 which
is related to the GCC update and which is not fixed.

3. The update to busybox 1.28.2 is still open, but this was already
tested by many people. I am fine with merging it if it will be done soon.

There are probably a lot of small things but nothing big any more in my
opinion, I do not see any release blockers for now and would like to
start with the 18.X release soon.

Are there any problems still know which would block a release?

I would propose this timeline:
1. Branch of openwrt-18.05 at 7. April
2. Create openwrt-18.05-rc1 release on 14. April
3. Create openwrt-18.05-rc2 release on 28. April
4. Create openwrt-18.05 final release on 12. Mai
If we find more problems this will be extended.

@Jow Do you have time to prepare the build bots for this?
Do others have some time in April to manage this release and take care
about bug reports?
I haven't done a release yet and probably need some help.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] kernel version status

[Hauke Mehrtens]

The next OpenWrt release will use kernel 4.9 and kernel 4.14 depending
on the target. All targets that are *not* on either kernel 4.9 or 4.14
will not be included in the next release.

I did some overview of the kernel version some months ago here:
http://lists.infradead.org/pipermail/lede-dev/2017-October/009446.html
http://lists.infradead.org/pipermail/lede-dev/2018-February/011308.html

Here is the current situation as of today:


The following targets are on kernel 4.14 and are fine:
* apm821xx
* archs38
* armvirt
* bcm53xx
* cns3xxx
* imx6
* ipq40xx
* kirkwood
* malta
* mediatek
* mvebu
* mxs
* octeon
* octeontx
* pistachio
* sunxi
* x86


The following targets are on kernel 4.9 and are fine:
* ar71xx
* ar7
* arc770
* at91
There are some patches for kernel 4.14 on the mailing list,
but it looks like nobody with the hardware wants to take care
of them.
* ath25
* brcm2708
* brcm47xx
There is a pull request with kernel 4.14 patches on github, we
will probably stay with kernel 4.9 for the next release.
* brcm63xx
patches for 4.14 are available in master
* ipq806x
* ixp4xx
* lantiq
patches for 4.14 are available in master, we will probably stay
with kernel 4.9 for the next release.
* layerscape
* mpc85xx
* omap
There is a pull request with kernel 4.14 patches on github.
* orion
* ramips
patches for 4.14 are available in master, we will probably stay
with kernel 4.9 for the next release.
* rb532
* uml


The following targets are on kernel 4.4 and will probably not be
included in the next release:
* gemini
There are patches for kernel 4.14 on the mailing list, we will
probably get them in before the release and ship this with 4.14
* oxnas
* zynq

The following targets are on kernel 3.18 and will probably not be
included in the next release:
* adm5120
* adm8668
* au1000
* mcs814x
* ppc40x
* ppc44x
* xburst


This target is on kernel 4.1 (WTF):
* omap24xx


All the targets which are not on kernel 4.9 or 4.14 will probably not be
included in the next release, I also haven't seen any activity for any
of them expected the gemini target to get support for more recent kernel
versions, if you need them please take care now.

I am fine with the current status and do not see this as a blocker for
the next release, all important targets are on either 4.9 or 4.14, if
someone wants to see his target on a more recent version we are still
open for patches.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] samba36: fix some security problems

[Hauke Mehrtens]

This Adds fixes for the following security problems based on debians patches:
CVE-2016-2125: Unconditional privilege delegation to Kerberos servers in 
trusted realms
CVE-2017-12163: Server memory information leak over SMB1
CVE-2017-12150: SMB1/2/3 connections may not require signing where they should
CVE-2018-1050: Denial of Service Attack on external print server.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/network/services/samba36/Makefile  |   2 +-
 .../samba36/patches/028-CVE-2016-2125-v3.6.patch   |  59 +
 ...494-v3-6.patch => 029-CVE-2017-7494-v3-6.patch} |   0
 ...7-15275.patch => 030-CVE-2017-15275-v3.6.patch} |   0
 .../samba36/patches/031-CVE-2017-12163-v3.6.patch  | 136 +
 .../samba36/patches/032-CVE-2017-12150-v3.6.patch  |  75 
 .../samba36/patches/032-CVE-2018-1050-v3-6.patch   |  49 
 .../patches/200-remove_printer_support.patch   |   4 +-
 8 files changed, 322 insertions(+), 3 deletions(-)
 create mode 100644 
package/network/services/samba36/patches/028-CVE-2016-2125-v3.6.patch
 rename package/network/services/samba36/patches/{028-CVE-2017-7494-v3-6.patch 
=> 029-CVE-2017-7494-v3-6.patch} (100%)
 rename package/network/services/samba36/patches/{029-CVE-2017-15275.patch => 
030-CVE-2017-15275-v3.6.patch} (100%)
 create mode 100644 
package/network/services/samba36/patches/031-CVE-2017-12163-v3.6.patch
 create mode 100644 
package/network/services/samba36/patches/032-CVE-2017-12150-v3.6.patch
 create mode 100644 
package/network/services/samba36/patches/032-CVE-2018-1050-v3-6.patch

diff --git a/package/network/services/samba36/Makefile 
b/package/network/services/samba36/Makefile
index 55e1428d49..30e26195ff 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=3.6.25
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
https://download.samba.org/pub/samba/stable
diff --git 
a/package/network/services/samba36/patches/028-CVE-2016-2125-v3.6.patch 
b/package/network/services/samba36/patches/028-CVE-2016-2125-v3.6.patch
new file mode 100644
index 00..8e174f0e7b
--- /dev/null
+++ b/package/network/services/samba36/patches/028-CVE-2016-2125-v3.6.patch
@@ -0,0 +1,59 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <a...@sigxcpu.org>
+Date: Wed, 28 Dec 2016 19:21:49 +0100
+Subject: security-CVE-2016-2125: Don't pass GSS_C_DELEG_FLAG by default
+
+This is a backport of upstream commits
+
+   b1a056f77e793efc45df34ab7bf78fbec1bf8a59
+   b83897ae49fdee1fda73c10c7fe73362bfaba690 (code not used in wheezy)
+   3106964a640ddf6a3c08c634ff586a814f94dff8 (code not used in wheezy)
+---
+ source3/librpc/crypto/gse.c | 1 -
+ source3/libsmb/clifsinfo.c  | 2 +-
+ source4/auth/gensec/gensec_gssapi.c | 2 +-
+ source4/scripting/bin/nsupdate-gss  | 2 +-
+ 4 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/source3/librpc/crypto/gse.c
 b/source3/librpc/crypto/gse.c
+@@ -162,7 +162,6 @@ static NTSTATUS gse_context_init(TALLOC_
+   memcpy(_ctx->gss_mech, gss_mech_krb5, sizeof(gss_OID_desc));
+ 
+   gse_ctx->gss_c_flags = GSS_C_MUTUAL_FLAG |
+-  GSS_C_DELEG_FLAG |
+   GSS_C_DELEG_POLICY_FLAG |
+   GSS_C_REPLAY_FLAG |
+   GSS_C_SEQUENCE_FLAG;
+--- a/source3/libsmb/clifsinfo.c
 b/source3/libsmb/clifsinfo.c
+@@ -726,7 +726,7 @@ static NTSTATUS make_cli_gss_blob(TALLOC
+   >s.gss_state->gss_ctx,
+   srv_name,
+   GSS_C_NO_OID, /* default OID. */
+-  GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | 
GSS_C_SEQUENCE_FLAG | GSS_C_DELEG_FLAG,
++  GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | 
GSS_C_SEQUENCE_FLAG | GSS_C_DELEG_POLICY_FLAG,
+   GSS_C_INDEFINITE,   /* requested ticket 
lifetime. */
+   NULL,   /* no channel bindings */
+   p_tok_in,
+--- a/source4/auth/gensec/gensec_gssapi.c
 b/source4/auth/gensec/gensec_gssapi.c
+@@ -172,7 +172,7 @@ static NTSTATUS gensec_gssapi_start(stru
+   if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", 
"mutual", true)) {
+   gensec_gssapi_state->want_flags |= GSS_C_MUTUAL_FLAG;
+   }
+-  if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", 
"delegation", true)) {
++  if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", 
"delegation", false)) {
+   gensec_gssapi_state->want_flags |= GSS_C_DELEG_FLAG;
+   }
+   if (gensec_setting_bool(gensec_security->settings, "

[LEDE-DEV] [PATCH] build: Improve GCC version detection

[Hauke Mehrtens]

This now makes sure that the beginning of the version number gets checked
and "4.4.5" will not match was a supported version.
GCC 8 and GCC 9 are now marked as supported, but we probably have to fix
some problems for them.

Closes: FS#1433
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 include/prereq-build.mk | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 6a423d2c7d..6917716342 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -28,13 +28,15 @@ $(eval $(call TestHostCommand,proper-umask, \
 
 $(eval $(call SetupHostCommand,gcc, \
Please install the GNU C Compiler (gcc) 4.8 or later \
-   $(CC) -dumpversion | grep -E 
'(4\.[8-9]|5\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \
-   gcc -dumpversion | grep -E 
'(4\.[8-9]|5\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \
+   $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \
+   gcc -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \
gcc48 --version | grep gcc, \
gcc49 --version | grep gcc, \
gcc5 --version | grep gcc, \
gcc6 --version | grep gcc, \
gcc7 --version | grep gcc, \
+   gcc8 --version | grep gcc, \
+   gcc9 --version | grep gcc, \
gcc --version | grep Apple.LLVM ))
 
 $(eval $(call TestHostCommand,working-gcc, \
@@ -45,13 +47,15 @@ $(eval $(call TestHostCommand,working-gcc, \
 
 $(eval $(call SetupHostCommand,g++, \
Please install the GNU C++ Compiler (g++) 4.8 or later \
-   $(CXX) -dumpversion | grep -E 
'(4\.[8-9]|5\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \
-   g++ -dumpversion | grep -E 
'(4\.[8-9]|5\.?[0-9]?|6\.?[0-9]?|7\.?[0-9]?)', \
+   $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \
+   g++ -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?)', \
g++48 --version | grep g++, \
g++49 --version | grep g++, \
g++5 --version | grep g++, \
g++6 --version | grep g++, \
g++7 --version | grep g++, \
+   g++8 --version | grep g++, \
+   g++9 --version | grep g++, \
g++ --version | grep Apple.LLVM ))
 
 $(eval $(call TestHostCommand,working-g++, \
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] kernel: update kernel 4.9 to version 4.9.91

[Hauke Mehrtens]

 * Refreshed patches.
 * Deleted 210-Revert-led-core-Fix-brightness-setting-when-setting-.patch (was 
accepted upstream)
 * Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream)

Compile and run tested on lantiq

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 include/kernel-version.mk  |  4 +-
 ...-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch |  2 +-
 ...-the-clocks-early-during-the-boot-process.patch |  4 +-
 .../patches-4.9/950-0031-Add-dwc_otg-driver.patch  |  2 +-
 ..._pl011-Don-t-use-DT-aliases-for-numbering.patch |  2 +-
 ...oid-suspending-if-we-re-in-gadget-mode-18.patch |  2 +-
 ...port-rate-change-propagation-on-bcm2835-c.patch |  6 +--
 ...ow-rate-change-propagation-to-PLLH_AUX-on.patch |  2 +-
 ...-maybe-uninitialized-warning-in-bcm2835_c.patch |  2 +-
 ...-Don-t-rate-change-PLLs-on-behalf-of-DSI-.patch | 28 +-
 ...m2835-Register-the-DSI0-DSI1-pixel-clocks.patch | 14 ++---
 ...-Add-leaf-clock-measurement-support-disab.patch | 26 +-
 ...2835-Mark-used-PLLs-and-dividers-CRITICAL.patch |  2 +-
 ...186-clk-bcm2835-Add-claim-clocks-property.patch | 14 ++---
 .../950-0195-amba_pl011-Round-input-clock-up.patch | 10 ++--
 ...match_table-parsing-for-partition-parsers.patch | 12 ++---
 .../050-usb-dwc2-Remove-unnecessary-kfree.patch|  2 +-
 ...llocate-struct-bgmac-just-once-don-t-copy.patch |  6 +--
 ...rop-struct-bcma_mdio-we-don-t-need-anymor.patch |  2 +-
 ...nable-master-mode-for-BCM54210E-and-B5021.patch |  2 +-
 .../090-net-generalize-napi_complete_done.patch| 12 ++---
 .../generic/hack-4.9/207-disable-modorder.patch|  4 +-
 .../hack-4.9/773-bgmac-add-srab-switch.patch   |  2 +-
 .../linux/generic/hack-4.9/902-debloat_proc.patch  |  4 +-
 .../generic/hack-4.9/904-debloat_dma_buf.patch |  2 +-
 ...x-wrong-comment-related-to-link-detection.patch |  4 +-
 ...core-Fix-brightness-setting-when-setting-.patch | 26 --
 ...610-netfilter_match_bypass_default_checks.patch | 14 ++---
 .../pending-4.9/812-pci-dwc-fix-enumeration.patch  | 60 --
 .../generic/pending-4.9/834-ledtrig-libata.patch   |  8 +--
 .../ixp4xx/patches-4.9/160-delayed_uart_io.patch   |  4 +-
 .../patches-4.9/402-mtd-support-layerscape.patch   | 11 ++--
 .../patches-4.9/702-pci-support-layerscape.patch   |  2 +-
 .../811-irqchip-support-layerscape.patch   |  2 +-
 .../patches-4.9/812-mmc-layerscape-support.patch   | 33 +++-
 .../patches-4.9/813-qe-support-layerscape.patch| 20 
 .../patches-4.9/817-usb-support-layerscape.patch   | 30 +--
 .../0032-USB-dwc2-add-device_reset.patch   |  2 +-
 .../0039-mtd-add-mt7621-nand-support.patch |  2 +-
 .../linux/ramips/patches-4.9/0040-nand-hack.patch  |  8 +--
 .../patches-4.9/0901-spansion_nand_id_fix.patch|  4 +-
 41 files changed, 144 insertions(+), 254 deletions(-)
 delete mode 100644 
target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch
 delete mode 100644 
target/linux/generic/pending-4.9/812-pci-dwc-fix-enumeration.patch

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9a02bcb9f6..43f891c1c9 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
-LINUX_VERSION-4.9 = .87
+LINUX_VERSION-4.9 = .91
 LINUX_VERSION-4.14 = .29
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
-LINUX_KERNEL_HASH-4.9.87 = 
7ac9f6af69dc5a7e38bf35cc3fa889e3a4b22504a85f57fdc87734a8abe4c917
+LINUX_KERNEL_HASH-4.9.91 = 
60caa752ec9fa1c426f6a2f37db3f268d0961b67a723b6443949112167b39832
 LINUX_KERNEL_HASH-4.14.29 = 
18f67b70ce9922c7ef95791bfd91f46e52ee9eb3e310978bb6ef6d2e93c14619
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1
diff --git 
a/target/linux/brcm2708/patches-4.9/950-0021-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
 
b/target/linux/brcm2708/patches-4.9/950-0021-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
index dfa312bc37..152f9abc8b 100644
--- 
a/target/linux/brcm2708/patches-4.9/950-0021-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
+++ 
b/target/linux/brcm2708/patches-4.9/950-0021-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
@@ -19,7 +19,7 @@ Signed-off-by: Eric Anholt <e...@anholt.net>
 
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1262,6 +1262,15 @@ static struct clk_hw *bcm2835_register_c
+@@ -1266,6 +1266,15 @@ static struct clk_hw *bcm2835_register_c
init.name = data->name;
init.flags = data->flags | CLK_IGNORE_UNUSED;
  
diff --git 
a/target/linux/brcm2708/patches-4.9/950-0026-Register-the-clocks-early-during-the-boot-process.patch
 
b/target/linux/brcm2708/patches-4.9/950-0026-Registe

[LEDE-DEV] [PATCH] download: skip hash check without a download hash

[Hauke Mehrtens]

If the package doe not contain a PKG_HASH just skip the check instead of
making the download fail. The scripts/download.pl script will
automatically skip the hash check in case the hash value equals skip,
otherwise it fails.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 include/download.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/download.mk b/include/download.mk
index 2ba8a7bdf4..b14ce2a39a 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -239,11 +239,11 @@ define Download/Defaults
   URL_FILE:=
   PROTO:=
   HASH=$$(MD5SUM)
-  MD5SUM:=x
+  MD5SUM:=skip
   SUBDIR:=
   MIRROR:=1
   MIRROR_HASH=$$(MIRROR_MD5SUM)
-  MIRROR_MD5SUM:=x
+  MIRROR_MD5SUM:=skip
   VERSION:=
   OPTS:=
 endef
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] libnl: Disbale debug support

[Hauke Mehrtens]

This dereses the size of the libnl pakcage a little bit
old:
   857 bin/packages/mips_24kc/base/libnl_3.4.0-1_mips_24kc.ipk
 41195 bin/packages/mips_24kc/base/libnl-core_3.4.0-1_mips_24kc.ipk
  7818 bin/packages/mips_24kc/base/libnl-genl_3.4.0-1_mips_24kc.ipk
 24322 bin/packages/mips_24kc/base/libnl-nf_3.4.0-1_mips_24kc.ipk
136075 bin/packages/mips_24kc/base/libnl-route_3.4.0-1_mips_24kc.ipk

new:
   852 bin/packages/mips_24kc/base/libnl_3.4.0-1_mips_24kc.ipk
 35020 bin/packages/mips_24kc/base/libnl-core_3.4.0-1_mips_24kc.ipk
  7615 bin/packages/mips_24kc/base/libnl-genl_3.4.0-1_mips_24kc.ipk
 24114 bin/packages/mips_24kc/base/libnl-nf_3.4.0-1_mips_24kc.ipk
131134 bin/packages/mips_24kc/base/libnl-route_3.4.0-1_mips_24kc.ipk

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/libs/libnl/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libs/libnl/Makefile b/package/libs/libnl/Makefile
index d99bf16126..897bf12357 100644
--- a/package/libs/libnl/Makefile
+++ b/package/libs/libnl/Makefile
@@ -80,6 +80,9 @@ endef
 
 TARGET_CFLAGS += -ffunction-sections $(FPIC)
 
+CONFIGURE_ARGS += \
+   --disable-debug
+
 define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/libnl3 $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/include/libnl3/* $(1)/usr/include/libnl3/
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] mbedtls: update to version 2.8.0

[Hauke Mehrtens]

This fixes some minor security problems.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/libs/mbedtls/Makefile |  4 +--
 package/libs/mbedtls/patches/200-config.patch | 36 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 8f6a5be295..898880d453 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mbedtls
-PKG_VERSION:=2.7.0
+PKG_VERSION:=2.8.0
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
 PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_HASH:=2c6fe289b4b50bf67b4839e81b07fcf52a19f5129d0241d2aa4d49cb1ef11e4f
+PKG_HASH:=649eb27187154590edda52943a7f468e740ec08807e5bf68ff45f4e8ffd68923
 
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
diff --git a/package/libs/mbedtls/patches/200-config.patch 
b/package/libs/mbedtls/patches/200-config.patch
index 3860414cde..70ef95477c 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -91,7 +91,7 @@
  
  /**
   * \def MBEDTLS_ENTROPY_NV_SEED
-@@ -1056,14 +1056,14 @@
+@@ -1057,14 +1057,14 @@
   * Uncomment this macro to disable the use of CRT in RSA.
   *
   */
@@ -108,7 +108,7 @@
  
  /**
   * \def MBEDTLS_SHA256_SMALLER
-@@ -1079,7 +1079,7 @@
+@@ -1080,7 +1080,7 @@
   *
   * Uncomment to enable the smaller implementation of SHA256.
   */
@@ -117,7 +117,7 @@
  
  /**
   * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
-@@ -1206,7 +1206,7 @@
+@@ -1207,7 +1207,7 @@
   *  configuration of this extension).
   *
   */
@@ -126,7 +126,7 @@
  
  /**
   * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
-@@ -1380,8 +1380,8 @@
+@@ -1381,8 +1381,8 @@
   * callbacks are provided by MBEDTLS_SSL_TICKET_C.
   *
   * Comment this macro to disable support for SSL session tickets
@@ -136,7 +136,7 @@
  
  /**
   * \def MBEDTLS_SSL_EXPORT_KEYS
-@@ -1411,7 +1411,7 @@
+@@ -1412,7 +1412,7 @@
   *
   * Comment this macro to disable support for truncated HMAC in SSL
   */
@@ -144,8 +144,8 @@
 +//#define MBEDTLS_SSL_TRUNCATED_HMAC
  
  /**
-  * \def MBEDTLS_THREADING_ALT
-@@ -1445,8 +1445,8 @@
+  * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+@@ -1470,8 +1470,8 @@
   * Requires: MBEDTLS_VERSION_C
   *
   * Comment this to disable run-time checking and save ROM space
@@ -155,7 +155,7 @@
  
  /**
   * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
-@@ -1773,7 +1773,7 @@
+@@ -1801,7 +1801,7 @@
   *  MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
   *  MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
   */
@@ -164,7 +164,7 @@
  
  /**
   * \def MBEDTLS_CCM_C
-@@ -1787,7 +1787,7 @@
+@@ -1815,7 +1815,7 @@
   * This module enables the AES-CCM ciphersuites, if other requisites are
   * enabled as well.
   */
@@ -173,7 +173,7 @@
  
  /**
   * \def MBEDTLS_CERTS_C
-@@ -1799,7 +1799,7 @@
+@@ -1827,7 +1827,7 @@
   *
   * This module is used for testing (ssl_client/server).
   */
@@ -182,7 +182,7 @@
  
  /**
   * \def MBEDTLS_CIPHER_C
-@@ -1852,7 +1852,7 @@
+@@ -1880,7 +1880,7 @@
   *
   * This module provides debugging functions.
   */
@@ -191,7 +191,7 @@
  
  /**
   * \def MBEDTLS_DES_C
-@@ -1881,7 +1881,7 @@
+@@ -1909,7 +1909,7 @@
   * \warning   DES is considered a weak cipher and its use constitutes a
   *security risk. We recommend considering stronger ciphers 
instead.
   */
@@ -200,7 +200,7 @@
  
  /**
   * \def MBEDTLS_DHM_C
-@@ -2042,8 +2042,8 @@
+@@ -2070,8 +2070,8 @@
   * Requires: MBEDTLS_MD_C
   *
   * Uncomment to enable the HMAC_DRBG random number geerator.
@@ -210,7 +210,7 @@
  
  /**
   * \def MBEDTLS_MD_C
-@@ -2337,7 +2337,7 @@
+@@ -2365,7 +2365,7 @@
   * Caller:  library/md.c
   *
   */
@@ -219,7 +219,7 @@
  
  /**
   * \def MBEDTLS_RSA_C
-@@ -2421,8 +2421,8 @@
+@@ -2449,8 +2449,8 @@
   * Caller:
   *
   * Requires: MBEDTLS_SSL_CACHE_C
@@ -229,7 +229,7 @@
  
  /**
   * \def MBEDTLS_SSL_COOKIE_C
-@@ -2443,8 +2443,8 @@
+@@ -2471,8 +2471,8 @@
   * Caller:
   *
   * Requires: MBEDTLS_CIPHER_C
@@ -239,7 +239,7 @@
  
  /**
   * \def MBEDTLS_SSL_CLI_C
-@@ -2543,8 +2543,8 @@
+@@ -2571,8 +2571,8 @@
   * Module:  library/version.c
   *
   * This module provides run-time version information.
@@ -249,7 +249,7 @@
  
  /**
   * \def MBEDTLS_X509_USE_C
-@@ -2654,7 +2654,7 @@
+@@ -2682,7 +2682,7 @@
   * Module:  library/xtea.c
   * Caller:
   */
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH 2/2] mtd-utils: activate --gc-sections

[Hauke Mehrtens]

This reduces the size of the binary a bit:

old:
 37556 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 81697 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

new:
 27450 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 71796 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/utils/mtd-utils/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile
index cf0983164a..806bba8a4f 100644
--- a/package/utils/mtd-utils/Makefile
+++ b/package/utils/mtd-utils/Makefile
@@ -62,6 +62,9 @@ CONFIGURE_ARGS += \
--without-xattr \
--without-lzo
 
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
 define Package/ubi-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) \
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH 1/2] mtd-utils: Mark some lzma functions as static

[Hauke Mehrtens]

These functions are not declared in any header file and only used in
same compile unit, mark them as static to remove one gcc warning and
make it easier for the compiler to optimize them out.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 .../utils/mtd-utils/patches/130-lzma_jffs2.patch   | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/package/utils/mtd-utils/patches/130-lzma_jffs2.patch 
b/package/utils/mtd-utils/patches/130-lzma_jffs2.patch
index 03bdb1260c..1344de5a13 100644
--- a/package/utils/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/package/utils/mtd-utils/patches/130-lzma_jffs2.patch
@@ -248,7 +248,7 @@
 +  #define LZMA_FREE free
 +  #define PRINT_ERROR(msg) fprintf(stderr, msg)
 +  #define INIT
-+  #define STATIC
++  #define STATIC static
 +#endif
 +
 +#include "lzma/LzmaDec.h"
@@ -952,9 +952,9 @@
 +}
 +
 +Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; 
}
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
 +
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
 +
 +void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
 +{
@@ -2360,7 +2360,7 @@
 +  p->needFlush = 0;
 +}
 +
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) 
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool 
initState) 
 +{ 
 +  p->needFlush = 1; 
 +  p->remainLen = 0; 
@@ -2780,7 +2780,7 @@
 +#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
 +#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
 +
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
 +{
 +  int c = 2, slotFast;
 +  g_FastPos[0] = 0;
@@ -3034,7 +3034,7 @@
 +  CSaveState saveState;
 +} CLzmaEnc;
 +
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
++static void LzmaEnc_SaveState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
 +  CSaveState *dest = >saveState;
@@ -3060,7 +3060,7 @@
 +  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
 +}
 +
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++static void LzmaEnc_RestoreState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *dest = (CLzmaEnc *)pp;
 +  const CSaveState *p = >saveState;
@@ -3303,7 +3303,7 @@
 +  while (symbol < 0x1);
 +}
 +
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
 +{
 +  UInt32 i;
 +  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << 
kNumMoveReducingBits))
@@ -4429,7 +4429,7 @@
 +  p->matchPriceCount = 0;
 +}
 +
-+void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
 +{
 +  RangeEnc_Construct(>rc);
 +  MatchFinder_Construct(>matchFinderBase);
@@ -4462,7 +4462,7 @@
 +  return p;
 +}
 +
-+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
 +{
 +  alloc->Free(alloc, p->litProbs);
 +  alloc->Free(alloc, p->saveState.litProbs);
@@ -4470,7 +4470,7 @@
 +  p->saveState.litProbs = 0;
 +}
 +
-+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
 +{
 +  #ifdef COMPRESS_MF_MT
 +  MatchFinderMt_Destruct(>matchFinderMt, allocBig);
@@ -4701,7 +4701,7 @@
 +  return SZ_OK;
 +}
 +
-+void LzmaEnc_Init(CLzmaEnc *p)
++static void LzmaEnc_Init(CLzmaEnc *p)
 +{
 +  UInt32 i;
 +  p->state = 0;
@@ -4760,7 +4760,7 @@
 +  p->lpMask = (1 << p->lp) - 1;
 +}
 +
-+void LzmaEnc_InitPrices(CLzmaEnc *p)
++static void LzmaEnc_InitPrices(CLzmaEnc *p)
 +{
 +  if (!p->fastMode)
 +  {
@@ -4801,7 +4801,7 @@
 +  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
 +}
 +
-+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, 
++static SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, 
 +ISeqInStream *inStream, UInt32 keepWindowSize,
 +ISzAlloc *alloc, ISzAlloc *allocBig)
 +{
@@ -4817,7 +4817,7 @@
 +  p->seqBufInStream.rem = srcLen;
 +}
 +
-+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT 
srcLen,
 +UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
 +{
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
@@ -4826,7 +4826,7 @@
 +  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
 +}
 +
-+void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
 +{
 +  #ifdef COMPRESS_MF_MT
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
@@ -4858,19 +4858,19 @@
 +}
 +
 +
-+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaE

[LEDE-DEV] [PATCH] mvebu: Add support for WRT3200ACM with new NAND flash

[Hauke Mehrtens]

From: Imre Kaloz <ka...@openwrt.org>

Newer Linksys boards might come with a Winbond W29N02GV which can be
configured in different ways. Make sure we configure it the same way as
the older chips so everything keeps working.

Signed-off-by: Imre Kaloz <ka...@openwrt.org>
---
 .../arch/arm/boot/dts/armada-385-linksys-rango.dts  |  2 ++
 .../arch/arm/boot/dts/armada-385-linksys-rango.dts  |  2 ++
 .../005-linksys_hardcode_nand_ecc_settings.patch| 17 +
 .../patches-4.14/220-disable-untested-dsa-boards.patch  |  2 +-
 ...RM-dts-armada-385-linksys-Disable-internal-RTC.patch |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 
target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch

diff --git 
a/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts 
b/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
index de1de79da9..ac4ac1b1b1 100644
--- 
a/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ 
b/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -186,6 +186,8 @@
flash@d {
status = "okay";
num-cs = <1>;
+   nand-ecc-strength = <4>;
+   nand-ecc-step-size = <512>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
diff --git 
a/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts 
b/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
index de1de79da9..ac4ac1b1b1 100644
--- 
a/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ 
b/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -186,6 +186,8 @@
flash@d {
status = "okay";
num-cs = <1>;
+   nand-ecc-strength = <4>;
+   nand-ecc-step-size = <512>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
diff --git 
a/target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch 
b/target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch
new file mode 100644
index 00..c00e153239
--- /dev/null
+++ 
b/target/linux/mvebu/patches-4.14/005-linksys_hardcode_nand_ecc_settings.patch
@@ -0,0 +1,17 @@
+Newer Linksys boards might come with a Winbond W29N02GV which can be
+configured in different ways. Make sure we configure it the same way
+as the older chips so everything keeps working.
+
+Signed-off-by: Imre Kaloz <ka...@openwrt.org>
+
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -185,6 +185,8 @@
+   /* 128MiB or 256MiB */
+   status = "okay";
+   num-cs = <1>;
++  nand-ecc-strength = <4>;
++  nand-ecc-step-size = <512>;
+   marvell,nand-keep-config;
+   marvell,nand-enable-arbiter;
+   nand-on-flash-bbt;
diff --git 
a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch 
b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
index 8f2275b1ff..5df94bdfad 100644
--- a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
+++ b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -194,6 +194,7 @@
+@@ -196,6 +196,7 @@
status = "okay";
  
switch@0 {
diff --git 
a/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
 
b/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
index ea5ad5acad..040d6590b5 100644
--- 
a/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
+++ 
b/target/linux/mvebu/patches-4.14/423-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
@@ -17,7 +17,7 @@ Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
 
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -302,3 +302,8 @@
+@@ -304,3 +304,8 @@
status = "okay";
usb-phy = <_1_phy>;
  };
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] leds-apu2: add newer board names

[Hauke Mehrtens]

On 03/29/2018 09:55 PM, Sebastian Fleer wrote:
> After building coreboot myself, I discovered that the board names
> changed again - they now seem to be the same as before.
> https://github.com/pcengines/coreboot/commit/3578e9fb6dac753ec9365c88a8556ca1b90a8deb
> 
> 
> I guess the "PC Engines apuX" strings can be considered to be a bug on
> the PCEngines side then. Just ignore my patch.
> Once there is a binary release of a fixed version (probably 4.6.8), I
> can put a note on the apu2 wiki page.
> 
> Sebastian

Is the coreboot version with the new board names used widely or can we
ignore that and drop your patch?

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] mac80211: update request

[Hauke Mehrtens]

On 03/29/2018 07:11 PM, Evgeniy Didin wrote:
> Hello,
> 
> Trying to add support of drivers/net/wireless/rsi/rsi91x driver in mac80211 
> we faced with problem,
> that the version of backports is quite old(2017-11-01), and at least one 
> significant commit for rsi91x was later than this version:
> https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-testing.git/commit/?id=e6b3b2ed3d270b3c7080c9cf7d28636dc74b0387
> Without this commit driver is not building.
> 
> Is there any possibility to update mac80211:backports version to more actual?
> 
> Best regards,
> Evgeniy Didin

Hi Evgeniy,

I think Felix does not want to update the wireless drivers before the
next release to not introduce more stability issues.
You can backport this patch by adding it to
package/kernel/mac80211/patches/ that should be fine.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] ath10k-ct: fix module depends

[Hauke Mehrtens]

PKG_EXTMOD_SUBDIRS should be set to the sub directory where the kernel
module gets build in, for the ath10k-ct driver this changed in commit
3888e77c1c68 from ath10k to ath10k-4.13. Without this fix the depends
line of the ath10*.ko modules is empty and the kernel module load system
will not automatically load the depended modules like mac80211.

Fixes: 3888e77c1c68 ("ath10k-ct driver: use dma_alloc_coherent, 4.13 based 
driver")
Fixes: 23a388fe41ec ("ath10k-ct: Force loading mac80211 and ath modules.")
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/kernel/ath10k-ct/Makefile | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/kernel/ath10k-ct/Makefile 
b/package/kernel/ath10k-ct/Makefile
index 8f9a8dd70f..fb2b8fafba 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -12,15 +12,15 @@ PKG_SOURCE_DATE:=2017-06-13
 PKG_SOURCE_VERSION:=e1edd74d5f0c5291b0be72c81033e74e267929d4
 
PKG_MIRROR_HASH:=945dc7110017a80c33cac20d9d2a9beda0a6a98b50178319403568098534e60a
 
-PKG_MAINTAINER:=Ben Greear <gree...@candelatech.com>
-PKG_BUILD_PARALLEL:=1
-PKG_EXTMOD_SUBDIRS:=ath10k
-
 # Build the 4.13 ath10k-ct driver version.  Other options are "-4.9", or
 # leave un-defined for 4.7 kernel.  Probably this should match as closely as
 # possible to whatever mac80211 backports version is being used.
 CT_KVER="-4.13"
 
+PKG_MAINTAINER:=Ben Greear <gree...@candelatech.com>
+PKG_BUILD_PARALLEL:=1
+PKG_EXTMOD_SUBDIRS:=ath10k$(CT_KVER)
+
 STAMP_CONFIGURED_DEPENDS := 
$(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
@@ -33,7 +33,7 @@ define KernelPackage/ath10k-ct
   FILES:=\
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
-  AUTOLOAD:=$(call AutoProbe,mac80211 ath ath10k_pci)
+  AUTOLOAD:=$(call AutoProbe,ath10k_pci)
 endef
 
 NOSTDINC_FLAGS = \
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] OpenWrt Summit 2018

[Hauke Mehrtens]

[forwarded from the OpenWrt mailing list]

Hi Everyone,

It's official, OpenWrt Summit will be in Lisbon, Portugal on October
29th & 30th! We can't wait to see you there. 

The CFP is open until May 15th - https://www.papercall.io/openwrtsummit2018

You can submit 20 or 40 minute talks, and 2 or 4 hour workshops. We're
looking forward to seeing the topics you all come up with!

If you have any questions, please ping me or any of the other committee
members. If you're interested in joining the committee, we'd love to
have you on board.

https://twitter.com/OpenWrtSummit/status/975450773495734278

All the best,
  Shelly Coen
 Community Manager, prpl Foundation

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] apm821xx target: kernel gets too big

[Hauke Mehrtens]

Hi,

After the upgrade to GCC 7.3 the kernel on the apm821xx target gets too
big for the meraki_mr24 device and the build in build bot is failing.
Could you please have a look at this problem:
http://phase1.builds.lede-project.org/builders/apm821xx%2Fnand

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] mvebu: Disable internal RTC on Linksys devices

[Hauke Mehrtens]

The internal RTC does not work correctly on these Linksys boards based
on Marvell SoCs. It is off by 3 minutes in 10 minutes running, this
was reported by multiple users. On the Linksys Mamba device the device
tree comment says that no crystal is connected to the internal RTC, this
is probably also true for the other devices.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 ...s-armada-385-linksys-Disable-internal-RTC.patch | 28 ++
 1 file changed, 28 insertions(+)
 create mode 100644 
target/linux/mvebu/patches-4.14/010-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch

diff --git 
a/target/linux/mvebu/patches-4.14/010-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
 
b/target/linux/mvebu/patches-4.14/010-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
new file mode 100644
index 00..38ebddb8ae
--- /dev/null
+++ 
b/target/linux/mvebu/patches-4.14/010-ARM-dts-armada-385-linksys-Disable-internal-RTC.patch
@@ -0,0 +1,28 @@
+From e1cac198fea08c31ec204bed84c279ab05d20389 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <ha...@hauke-m.de>
+Date: Sat, 17 Mar 2018 15:22:25 +0100
+Subject: ARM: dts: armada-385-linksys: Disable internal RTC
+
+The internal RTC does not work correctly on these Linksys boards based
+on Marvell SoCs. For me it only shows Wed Dec 31 23:59:59 1969 and for
+others it is off by 3 minutes in 10 minutes running, this was reported
+by multiple users. On the Linksys Mamba device the device tree comment
+says that no crystal is connected to the internal RTC, this is probably
+also true for the other devices.
+
+Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
+---
+ arch/arm/boot/dts/armada-385-linksys.dtsi | 5 +
+ 1 file changed, 5 insertions(+)
+
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -301,3 +301,8 @@
+   status = "okay";
+   usb-phy = <_1_phy>;
+ };
++
++ {
++  /* No crystal connected to the internal RTC */
++  status = "disabled";
++};
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH 2/2] mvebu: Add Solidrun RTC init patch.

[Hauke Mehrtens]

On 03/16/2018 01:53 AM, Rosen Penev wrote:
> Some boards like the Turris Omnia have an RTC chip that does not get 
> initialized. Initializing the RTC at the driver level helps get rid of 
> bootloader hacks that write special register values.

Please line break your commit message.

Will you send this patch upstream?

Is the RTC in the turris omnia battery backed and is a crystal connected
to it? There are a lot of problems with the RTC in the Linksys devices.

Hauke

> 
> Signed-off-by: Rosen Penev 
> ---
>  .../mvebu/patches-4.14/421-rtc-initialize.patch| 70 
> ++
>  1 file changed, 70 insertions(+)
>  create mode 100644 target/linux/mvebu/patches-4.14/421-rtc-initialize.patch
> 
> diff --git a/target/linux/mvebu/patches-4.14/421-rtc-initialize.patch 
> b/target/linux/mvebu/patches-4.14/421-rtc-initialize.patch
> new file mode 100644
> index 00..b6b96c985c
> --- /dev/null
> +++ b/target/linux/mvebu/patches-4.14/421-rtc-initialize.patch
> @@ -0,0 +1,70 @@
> +--- a/drivers/rtc/rtc-armada38x.c2017-12-11 18:32:22.329841869 +0200
>  b/drivers/rtc/rtc-armada38x.c2017-12-11 19:01:40.677854645 +0200
> +@@ -30,6 +30,9 @@
> + #define RTC_IRQ_FREQ_1HZBIT(2)
> + #define RTC_CCR 0x18
> + #define RTC_CCR_MODEBIT(15)
> ++#define RTC_CCR_NORMAL_PPB  0x2000
> ++#define RTC_TEST_CONF   0x1c
> ++#define RTC_TEST_CONF_MASK  0xff
> + 
> + #define RTC_TIME0xC
> + #define RTC_ALARM1  0x10
> +@@ -91,6 +94,7 @@
> + void (*clear_isr)(struct armada38x_rtc *rtc);
> + void (*unmask_interrupt)(struct armada38x_rtc *rtc);
> + u32 alarm;
> ++void (*init_rtc)(struct armada38x_rtc *rtc);
> + };
> + 
> + /*
> +@@ -202,6 +206,23 @@
> + writel(val | SOC_RTC_ALARM1_MASK, rtc->regs_soc + SOC_RTC_INTERRUPT);
> + }
> + 
> ++static void armada38x_rtc_init(struct armada38x_rtc *rtc)
> ++{
> ++u32 reg;
> ++
> ++/* Test RTC test configuration register bits [7:0] */
> ++reg = readl(rtc->regs + RTC_TEST_CONF);
> ++/* If bits [7:0] are non-zero, assume RTC was uninitialized */
> ++if (reg & RTC_TEST_CONF_MASK) {
> ++rtc_delayed_write(0, rtc, RTC_TEST_CONF);
> ++rtc_delayed_write(0, rtc, RTC_TIME);
> ++rtc_delayed_write((RTC_STATUS_ALARM1 | RTC_STATUS_ALARM2),
> ++rtc, RTC_STATUS);
> ++rtc_delayed_write(RTC_CCR_NORMAL_PPB, rtc, RTC_CCR);
> ++}
> ++return;
> ++}
> ++
> + static void armada8k_clear_isr(struct armada38x_rtc *rtc)
> + {
> + writel(RTC_8K_ALARM2, rtc->regs_soc + RTC_8K_ISR);
> +@@ -464,6 +485,7 @@
> + .clear_isr = armada38x_clear_isr,
> + .unmask_interrupt = armada38x_unmask_interrupt,
> + .alarm = ALARM1,
> ++.init_rtc = armada38x_rtc_init,
> + };
> + 
> + static const struct armada38x_rtc_data armada8k_data = {
> +@@ -558,6 +580,17 @@
> + dev_err(>dev, "Failed to register RTC device: %d\n", ret);
> + return ret;
> + }
> ++
> ++/*
> ++ * Try to detect if RTC is in uninitialized state.
> ++ * It is not definitive to know if the RTC is in an uninialized state 
> or not,
> ++ * but the following call will read some bits in the RTC unit and guess 
> if
> ++ * if it's in that state, and accordingly set it to sane default values.
> ++ */
> ++if (rtc->data->init_rtc) {
> ++rtc->data->init_rtc(rtc);
> ++}
> ++
> + return 0;
> + }
> + 
> 


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] uboot-mxs: fix compile problems related to OpenSSL

[Hauke Mehrtens]

On 03/17/2018 12:34 PM, Michael Heimpold wrote:
> Hi Hauke,
> 
> some comments below.
> 
> Am Freitag, 16. März 2018, 19:05:10 CET schrieb Hauke Mehrtens:
>> Use the UBOOT_MAKE_FLAGS defined in include/u-boot.mk and do not
>> overwrite them to compile the host tools against the shipped LibreSSL.
>> In addition add a patch to fix a compile problem when compiling the
>> tools against LibreSSL caused by differences in the API between OpenSSL
>> 1.1 and LibreSSL.
>>
>> This should fix the compile problems seen in build bot from time to time
>> by not depending on the host libssl-dev package any more but using the
>> LibreSSL version from OpenWrt.
>>
>> Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
>> ---
>>  package/boot/uboot-mxs/Makefile|  2 +-
>>  .../uboot-mxs/patches/001-add-i2se-duckbill.patch  | 26 
>> --
> 
> Changes in this file are not related to the patch description and this makes
> it hard to review your intended changes. Is it possible to re-submit a version
> without touching this file at all? I would really appreciate this.

I will do this in an extra patch. I just wanted to refresh my patch but
this was not done for the other patch before.

>>  ...s-mxsimage-Support-building-with-LibreSSL.patch | 25 
>> +
>>  3 files changed, 26 insertions(+), 27 deletions(-)
>>  create mode 100644 
>> package/boot/uboot-mxs/patches/002-tools-mxsimage-Support-building-with-LibreSSL.patch
>>
>> diff --git a/package/boot/uboot-mxs/Makefile 
>> b/package/boot/uboot-mxs/Makefile
>> index 6fde52ef56..cd752bb81a 100644
>> --- a/package/boot/uboot-mxs/Makefile
>> +++ b/package/boot/uboot-mxs/Makefile
>> @@ -35,7 +35,7 @@ UBOOT_TARGETS := \
>>  mx23_olinuxino \
>>  duckbill
>>  
>> -UBOOT_MAKE_FLAGS = $(UBOOT_IMAGE)
>> +UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE)
>>  
>>  define Build/InstallDev
>>  $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
>> diff --git a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch 
>> b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch
>> index 15217b57ee..1ad67fbba8 100644
>> --- a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch
>> +++ b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch
>> @@ -43,8 +43,6 @@ Signed-off-by: Stefan Wahren <stefan.wah...@i2se.com>
>>   create mode 100644 configs/duckbill_defconfig
>>   create mode 100644 include/configs/duckbill.h
>>  
>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> -index 30e71b2..b77e778 100644
>>  --- a/arch/arm/Kconfig
>>  +++ b/arch/arm/Kconfig
>>  @@ -373,6 +373,12 @@ config TARGET_MX28EVK
>> @@ -77,9 +75,6 @@ index 30e71b2..b77e778 100644
>>   default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
>>  default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
>>   
>> -diff --git a/board/i2se/duckbill/Kconfig b/board/i2se/duckbill/Kconfig
>> -new file mode 100644
>> -index 000..98c1e46
>>  --- /dev/null
>>  +++ b/board/i2se/duckbill/Kconfig
>>  @@ -0,0 +1,15 @@
>> @@ -98,9 +93,6 @@ index 000..98c1e46
>>  +   default "duckbill"
>>  +
>>  +endif
>> -diff --git a/board/i2se/duckbill/MAINTAINERS 
>> b/board/i2se/duckbill/MAINTAINERS
>> -new file mode 100644
>> -index 000..5496baa
>>  --- /dev/null
>>  +++ b/board/i2se/duckbill/MAINTAINERS
>>  @@ -0,0 +1,6 @@
>> @@ -110,9 +102,6 @@ index 000..5496baa
>>  +F: board/i2se/duckbill/
>>  +F: include/configs/duckbill.h
>>  +F: configs/duckbill_defconfig
>> -diff --git a/board/i2se/duckbill/Makefile b/board/i2se/duckbill/Makefile
>> -new file mode 100644
>> -index 000..66baec4
>>  --- /dev/null
>>  +++ b/board/i2se/duckbill/Makefile
>>  @@ -0,0 +1,12 @@
>> @@ -128,9 +117,6 @@ index 000..66baec4
>>  +else
>>  +obj-y  := iomux.o
>>  +endif
>> -diff --git a/board/i2se/duckbill/duckbill.c b/board/i2se/duckbill/duckbill.c
>> -new file mode 100644
>> -index 000..caeb903
>>  --- /dev/null
>>  +++ b/board/i2se/duckbill/duckbill.c
>>  @@ -0,0 +1,181 @@
>> @@ -315,9 +301,6 @@ index 000..caeb903
>>  +
>>  +   return 0;
>>  +}
>> -diff --git a/board/i2se/duckbill/iomux.c b/board/i2se/duckbill/iomux.c
>> -new file mode 100644
>> -index 000..b3c4d92
>>  --- /dev/null
>>  +++ b/board/i2se/duckbill/iomux.c
>>  @@ -0,0 +1,157 @@
>> @@ -478,9 +461,6 @@ index 000..b3c4d92
>>  +   else
>

[LEDE-DEV] uboot-mxs: fix compile problems related to OpenSSL

[Hauke Mehrtens]

Use the UBOOT_MAKE_FLAGS defined in include/u-boot.mk and do not
overwrite them to compile the host tools against the shipped LibreSSL.
In addition add a patch to fix a compile problem when compiling the
tools against LibreSSL caused by differences in the API between OpenSSL
1.1 and LibreSSL.

This should fix the compile problems seen in build bot from time to time
by not depending on the host libssl-dev package any more but using the
LibreSSL version from OpenWrt.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/boot/uboot-mxs/Makefile|  2 +-
 .../uboot-mxs/patches/001-add-i2se-duckbill.patch  | 26 --
 ...s-mxsimage-Support-building-with-LibreSSL.patch | 25 +
 3 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 
package/boot/uboot-mxs/patches/002-tools-mxsimage-Support-building-with-LibreSSL.patch

diff --git a/package/boot/uboot-mxs/Makefile b/package/boot/uboot-mxs/Makefile
index 6fde52ef56..cd752bb81a 100644
--- a/package/boot/uboot-mxs/Makefile
+++ b/package/boot/uboot-mxs/Makefile
@@ -35,7 +35,7 @@ UBOOT_TARGETS := \
mx23_olinuxino \
duckbill
 
-UBOOT_MAKE_FLAGS = $(UBOOT_IMAGE)
+UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE)
 
 define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
diff --git a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch 
b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch
index 15217b57ee..1ad67fbba8 100644
--- a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch
+++ b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch
@@ -43,8 +43,6 @@ Signed-off-by: Stefan Wahren <stefan.wah...@i2se.com>
  create mode 100644 configs/duckbill_defconfig
  create mode 100644 include/configs/duckbill.h
 
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 30e71b2..b77e778 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -373,6 +373,12 @@ config TARGET_MX28EVK
@@ -77,9 +75,6 @@ index 30e71b2..b77e778 100644
  default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
  
-diff --git a/board/i2se/duckbill/Kconfig b/board/i2se/duckbill/Kconfig
-new file mode 100644
-index 000..98c1e46
 --- /dev/null
 +++ b/board/i2se/duckbill/Kconfig
 @@ -0,0 +1,15 @@
@@ -98,9 +93,6 @@ index 000..98c1e46
 +  default "duckbill"
 +
 +endif
-diff --git a/board/i2se/duckbill/MAINTAINERS b/board/i2se/duckbill/MAINTAINERS
-new file mode 100644
-index 000..5496baa
 --- /dev/null
 +++ b/board/i2se/duckbill/MAINTAINERS
 @@ -0,0 +1,6 @@
@@ -110,9 +102,6 @@ index 000..5496baa
 +F:board/i2se/duckbill/
 +F:include/configs/duckbill.h
 +F:configs/duckbill_defconfig
-diff --git a/board/i2se/duckbill/Makefile b/board/i2se/duckbill/Makefile
-new file mode 100644
-index 000..66baec4
 --- /dev/null
 +++ b/board/i2se/duckbill/Makefile
 @@ -0,0 +1,12 @@
@@ -128,9 +117,6 @@ index 000..66baec4
 +else
 +obj-y := iomux.o
 +endif
-diff --git a/board/i2se/duckbill/duckbill.c b/board/i2se/duckbill/duckbill.c
-new file mode 100644
-index 000..caeb903
 --- /dev/null
 +++ b/board/i2se/duckbill/duckbill.c
 @@ -0,0 +1,181 @@
@@ -315,9 +301,6 @@ index 000..caeb903
 +
 +  return 0;
 +}
-diff --git a/board/i2se/duckbill/iomux.c b/board/i2se/duckbill/iomux.c
-new file mode 100644
-index 000..b3c4d92
 --- /dev/null
 +++ b/board/i2se/duckbill/iomux.c
 @@ -0,0 +1,157 @@
@@ -478,9 +461,6 @@ index 000..b3c4d92
 +  else
 +  mxs_iomux_setup_multiple_pads(iomux_setup_v1, 
ARRAY_SIZE(iomux_setup_v1));
 +}
-diff --git a/configs/duckbill_defconfig b/configs/duckbill_defconfig
-new file mode 100644
-index 000..2adce92
 --- /dev/null
 +++ b/configs/duckbill_defconfig
 @@ -0,0 +1,31 @@
@@ -515,9 +495,6 @@ index 000..2adce92
 +CONFIG_ENV_IS_IN_MMC=y
 +CONFIG_MMC_MXS=y
 +CONFIG_OF_LIBFDT=y
-diff --git a/include/configs/duckbill.h b/include/configs/duckbill.h
-new file mode 100644
-index 000..f9374c6
 --- /dev/null
 +++ b/include/configs/duckbill.h
 @@ -0,0 +1,199 @@
@@ -720,6 +697,3 @@ index 000..f9374c6
 +#include 
 +
 +#endif /* __CONFIGS_DUCKBILL_H__ */
--- 
-2.7.4
-
diff --git 
a/package/boot/uboot-mxs/patches/002-tools-mxsimage-Support-building-with-LibreSSL.patch
 
b/package/boot/uboot-mxs/patches/002-tools-mxsimage-Support-building-with-LibreSSL.patch
new file mode 100644
index 00..1870fd094e
--- /dev/null
+++ 
b/package/boot/uboot-mxs/patches/002-tools-mxsimage-Support-building-with-LibreSSL.patch
@@ -0,0 +1,25 @@
+From 461e8174de320dac1aee1c1b61a9f0f5cfc38a00 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <ha...@hauke-m.de>
+Date: Sat, 17 Feb 2018 15:34:19 +0100
+Subject: [PATCH] tools/mxsimage: Support building with LibreSSL
+
+The mxsimage utility fails to compile against LibreSSL because LibreSSL
+says it is OpenSSL 2.0, but it does not support the complete OpenSSL 1.1
+interface.
+

Re: [LEDE-DEV] [openwrt/openwrt] toolchain/binutils: add support for version 2.30

[Hauke Mehrtens]

On 03/12/2018 09:48 PM, Arjen de Korte wrote:
> Citeren Felix Fietkau :
> 
>> On 2018-03-12 21:02, Arjen de Korte wrote:
>>> Citeren LEDE Commits :
>>>
 nbd pushed a commit to openwrt/openwrt.git, branch master:
 https://git.lede-project.org/e28551b103f4999b36d3725a23b59f507830f48a

 commit e28551b103f4999b36d3725a23b59f507830f48a
 Author: Felix Fietkau 
 AuthorDate: Thu Mar 8 11:21:58 2018 +0100

     toolchain/binutils: add support for version 2.30

     Signed-off-by: Felix Fietkau 
>>>
>>> This doesn't fly. The 'binutils-2.30.tar.bz2' archive bundles *.rej
>>> files:
>>>
>>>  binutils-2.30/ld/ChangeLog.rej
>>>  binutils-2.30/ld/ldlang.c.rej
>>>
>>> which causes fatal build errors
>>>
>>>  Aborting.  Reject files found.
>>>
>>> Oops.
>> Forgot to push another change that I had to address this. Fixed now.
> 
> Slight uncomfortable feeling remains why these broken patches made it
> into the binutils archive in the first place. Is there something missing
> which really should have been included, or are these the remnants of
> patches that have been superseded?

Hi Arjen,

Could you please send a mail to the binutils people so they can comment
on this and fix this in their next release.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] rtl8189fs/rtl8189es/rtl8723bs cfg80211_rtw_add_virtual_intf broken

[Hauke Mehrtens]

Hi,

I tried to make the crappy Realtek rtl8189fs/rtl8189es/rtl8723bs wifi
drivers work in OpenWrt, but gave up for now. I just want to write my
current observations.

When OpenWrt finds a nl80211 compatible wifi device it deletes all the
existing virtual interfaces and then creates the configured interfaces
again, this works with all the supported cfg80211 based wifi drivers in
OpenWrt and is ok in my opinion. See:
https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh;h=bf9d52ae4203c294e25487f1678cfcd25e7a1dce;hb=HEAD#l465

This does not work with the crappy Realtek drivers. Deletion of
interfaces is supported by the crappy Realtek driver, but it can only
create monitor interfaces again and no managed or ap interfaces, which
makes it pretty useless.

To support these drivers the cfg80211_rtw_add_virtual_intf() functions
has to support adding an interface other than the monitor interface.

rtl8723bs:
https://elixir.bootlin.com/linux/latest/source/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c#L2713

rtl8189es:
https://github.com/jwrdegoede/rtl8189ES_linux/blob/master/os_dep/linux/ioctl_cfg80211.c#L3994

rtl8189fs:
https://github.com/jwrdegoede/rtl8189ES_linux/blob/rtl8189fs/os_dep/linux/ioctl_cfg80211.c#L4040

I added these drivers to OpenWrt, but will not merge this into master as
long as it does not work at all in OpenWrt, see my development branch here:
https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/rtl8189

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] sunxi: bpi-r1 switch configuration missing in latest development trunk for 18.0x

[Hauke Mehrtens]

On 03/08/2018 02:16 AM, TheWerthFam wrote:
> I think that seems reasonable to configure the switch, however the first
> problem to solve is that the B53 driver is not getting loaded.
> Derek

Please do not top post!

Could you please try the master branch of my staging tree from here with
kernel 4.14 on your board:
https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=summary

In reverted this commit liked Florian suggested:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d7b9eaff5f0ca00726336b4c0c3c29decf30412a

Hauke

> 
> On 03/07/2018 07:17 PM, Hartmut Knaack wrote:
>> TheWerthFam schrieb am 08.03.2018 um 00:22:
>>> Rebuilt the latest truck with the 4.9 kernel and the switch behaves the
>>> same as with 4.14.
>>> AT first look this problem seem similar to
>>> http://lists.infradead.org/pipermail/lede-bugs/2018-February/006906.html
>>> problem with the same switch chip BCM53125 and the migration to mdio vs
>>> older swconfig.
>>>
>>>
>>> grep SWCONFIG_B53 config-4.9
>>> CONFIG_SWCONFIG_B53=y
>>> # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
>>> CONFIG_SWCONFIG_B53_PHY_DRIVER=y
>>> CONFIG_SWCONFIG_B53_PHY_FIXUP=y
>>> # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
>>>
>>> /etc/modules.d doesn't have any b53 items
>>> lsmod doesn't show any b53 items.  Not sure the driver is getting
>>> loaded.
>>>
>>> Found a few other threads dealing with the chip set in other versions of
>>> linux when the 4.9 kernel driver came out. These seem like they are
>>> relevant, though I'm not sure what has been done to the openwrt sunxi
>>> branch of the source to accommodate the b53 driver now in mainline
>>> kernel and move to mdio.  I believe that the EA9500 uses the same switch
>>> chipset.
>>>
>>> Getting the driver working in Arbian with kernel 4.9
>>> https://github.com/armbian/build/issues/511#issuecomment-269622336
>>>
>>> Driver now in mainline 4.9
>>> https://forum.armbian.com/topic/2690-issues-with-lamobo-r1-and-new-distribution/
>>>
>>>
>>> Info on setting up the new driver
>>> https://lwn.net/Articles/634787/
>>>
>>> Anything else I can do to diagnose?
>> Well, we were facing these problems quite some time ago with armbian.
>> Some time around kernel 4.8 or 4.9, the DSA version of a b53 driver got
>> into mainline kernel, so swconfig didn't work any longer. So, how to
>> diagnose? Simple: if swconfig can't detect a switch, but you can
>> configure
>> it using ip and bridge as described in my posts of that armbian issue 511
>> thread, then you are dealing with the DSA driver.
>> Hope that helps
>>
>> Hartmut
>>
>>> Thanks
>>>       Derek
>>>
>>> On 03/04/2018 05:05 PM, Hauke Mehrtens wrote:
>>>> On 03/04/2018 07:44 PM, Florian Fainelli wrote:
>>>>> +Jonas,
>>>>>
>>>>> On 03/04/2018 05:09 AM, TheWerthFam wrote:
>>>>>> Full kernel log below. I remove the 8192cu wifi driver since it
>>>>>> doesn't
>>>>>> work in AP mode and use a rt2800 base usb dongle.. Additionally grep
>>>>>> output of config-4.14 for SWCONFIG
>>>>>> grep SWCONFIG target/linux/sunxi/config-4.14
>>>>>> CONFIG_SWCONFIG=y
>>>>>> CONFIG_SWCONFIG_B53=y
>>>>>> # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
>>>>>> CONFIG_SWCONFIG_B53_PHY_DRIVER=y
>>>>>> CONFIG_SWCONFIG_B53_PHY_FIXUP=y
>>>>>> # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
>>>>> (please don't top post). I thought somehow that:
>>>>>
>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d7b9eaff5f0ca00726336b4c0c3c29decf30412a
>>>>>
>>>>>
>>>>> could be responsible for what you are seeing, but this was already
>>>>> included in 4.9, so this must be something else.
>>>> lede-17.01 used kernel 4.4, did kernel 4.9 worked for you?
>>>> If you also had the same problem in kernel 4.9 please try to revert the
>>>> commit Florian showed.
>>>>
>>>> Hauke
>>>>
>>>>>> kernel log
>>>>>> [    0.00] Booting Linux on physical CPU 0x0
>>>>>> [    0.00] Linux version 4.14.20 (dandv@t420s) (gcc version 5.5.0
>>>>>> (OpenWrt GCC 5.5.0 r6351-694f0bb5af)) #0 SMP PREEMPT Fri Mar 2
>>>>>&g

Re: [LEDE-DEV] sunxi: bpi-r1 switch configuration missing in latest development trunk for 18.0x

[Hauke Mehrtens]

On 03/04/2018 07:44 PM, Florian Fainelli wrote:
> +Jonas,
> 
> On 03/04/2018 05:09 AM, TheWerthFam wrote:
>> Full kernel log below. I remove the 8192cu wifi driver since it doesn't
>> work in AP mode and use a rt2800 base usb dongle.. Additionally grep
>> output of config-4.14 for SWCONFIG
>> grep SWCONFIG target/linux/sunxi/config-4.14
>> CONFIG_SWCONFIG=y
>> CONFIG_SWCONFIG_B53=y
>> # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
>> CONFIG_SWCONFIG_B53_PHY_DRIVER=y
>> CONFIG_SWCONFIG_B53_PHY_FIXUP=y
>> # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
> 
> (please don't top post). I thought somehow that:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d7b9eaff5f0ca00726336b4c0c3c29decf30412a
> 
> could be responsible for what you are seeing, but this was already
> included in 4.9, so this must be something else.

lede-17.01 used kernel 4.4, did kernel 4.9 worked for you?
If you also had the same problem in kernel 4.9 please try to revert the
commit Florian showed.

Hauke

> 
>>
>> kernel log
>> [    0.00] Booting Linux on physical CPU 0x0
>> [    0.00] Linux version 4.14.20 (dandv@t420s) (gcc version 5.5.0
>> (OpenWrt GCC 5.5.0 r6351-694f0bb5af)) #0 SMP PREEMPT Fri Mar 2 14:58:09
>> 2018
>> [    0.00] CPU: ARMv7 Processor [410fc074] revision 4 (ARMv7),
>> cr=30c5387d
>> [    0.00] CPU: div instructions available: patching division code
>> [    0.00] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing
>> instruction cache
>> [    0.00] OF: fdt: Machine model: Lamobo R1
>> [    0.00] Memory policy: Data cache writealloc
>> [    0.00] On node 0 totalpages: 262144
>> [    0.00] free_area_init_node: node 0, pgdat c0c4f040, node_mem_map
>> ef7fa000
>> [    0.00]   Normal zone: 1536 pages used for memmap
>> [    0.00]   Normal zone: 0 pages reserved
>> [    0.00]   Normal zone: 196608 pages, LIFO batch:31
>> [    0.00]   HighMem zone: 65536 pages, LIFO batch:15
>> [    0.00] psci: probing for conduit method from DT.
>> [    0.00] psci: Using PSCI v0.1 Function IDs from DT
>> [    0.00] random: get_random_bytes called from
>> start_kernel+0x90/0x400 with crng_init=0
>> [    0.00] percpu: Embedded 16 pages/cpu @ef7be000 s34188 r8192
>> d23156 u65536
>> [    0.00] pcpu-alloc: s34188 r8192 d23156 u65536 alloc=16*4096
>> [    0.00] pcpu-alloc: [0] 0 [0] 1
>> [    0.00] Built 1 zonelists, mobility grouping on.  Total pages:
>> 260608
>> [    0.00] Kernel command line: console=ttyS0,115200 earlyprintk
>> root=/dev/mmcblk0p2 rootwait
>> [    0.00] PID hash table entries: 4096 (order: 2, 16384 bytes)
>> [    0.00] Dentry cache hash table entries: 131072 (order: 7, 524288
>> bytes)
>> [    0.00] Inode-cache hash table entries: 65536 (order: 6, 262144
>> bytes)
>> [    0.00] Memory: 1028452K/1048576K available (4766K kernel code,
>> 318K rwdata, 1368K rodata, 2048K init, 245K bss, 20124K reserved, 0K
>> cma-reserved, 262144K highmem)
>> [    0.00] Virtual kernel memory layout:
>> [    0.00] vector  : 0x - 0x1000   (   4 kB)
>> [    0.00] fixmap  : 0xffc0 - 0xfff0   (3072 kB)
>> [    0.00] vmalloc : 0xf080 - 0xff80   ( 240 MB)
>> [    0.00] lowmem  : 0xc000 - 0xf000   ( 768 MB)
>> [    0.00] pkmap   : 0xbfe0 - 0xc000   (   2 MB)
>> [    0.00] modules : 0xbf00 - 0xbfe0   (  14 MB)
>> [    0.00]   .text : 0xc0008000 - 0xc06a78e0   (6783 kB)
>> [    0.00]   .init : 0xc0a0 - 0xc0c0   (2048 kB)
>> [    0.00]   .data : 0xc0c0 - 0xc0c4f940   ( 319 kB)
>> [    0.00]    .bss : 0xc0c55d7c - 0xc0c9344c   ( 246 kB)
>> [    0.00] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1
>> [    0.00] Preemptible hierarchical RCU implementation.
>> [    0.00]     RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=2.
>> [    0.00]     Tasks RCU enabled.
>> [    0.00] RCU: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=2
>> [    0.00] NR_IRQS: 16, nr_irqs: 16, preallocated irqs: 16
>> [    0.00] GIC: Using split EOI/Deactivate mode
>> [    0.00] arch_timer: cp15 timer(s) running at 24.00MHz (phys).
>> [    0.00] clocksource: arch_sys_counter: mask: 0xff
>> max_cycles: 0x588fe9dc0, max_idle_ns: 440795202592 ns
>> [    0.08] sched_clock: 56 bits at 24MHz, resolution 41ns, wraps
>> every 4398046511097ns
>> [    0.21] Switching to timer-based delay loop, resolution 41ns
>> [    0.000560] clocksource: timer: mask: 0x max_cycles:
>> 0x, max_idle_ns: 79635851949 ns
>> [    0.000843] clocksource: hstimer: mask: 0x max_cycles:
>> 0x, max_idle_ns: 12741736309 ns
>> [    0.001002] Console: colour dummy device 80x30
>> [    0.001040] Calibrating delay loop (skipped), value calculated using
>> timer frequency.. 48.00 BogoMIPS (lpj=24)
>> [    0.001057] pid_max: default: 32768 

Re: [LEDE-DEV] [PATCH] Revert "firmware: ath10k-firmware: update QCA988x firmware to 10.2.4-1.0-00033"

[Hauke Mehrtens]

On 03/04/2018 06:40 PM, Rosen Penev wrote:
> I would like this to be backported to 17.01 as well. The mentioned
> Archer C7v2 runs 17.01. No impact between 17.01 and master.
> 
> On Sun, Mar 4, 2018 at 9:31 AM, Rosen Penev  wrote:
>> This reverts commit 8d755ef052dca29db3b8da74149d9c7d74a54842.
>>
>> The 33 firmware for QCA988x is not stable for me on both my Turris Omnia and 
>> my Archer C7v2. With version 33, I cannot get uptime longer than 2 days 
>> before the ath10k driver crashes. With version 29, I've gotten 49 days 
>> uptime with 29 of those days having a properly working 5GHz interface.
>>
>> I have also tested version 37 but that one behaves similar to 33 with the 
>> ath10k driver crashing.
>>
>> Other reports indicate similar findings: 
>> https://forum.lede-project.org/t/archer-c7-v4-support/3924/152
>>
>> Signed-off-by: Rosen Penev 
>> ---
>>  package/firmware/ath10k-firmware/Makefile | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/firmware/ath10k-firmware/Makefile 
>> b/package/firmware/ath10k-firmware/Makefile
>> index 5b582085a4..2fc3618995 100644
>> --- a/package/firmware/ath10k-firmware/Makefile
>> +++ b/package/firmware/ath10k-firmware/Makefile
>> @@ -253,7 +253,7 @@ define Package/ath10k-firmware-qca988x/install
>> $(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
>> $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
>> $(INSTALL_DATA) \
>> -   
>> $(PKG_BUILD_DIR)/QCA988X/hw2.0/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00033 \
>> +   
>> $(PKG_BUILD_DIR)/QCA988X/hw2.0/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00029 \
>> $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
>>  endef

I also saw problems with the 10.2.4-1.0-00033 FW on my BT HH5, the
ath10k wifi was just not available after some time.
I am now trying the FW 10.2.4-1.0-00037, see this commit:
https://github.com/kvalo/ath10k-firmware/commit/31695fbc77f81391f579747bb8e51c50a581c3cd

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH][lede-17.01] mbedtls: update to version 2.7.0

[Hauke Mehrtens]

This fixes the following security problems:
* CVE-2018-0488: Risk of remote code execution when truncated HMAC is enabled
* CVE-2018-0487: Risk of remote code execution when verifying RSASSA-PSS 
signatures

This release is also ABI incompatible with the previous one, but it is
API compatible.

Some functions used by a lot of other software was renamed and the old
function names are provided as a static inline now, but they are only
active when deprecated functions are allowed, deactivate the removal of
deprecated functions for now.

Also increase the PKG_RELEASE version to force a rebuild and update of
packages depending on mbedtls to handle the changed ABI.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/libs/mbedtls/Makefile |  4 +-
 package/libs/mbedtls/patches/200-config.patch | 83 ---
 package/libs/ustream-ssl/Makefile |  2 +-
 package/network/services/openvpn/Makefile |  2 +-
 package/network/utils/curl/Makefile   |  2 +-
 package/utils/px5g/Makefile   |  2 +-
 6 files changed, 42 insertions(+), 53 deletions(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 0e3383150d..4ffe04cd4d 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mbedtls
-PKG_VERSION:=2.6.0
+PKG_VERSION:=2.7.0
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
 PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_HASH:=a99959d7360def22f9108d2d487c9de384fe76c349697176b1f22370080d5810
+PKG_HASH:=2c6fe289b4b50bf67b4839e81b07fcf52a19f5129d0241d2aa4d49cb1ef11e4f
 
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
diff --git a/package/libs/mbedtls/patches/200-config.patch 
b/package/libs/mbedtls/patches/200-config.patch
index ce32be76a5..55403c9b5b 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -1,15 +1,6 @@
 --- a/include/mbedtls/config.h
 +++ b/include/mbedtls/config.h
-@@ -220,7 +220,7 @@
-  *
-  * Uncomment to get errors on using deprecated functions.
-  */
--//#define MBEDTLS_DEPRECATED_REMOVED
-+#define MBEDTLS_DEPRECATED_REMOVED
- 
- /* \} name SECTION: System support */
- 
-@@ -539,17 +539,17 @@
+@@ -566,17 +566,17 @@
   *
   * Comment macros to disable the curve and functions for it
   */
@@ -35,7 +26,7 @@
  #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
  
  /**
-@@ -574,8 +574,8 @@
+@@ -601,8 +601,8 @@
   * Requires: MBEDTLS_HMAC_DRBG_C
   *
   * Comment this macro to disable deterministic ECDSA.
@@ -45,16 +36,16 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-@@ -621,7 +621,7 @@
-  *  MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
-  *  MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
+@@ -655,7 +655,7 @@
+  * See dhm.h for more details.
+  *
   */
 -#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
 +//#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -640,8 +640,8 @@
+@@ -674,8 +674,8 @@
   *  MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
   *  MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
   *  MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
@@ -64,7 +55,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
-@@ -666,7 +666,7 @@
+@@ -700,7 +700,7 @@
   *  MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
   *  MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
   */
@@ -73,7 +64,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -793,7 +793,7 @@
+@@ -834,7 +834,7 @@
   *  MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
   *  MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
   */
@@ -82,7 +73,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-@@ -817,7 +817,7 @@
+@@ -858,7 +858,7 @@
   *  MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
   *  MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
   */
@@ -91,7 +82,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-@@ -921,7 +921,7 @@
+@@ -962,7 +962,7 @@
   * This option is only useful if both MBEDTLS_SHA256_C and
   * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
   */
@@ -100,7 +91,7 @@
  
  /**
   * \def MBEDTLS_ENTROPY_NV_SEED
-@@ -1015,14 +1015,14 @@
+@@ -1056,14 +1056,14 @@
   * Uncomment this macro to disable the use of CRT in RSA.
   *
   */
@@ -117,7 +108,7 @@
  
  /**
   * \def MBEDTLS_SHA256_SMALLER
-@@ -1038,7 +1038,7 @@
+@@ -1079,7 +1079,7 @@
   *
   * Uncomment to enable the smaller implementation of SHA256.
   */
@@ -126,17 +117,16 @@
  
  /**
   * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
-@@ -1157,8 +1157,8 @@
-  * misuse/misunderstand.
+@@ -1206,7 +1206,7 @@
+  *  configuration of this extension).
   *
-  * Comment this to disable support for renegotiation.
-- */
- #define MBEDTLS_SSL_RENEGOTIATION
-+ */
+  */
+-#define MBEDTLS_SSL_RENEGOTIATION
++//#define MBEDTLS_SSL_RENEGOTIATION
  
  /**
   

Re: [LEDE-DEV] 18.03/4 -> GCC 5 or 7

[Hauke Mehrtens]

On 03/04/2018 04:40 PM, Felix Fietkau wrote:
> On 2018-03-04 16:15, Hauke Mehrtens wrote:
>> There is also a pull request for busybox 2.28.1 at github, this will
>> probably also introduce some more regressions, so I am not sure if we
>> should take it before or after the release.
>> https://github.com/openwrt/openwrt/pull/733
>> I do not have a real opinion on this and I am probably the wrong person
>> to judge this.
> Anything useful in there?

I haven't seen there anything useful, except support for some new MIPS
ISAs, but I do not know if they ever will be relevant.
binutils:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob_plain;f=binutils/NEWS;hb=refs/tags/binutils-2_30
gas:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob_plain;f=gas/NEWS;hb=refs/tags/binutils-2_30
ld:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob_plain;f=ld/NEWS;hb=refs/tags/binutils-2_30

>> I do not know what the status of the software fast path patches are, but
>> they are looking interesting.
> I think the flow offload support will be ready soon. So far it's looking
> good aside from some issues with TCP connection timeout handling that
> I'm going to deal with soon. We should make it clear that those patches
> are still experimental though.
> 
>> My proposal would be to update all targets to GCC 7.3 and also use
>> binutils 2.29.1 and musl 1.1.19. This change would be done as soon as
>> possible and then we branch of end of March or beginning of April for
>> 18.X and do a RC1 one week after creating the branch.
> Fine with me. I'll run some more test builds for various architectures.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] 18.03/4 -> GCC 5 or 7

[Hauke Mehrtens]

On 02/16/2018 01:46 PM, John Crispin wrote:
> Hi,
> 
> whats on the critical todo list for the upcoming release ? i still have
> a few minor things that I'll be adding shortly, apart from that I am
> currently not aware of any huge problems. the release will be a mix
> between 4.9 and 4.14 afaik !?

I think the kernel situation is ok now and not blocking a release, we
will have a mixed kernel 4.9 and 4.14 release. All important targets are
on one of these two kernel versions by now.
The patches for the gemini target will probably get included soon.
Some targets will probably be updated from 4.9 to 4.14, but this is not
blocking.


What do we want to do with GCC 5.5 versus 7.3?
GCC 5.5 is getting old, we have multiple problems with it, the big
blocker for GCC 7 was just fixed upstream and we backported that fix.
see: http://git.openwrt.org/25aaff9100065dba881be71b9dcab1e9cc8a7b5f
The x86 and x86_64 architectures are already on GCC 7.3, the ARC
architecture uses their own GCC fork based on version 7.X all other
architectures are on GCC 5.5.

We have the following problems with GCC 5.5:
 * U-Boot depends on GCC 6 or higher since version 2018.01 on ARM and ARM64
  * GCC 5 and older are producing too big binaries, e.g. the SPL on the
Allwinner A64 (sunxi, ARM64) is getting too big starting with U-Boot
2017.09 and does not fit into the SRAM any more, GCC 7 solves this problem.
 * busybox on the gemini target updated to kernel 4.14 does not work
correctly.
 * GCC 5.5 only has out of tree fixes for Spectre, GCC 7.3 already has
the retpoline fixes against Spectre included

As the x86 target use GCC 7.3 now, there are multiple pull requests
fixing some build problems in some packages with GCC 7.
I am not aware of any regressions in GCC 7 compared to GCC 5.
Changing the default compiler from GCC 5 to GCC 7 is no big problem, the
problems are the regressions we are not aware of by now, if we change
the default compiler for all architectures to GCC 7 we should probably
wait 4 weeks before doing an RC release to be sure most of the runtime
problems with GCC 7 are found.

If we do the switch to GCC 7 I think we should also change binutils from
2.28 to 2.28.1 or 2.29.1. I found this problem with binutils 2.28 which
was already fixed in 2.28.1:
https://git.openwrt.org/bcd17ce9a3308accc30d99f4dd43f2062bb3fabc
The minor versions contains more bugfixes.


There is also a pull request for busybox 2.28.1 at github, this will
probably also introduce some more regressions, so I am not sure if we
should take it before or after the release.
https://github.com/openwrt/openwrt/pull/733
I do not have a real opinion on this and I am probably the wrong person
to judge this.


I do not know what the status of the software fast path patches are, but
they are looking interesting.


My proposal would be to update all targets to GCC 7.3 and also use
binutils 2.29.1 and musl 1.1.19. This change would be done as soon as
possible and then we branch of end of March or beginning of April for
18.X and do a RC1 one week after creating the branch.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] Spectre vulnerability & LEDE 17.01 release

[Hauke Mehrtens]

On 02/27/2018 11:37 AM, Rafał Miłecki wrote:
> There has been some talk on upcoming 17.01 fix release and Meltdown/Spectre.
> 
> Quick summary:
> 1) Most of LEDE supported devices aren't affected
> 2) For most LEDE use cases these vulnerabilities don't matter
> 3) 17.01 uses 4.4.116 which includes Meltdown fixes
> 4) Spectre mitigation requires newer GCC and CPU microcode update
> 5) Zoltan did some progress on x86 microcode update support
> 
> So right now in some specific cases (mostly when running an unverified
> software) Spectre may be a problem.
> 
> There are two problems solving it:
> 
> 1) Microcode updates are not (fully) available yet
> It's unclear how long it will take Intel to release updates microcodes.
> 
> 2) GCC officially supports Spectre mitigation in 7.2 and 8.0
> LEDE 17.01 uses GCC 5.4. It seems fixes are unofficially backported to the 
> 5.5:
> https://github.com/hjl-tools/gcc/commits/hjl/indirect/gcc-5-branch/master
> So the only solution for LEDE is to switch from 5.4 to 5.5 and apply
> backported fixes. I'm not sure how safe it's going to be (possible
> regressions caused by 5.5 update).
> 
> If I'm wrong about anything, please let me know.
> 
> In this situation my suggestion it to release 17.01.5 now and take
> care of Spectre in another release in few months from now. What do you
> think? Any objections?

I agree with you. We should do the LEDE 17.01.5 release now with the
current state, there are already many other bugfixes in the the lede
17.01 branch some for security problems which probably can be abused
much easier in most of the common OpenWrt uses cases that Spectre.

I would also wait with the ARM Spectre fixes till this code hits the 4.4
LTS kernel tree and then we can release it in lede 17.01.6 in some months.

I am, not sure if we should update the GCC at all or if users that
really want these fixes should go to OpenWrt 18.X.

mbedtls 2.7 fixed 2 security problems in their last release, but this
version is ABI incompatible but API compatible with the previous
version, should I backport the commits or should I increase the
PKG_RELEASE number for all depended packages?

This is my personal opinion on this topic.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] Can ramips use mt7530 switch driver from mainline?

[Hauke Mehrtens]

On 02/28/2018 11:34 AM, Marek Behun wrote:
> Hello,
> 
> the mt7530 switch driver is now in mainline kernel as a DSA driver. The
> LEDE ramips target ethernet driver though doesn't use it yet, and I've
> been thinking what all would have to be done to port the ethernet
> driver to use it, if it even is possible.
> 
> For example, the mt7530 dsa driver device tree binding needs
> regulator definitions (core-supply, io-supply). I haven't seen these
> nowhere in the mt7621 device trees nor in the code. Any ideas?

I think the biggest missing part is a good migration path. Currently the
users have some configurations based on swconfig and this has to be
ported to the DSA configuration model. If someone could create a script
which does the migration of an existing swconfig configuration to a DSA
based configuration that would be very helpful.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH hauke/kernel-4.14-sunxi 0/4] add LEDE support for NanoPi NEO Plus2 board

[Hauke Mehrtens]

On 03/02/2018 03:09 PM, Antony Antony wrote:
> Hi Hauke,
> 
> I am glad to see you are testig "NanoPi Neo Plus2" support in OpenWRT.
> Here is a patch instead of b7a1aa4df2a983, with Gigabit Ethernet support.
> 
> https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=blob;f=target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch;h=535c8b6d1f816480eb2938f54e520f7b4311b970;hb=b7a1aa4df2a9834bb7339712670abbe1a05dc01c
> 
> do not have emac node.
> 
> regards,
> -antony

Hi Antony,

Your patch is already integrated in the OpenWrt master branch. Can you
please send a patch which adds the additional settings to the device
tree on top of the current OpenWrt master branch.

Hauke

> 
> On Fri, Dec 29, 2017 at 01:53:46PM +0100, Hauke Mehrtens wrote:
>> Hi antony,
>>
>> On 12/28/2017 06:21 PM, Antony Antony wrote:
>>> Hi Hauke,
>>>
>>> This will add initial LEDE support for a new board, NanoPi NEO Plus2 board.
>>>
>>> LEDE menu options, u-boot, and kernel DT files. The patches are against 
>>> hauke/kernel-4.14-sunxi branch.
>>
>> Ok this is my development branch, now I send the patches to the list.
>>
>>> The patches are in upstream.
>>> Kernel DT initial support is in 4.15 and Gigabit support is queued for 4.16.
>>> u-boot support is #master, it will be in 2018.01
>>
>> You split the patches in a strange way.
>> I would suggest to have only two patches, one adding the changes needed
>> for U-Boot and one for the kernel and image build. Your current split
>> will have problems with git bisect when only your first patch is applied.
>>
>> Otherwise these patches are looking good.
>>
>>> regards,
>>> -antony
>>>
>>> Antony Antony (4):
>>>   sunxi: add support for NanoPi NEO Plus2 board
>>>   sunxi: add u-boot DT for NanoPi NEO Plus2 board
>>>   sunxi: add DT node, dwmac ethernet for Nano Pi Neo Plus2
>>>   sunxi: add kernel DT for NanoPi NEO Plus2 board
>>>
>>>  package/boot/uboot-sunxi/Makefile  |   9 +
>>>  .../210-add-sunxi50i-nanopi-neo-plus2.patch| 176 
>>>  target/linux/sunxi/image/cortex-a53.mk |  10 +
>>>  ...sun50i-support-for-nanopi-neo-plus2-board.patch | 229 
>>> +
>>>  ...-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch |  46 +
>>>  5 files changed, 470 insertions(+)
>>>  create mode 100644 
>>> package/boot/uboot-sunxi/patches/210-add-sunxi50i-nanopi-neo-plus2.patch
>>>  create mode 100644 
>>> target/linux/sunxi/patches-4.14/061-arm-dts-sun50i-support-for-nanopi-neo-plus2-board.patch
>>>  create mode 100644 
>>> target/linux/sunxi/patches-4.14/062-arm-dts-sun50i-nanopi-neo-plus2-add-ethernet.patch
>>>


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] Migrating packages from oldpackages to packages

[Hauke Mehrtens]

On 03/04/2018 11:39 AM, Peter Denison wrote:
> When migrating a package from the unmaintained 'oldpackages' feed to the
> main 'packages' feed:
> 
> 1) Should I try to preserve history? If so, how do I do that on just one
> directory (my git-fu is not that good)?

No this is not needed, you can add this in one commit. Just mention in
the commit message where you have copied it from.

> 2) Is it acceptable / preferable to do two commits, one to move the
> package as is, and a second to bring it up to date and fix its building,
> or should it just be a single commit?

You can do this in one commit.

> 3) Do I need to do anything other than a pull request on github to offer
> to maintain a package? (Presumably also a pull request to delete it from
> oldpackages)

No not really, you should probably update the package to a more recent
version I assume that version in oldpackage is outdated.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] Latest OpenWRT on Gemini v4.14

[Hauke Mehrtens]

On 02/27/2018 10:45 PM, Linus Walleij wrote:
> On Tue, Feb 27, 2018 at 4:46 PM, Hauke Mehrtens <ha...@hauke-m.de> wrote:
> 
>>> I have a forward-port hack-ish thing for Gemini,
>>> this 500K patch on top of openwrt HEAD:
>>>
>>> https://dflund.se/~triad/krad/gemini/0001-gemini-Forward-port-to-v4.14.patch
>>>
>>> It's ... big ... and just kills off the old v4.4 kernel support.
>>
>> Are most of the patches for kernel 4.14 already in mainline or on its
>> wait into the mainline kernel?
> 
> They are all taken directly from the v4.15 and v4.16(-rc3) upstream
> except for the last few patches that add USB support, which are
> hackish and may need some mods from Hans Ulli Kroll.

Good to hear that, so less patches we have to maintain. ;-)

Backporting patches from mainline kernel or adding patches into upstream
kernel is not mandatory but appreciated as this results in less
maintenance work for us.

>> Someone said he wanted to look into the gemini target as it was still on
>> kernel 4.4 and therefore on the list of targets which are getting removed.
>>
>> Can you please run "make kernel_oldconfig" to remove the unneeded
>> configuration options for the config-4.14 file.
> 
> I think it is fairly standard ... I first tried using
> arch/arm/configs/gemini_defconfig from the upstream kernel
> but OpenWRT didn't like/expect that, so I instead took the
> unaltered .config from the build tree, but that is essentially
> what comes out of the gemini_defconfig from upstream.
> 
> (Well I have a pending patch to the defconfig that the
> ARM maintainers seem to have forgot, but more or less.)

Felix already commended on this one.

>> And the also "make target/linux/{clean,refresh} V=99" to make the
>> patches cleanly apply.
> 
> I tested this and it looks clean.
> 
> They were all generated by cherry-picking Gemini development
> on top of a clean v4.14 from upstream so it is as clean as it
> gets.

"make target/linux/{clean,refresh} V=99" just converts the patches into
the "standard" format used for the patches in OpenWrt, when for example
someone updates the kernel 4.14.X to the next minor version this will be
run over all the patches for all targets. To decrease the number of
unrelated changes just run "make target/linux/{clean,refresh} V=99" now
once, it should still be possible to git am the patches and so on.

>>> And I can't test it on the Raidsonic aka IcyBox
>>> aka NAS4220B which is an important target.
>>
>> Could someone with devices supported by this target please test this and
>> report back if it is working or if there are any regressions.
> 
> Agreed!
> 
>>> NB: IF YOU'RE GONNA USE THIS, USE GCC 7.3.0 TO
>>> BUILD. The 5.5 toolchain doesn't work.
>>>
>>> Is there a way to require the 7.3.x toolchain?
>>
>> We want to use the same toolchain for all targets and a GCC bug on mips
>> was just fixed 2 days ago in upstream GCC.
>> I do not know if we will use gcc 7.X for the next release as this should
>> happen soon.
>>
>> What is the problem with gcc 5? I know that recent U-Boot versions do
>> not support it any more, mostly because the binary gets too big.
> 
> I have no clue what is wrong here, but the binaries get corrupt
> for Busybox. procd and a few others build and run fine.
> Took me ages to figure out that just rebuilding the whole
> thing with the 7.3.0 compiler made the problem go away...

Ok this is a strange problem.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] Latest OpenWRT on Gemini v4.14

[Hauke Mehrtens]

Hi Linus,
[adding lede-dev]

Nice work, for this patch and especially for upstreaming the code into
mainline Linux.

On 02/26/2018 09:28 PM, Linus Walleij wrote:
> Hi,
> 
> I have a forward-port hack-ish thing for Gemini,
> this 500K patch on top of openwrt HEAD:
> 
> https://dflund.se/~triad/krad/gemini/0001-gemini-Forward-port-to-v4.14.patch
> 
> It's ... big ... and just kills off the old v4.4 kernel support.

Are most of the patches for kernel 4.14 already in mainline or on its
wait into the mainline kernel?

Someone said he wanted to look into the gemini target as it was still on
kernel 4.4 and therefore on the list of targets which are getting removed.

Can you please run "make kernel_oldconfig" to remove the unneeded
configuration options for the config-4.14 file.

And the also "make target/linux/{clean,refresh} V=99" to make the
patches cleanly apply.

> And I can't test it on the Raidsonic aka IcyBox
> aka NAS4220B which is an important target.

Could someone with devices supported by this target please test this and
report back if it is working or if there are any regressions.

> 
> But it's something!
> 
> It generates the image for it, maybe you can try it out
> and see if it works for you.
> 
> I think it should be straight forward to apply.
> 
> It uses the "new style" of build rules, at least a bit, until
> I got to the custom sysupgrade format etc.
> 
> The D-Link images are not really complete but the rootfs
> works.
> 
> NB: IF YOU'RE GONNA USE THIS, USE GCC 7.3.0 TO
> BUILD. The 5.5 toolchain doesn't work.
> 
> Is there a way to require the 7.3.x toolchain?

We want to use the same toolchain for all targets and a GCC bug on mips
was just fixed 2 days ago in upstream GCC.
I do not know if we will use gcc 7.X for the next release as this should
happen soon.

What is the problem with gcc 5? I know that recent U-Boot versions do
not support it any more, mostly because the binary gets too big.

> Here is the start of the patch:
> 
> From ac5b5377c71a474e7bd7a323980cb70cbed33e26 Mon Sep 17 00:00:00 2001
> From: Linus Walleij 
> Date: Wed, 21 Feb 2018 20:52:35 +0100
> Subject: [PATCH] gemini: Forward-port to v4.14
> 
> This forward-ports the Gemini OpenWRT by taking all the device
> tree patches from v4.16-rc2 and backporting on top of v4.14.
> 
> The TVE200 graphics are excluded but these were never used by
> OpenWRT before. We will fix that when we get there.
> 
> On top of this are some WIP patches for USB support.
> 
> The Raidsonic image generation was hacked up without any chance
> of testing on an actual device.
> 
> Signed-off-by: Linus Walleij 
> ---
>  target/linux/gemini/Makefile   |   15 +-
>  target/linux/gemini/config-4.14| 3391 ++
>  target/linux/gemini/config-4.4 |  165 -
>  .../files/arch/arm/mach-gemini/include/mach/gmac.h |   21 -
>  .../linux/gemini/files/arch/arm/mach-gemini/pci.c  |  318 --
>  .../linux/gemini/files/drivers/ata/pata_gemini.c   |  234 --
>  .../files/drivers/net/ethernet/gemini/Kconfig  |   31 -
>  .../files/drivers/net/ethernet/gemini/Makefile |5 -
>  .../files/drivers/net/ethernet/gemini/sl351x.c | 2340 -
>  .../files/drivers/net/ethernet/gemini/sl351x_hw.h  | 1436 
>  .../gemini/files/drivers/usb/host/ehci-fotg2.c |  258 --
>  .../gemini/files/drivers/watchdog/gemini_wdt.c |  378 --
>  target/linux/gemini/image/Makefile |  138 +-
>  target/linux/gemini/image/slask.mk |   56 +
>  .../0001-cache-patch-from-OpenWRT.patch}   |   14 +
>  ...0002-pinctrl-gemini-Add-missing-functions.patch |   38 +
>  ...ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch |   56 +
>  ...rl-Add-skew-delay-pin-config-and-bindings.patch |   82 +
>  ...0005-pinctrl-gemini-Use-generic-DT-parser.patch |  119 +
>  ...-gemini-Implement-clock-skew-delay-config.patch |  287 ++
>  .../0007-pinctrl-gemini-Fix-GMAC-groups.patch  |  191 +
>  ...nctrl-gemini-Fix-missing-pad-descriptions.patch |   32 +
>  ...inctrl-gemini-Add-two-missing-GPIO-groups.patch |   30 +
>  ...0-pinctrl-gemini-Fix-usage-of-3512-groups.patch |   30 +
>  ...trl-gemini-Support-drive-strength-setting.patch |  205 ++
>  ...d-ethernet-PHYs-to-the-a-bunch-of-Geminis.patch |  124 +
>  ...s-Add-basic-devicetree-for-D-Link-DNS-313.patch |  280 ++
>  ...RM-dts-Flags-D-Link-DIR-685-I2C-bus-gpios.patch |   32 +
>  ...0015-ARM-dts-Add-PCI-to-WBD111-and-WBD222.patch |   81 +
>  ...-Add-TVE-TVC-and-ILI9322-panel-to-DIR-685.patch |  118 +
>  ...tchdog-gemini-ftwdt010-rename-DT-bindings.patch |   80 +
>  ...gemini-ftwdt010-rename-driver-and-symbols.patch |  328 ++
>  ...watchdog-ftwdt010-Make-interrupt-optional.patch |   98 +
>  .../0020-soc-Add-SoC-driver-for-Gemini.patch   |  124 +
>  ...t-Add-DT-bindings-for-the-Gemini-ethernet.patch |  125 +
>  ...t-Add-a-driver-for-Gemini-gigabit-etherne.patch | 3682 
> 

Re: [LEDE-DEV] 18.03/4

[Hauke Mehrtens]

On 02/26/2018 02:16 PM, Henrique de Moraes Holschuh wrote:
> FWIW, I had issues with the ath10k-firmware currently in OpenWRT master,
> it would crash with 100% reproducibly in TP-Link Archer C60v2 (there is
> already a PR open adding support for this device).
> 
> These issues are fixed in the newest "stable" version of the ath10k
> firmware, which was uploaded to kernel.org::linux-firmware some days ago.
> 
Hi,

does this pull request fix your problem:
https://github.com/openwrt/openwrt/pull/744

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] kernel: generic: Fix skip GRO for foreign MAC address patches

[Hauke Mehrtens]

Somewhere in the kernel 4.9 migration process it looks like this patch
was broken. The update should be done when a device is added to the
bridge and when it gets removed, currently it is only done on the remove
path twice which does not make any sense.
I do not have a setup to test this now so this is only compile tested.

Fixes: f791fb4af450 ("kernel: add linux 4.9 support")
Fixes: b3f95490b9be ("kernel: generic: Add kernel 4.14 support")
Reported-by: Andrey Jr. Melnikov <temnota...@gmail.com>
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch  | 11 +--
 .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch  | 11 +--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git 
a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
 
b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 5bcf99a648..d565a1b8bd 100644
--- 
a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ 
b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -91,12 +91,19 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
  static int __netdev_upper_dev_link(struct net_device *dev,
   struct net_device *upper_dev, bool master,
   void *upper_priv, void *upper_info)
-@@ -6353,6 +6398,8 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6276,6 +6321,7 @@ static int __netdev_upper_dev_link(struc
+   if (ret)
+   return ret;
+ 
++  netdev_update_addr_mask(dev);
+   ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+   _info.info);
+   ret = notifier_to_errno(ret);
+@@ -6353,6 +6399,7 @@ void netdev_upper_dev_unlink(struct net_
  
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
  
 +  netdev_update_addr_mask(dev);
-+  netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
  _info.info);
  }
diff --git 
a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
 
b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index ce13e719e3..5d432b1f3e 100644
--- 
a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ 
b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -93,12 +93,19 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
  static int __netdev_upper_dev_link(struct net_device *dev,
   struct net_device *upper_dev, bool master,
   void *upper_priv, void *upper_info)
-@@ -6021,6 +6066,8 @@ void netdev_upper_dev_unlink(struct net_
+@@ -5895,6 +5940,7 @@ static int __netdev_upper_dev_link(struc
+   goto rollback_lower_mesh;
+   }
+ 
++  netdev_update_addr_mask(dev);
+   ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+   _info.info);
+   ret = notifier_to_errno(ret);
+@@ -6021,6 +6067,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, _dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
  
 +  netdev_update_addr_mask(dev);
-+  netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
  _info.info);
  }
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] mvebu to kernel 4.14

[Hauke Mehrtens]

On 02/17/2018 03:25 PM, Hauke Mehrtens wrote:
> Hi,
> 
> I would like to use kernel 4.14 by default on the mvebu target soon.
> If you are aware of any regressions compared to kernel 4.9 then please
> report them, now.
> 
> I only have a Linksys device here for testing and I haven't tested the
> SFP functionality, would be nice if someone could test if that still
> works with kernel 4.14.

I got two positive reports from users of Linksys devices.
Jonas reported that the SFP slot on the clearfog board does not work at
all, he wants to investigate this problem.
The broken SFP support is the only known regression for the mvebu target
with kernel 4.14.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] musl: update to version 1.1.19

[Hauke Mehrtens]

This updates musl from a commit between 1.1.18 and 1.1.19 to the final
release of the version 1.1.19.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 toolchain/musl/common.mk   |  8 +--
 ...suppress-some-more-Linux-uapi-definitions.patch | 59 --
 .../musl/patches/110-read_timezone_from_fs.patch   |  2 +-
 .../musl/patches/200-add_libssp_nonshared.patch|  4 +-
 toolchain/musl/patches/300-relative.patch  |  2 +-
 ...t-attribute-to-some-function-declarations.patch |  4 +-
 toolchain/musl/patches/900-iconv_size_hack.patch   | 34 ++---
 7 files changed, 27 insertions(+), 86 deletions(-)
 delete mode 100644 
toolchain/musl/patches/010-kernel-suppress-some-more-Linux-uapi-definitions.patch

diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index 497aa8df0d..87424646c3 100644
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=musl
-PKG_VERSION:=1.1.18
-PKG_RELEASE=2
+PKG_VERSION:=1.1.19
+PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=72656157f54c47277b01ec85a6ba7c4084fea6c8
-PKG_MIRROR_HASH:=a3d857c23c94aa96a4ad5f442aaf236e5a189a717273c4e4faf425988d98cd32
+PKG_SOURCE_VERSION:=55df09bfccbfe21fc9dd7d8f94550c0ff25ace04
+PKG_MIRROR_HASH:=eb94e4e7e94221dd8890afd9b29e2562c36cf5585649035349ca1c6c1c354f2b
 PKG_SOURCE_URL:=git://git.musl-libc.org/musl
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
diff --git 
a/toolchain/musl/patches/010-kernel-suppress-some-more-Linux-uapi-definitions.patch
 
b/toolchain/musl/patches/010-kernel-suppress-some-more-Linux-uapi-definitions.patch
deleted file mode 100644
index 78b487faeb..00
--- 
a/toolchain/musl/patches/010-kernel-suppress-some-more-Linux-uapi-definitions.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8e85d2c268000b51cc690f3a55a820d8f8a6c0bc Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <ha...@hauke-m.de>
-Date: Thu, 22 Jun 2017 22:04:28 +0200
-Subject: [PATCH] Add additional uapi guards for Linux kernel header files
-
-With Linux kernel 4.15 it will be possible to guard more parts of the
-Linux header files from a libc. Make use of this in musl to guard all
-the structures and other definitions from the Linux header files which
-are also defined by the header files provided by musl. This will make
-musl compile with the unmodified Linux kernel user space headers.
-
-This extends the definitions done in commit 04983f227238 ("make
-netinet/in.h suppress clashing definitions from kernel headers")
-
-The needed patches were recently accepted for Linux 4.15:
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c0bace798436bca0fdc221ff61143f1376a9c3de
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6926e041a8920c8ec27e4e155efa760aa01551fd

- include/net/if.h   | 7 +++
- include/netinet/if_ether.h | 1 +
- include/sys/xattr.h| 2 ++
- 3 files changed, 10 insertions(+)
-
 a/include/net/if.h
-+++ b/include/net/if.h
-@@ -125,6 +125,13 @@ struct ifconf {
- #define ifc_req   ifc_ifcu.ifcu_req
- #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
- 
-+#define __UAPI_DEF_IF_IFCONF  0
-+#define __UAPI_DEF_IF_IFMAP   0
-+#define __UAPI_DEF_IF_IFNAMSIZ0
-+#define __UAPI_DEF_IF_IFREQ   0
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS0
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO  0
-+
- #endif
- 
- #ifdef __cplusplus
 a/include/netinet/if_ether.h
-+++ b/include/netinet/if_ether.h
-@@ -133,5 +133,6 @@ do { \
-   (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
- } while(0)
- 
-+#define __UAPI_DEF_ETHHDR 0
- 
- #endif
 a/include/sys/xattr.h
-+++ b/include/sys/xattr.h
-@@ -24,6 +24,8 @@ int removexattr(const char *, const char
- int lremovexattr(const char *, const char *);
- int fremovexattr(int, const char *);
- 
-+#define __UAPI_DEF_XATTR  0
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/toolchain/musl/patches/110-read_timezone_from_fs.patch 
b/toolchain/musl/patches/110-read_timezone_from_fs.patch
index b4349e7367..fb98f7d10e 100644
--- a/toolchain/musl/patches/110-read_timezone_from_fs.patch
+++ b/toolchain/musl/patches/110-read_timezone_from_fs.patch
@@ -24,5 +24,5 @@
 +  }
 +
if (!s) s = "/etc/localtime";
-   if (!*s) s = __gmt;
+   if (!*s) s = __utc;
  
diff --git a/toolchain/musl/patches/200-add_libssp_nonshared.patch 
b/toolchain/musl/patches/200-add_libssp_nonshared.patch
index 218ca41402..7a2909461b 100644
--- a/toolchain/musl/patches/200-add_libssp_nonshared.patch
+++ b/toolchain/musl/patches/200-add_libssp_nonshared.patch
@@ -21,7 +21,7 @@ Signed-off-by: Steven Barth 

Re: [LEDE-DEV] [PATCH 05/25] kernel: generic: make patches apply on top of kernel 4.14

[Hauke Mehrtens]

On 02/18/2018 11:21 PM, Andrey Jr. Melnikov wrote:
> Fix this patch before release. Or drop it if no one has seen this damage and 
> does not complain.

Hi Andrey,

What is the problem with this patch?

Hauke

> 
>> Hauke Mehrtens <ha...@hauke-m.de> wrote:
>>> This modifies the patches in a way that they will apply on top of kernel
>>> 4.14 and also make them build with the x86 target. The configuration
>>> which was copied from kernel 4.9 before is also modified in this patch.
> 
>> []
> 
>>> diff --git 
>>> a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>>  
>>> b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>> index ad0fb5bdc5..4467975b92 100644
>>> --- 
>>> a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>> +++ 
>>> b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>> @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name>
>> [...]
> 
>>> -@@ -6009,6 +6054,8 @@ void netdev_upper_dev_unlink(struct net_
>>> -   list_for_each_entry(i, _dev->all_adj_list.upper, list)
>>> -   __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
>>> +@@ -6341,6 +6386,8 @@ void netdev_upper_dev_unlink(struct net_
>>> + 
>>> +   __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
>>>   
>>>  +  netdev_update_addr_mask(dev);
>>>  +  netdev_update_addr_mask(dev);
>>> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
>>>   _info.info);
>>>   }
> 
>> Patch broken on rebase. In 4.4 - netdev_update_addr_mask(dev); present three
>> times and called before call_netdevice_notifiers_info(...). Now it called
>> twice in one place.
> 
>> [...]


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] kernel version status

[Hauke Mehrtens]

The next OpenWrt release will use kernel 4.9 and kernel 4.14 depending
on the target. All targets that are *not* on either kernel 4.9 or 4.14
will not be included in the next release.

I did some overview of the kernel version some months ago here:
http://lists.infradead.org/pipermail/lede-dev/2017-October/009446.html

Here is the current situation as of today:

The following targets are on kernel 4.14 and are fine:
* apm821xx
* archs38
* armvirt
* cns3xxx
* malta
* mediatek
* octeon
* octeontx
* sunxi
* x86

The following targets are on kernel 4.9 and are fine:
* ar71xx
* ar7
* arc770
* at91
There are some patches for kernel 4.14 on the mailing list
waiting for response from author
* ath25
* bcm53xx
patches for 4.14 are available in master
* brcm2708
* brcm47xx
* brcm63xx
patches for 4.14 are available in master
* imx6
There are some patches for kernel 4.14 on the mailing list
which is being worked on
* ipq806x
* ixp4xx
* kirkwood
* lantiq
patches for 4.14 are in Mathias Kresin's staging tree.
* layerscape
* mpc85xx
* mvebu
patches for 4.14 are available in master
I would like to get this to kernel 4.14 by default soon.
* mxs
* omap
* orion
* pistachio
* ramips
patches for 4.14 are available in master
* rb532
* uml

The following targets are on kernel 4.4 and will probably not be
included in the next release:
* gemini
* oxnas
* zynq

The following targets are on kernel 3.18 and will probably not be
included in the next release:
* adm5120
* adm8668
* au1000
* mcs814x
I have patches which port this target to 4.4 in my tree, but
nobody tested them.

https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4
* ppc40x
* ppc44x
* xburst
I have patches which port this target to 4.4 in my tree, but
nobody tested them

https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4

This target is on kernel 4.1 (WTF):
* omap24xx

All the targets which are not on kernel 4.9 or 4.14 will probably not be
included in the next release, I also haven't seen any activity for any
of them to get support for more recent kernel versions, if you need them
please take care now.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] iproute2: Add support for ports in xfrm on SCTP

[Hauke Mehrtens]

On 02/18/2018 07:29 PM, Philip Prindeville wrote:
> Why did we even do this to begin with?

That is a good question. ;-)
My assumption is that about 13 years ago uClibc did not provide the
IPPROTO_SCTP define and this is still a workaround for this problem.
I haven't checked the uClibc code.
Commit 60c1f0f64d23 is from 13. Oct 2006.

Hauke

>> On Feb 15, 2018, at 3:52 PM, Hauke Mehrtens <ha...@hauke-m.de> wrote:
>>
>> Remove this old patch which prevents showing the xfrm ports for SCTP
>>
>> This was added in commit 60c1f0f64d23 ("finally move buildroot-ng to trunk")
>> ---
>> .../network/utils/iproute2/patches/006-no_sctp.patch   | 18 
>> --
>> 1 file changed, 18 deletions(-)
>> delete mode 100644 package/network/utils/iproute2/patches/006-no_sctp.patch
>>
>> diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch 
>> b/package/network/utils/iproute2/patches/006-no_sctp.patch
>> deleted file mode 100644
>> index e23fbcd77d..00
>> --- a/package/network/utils/iproute2/patches/006-no_sctp.patch
>> +++ /dev/null
>> @@ -1,18 +0,0 @@
>>  a/ip/ipxfrm.c
>> -+++ b/ip/ipxfrm.c
>> -@@ -454,7 +454,6 @@ void xfrm_selector_print(struct xfrm_sel
>> -switch (sel->proto) {
>> -case IPPROTO_TCP:
>> -case IPPROTO_UDP:
>> --case IPPROTO_SCTP:
>> -case IPPROTO_DCCP:
>> -default: /* XXX */
>> -if (sel->sport_mask)
>> -@@ -1329,7 +1328,6 @@ static int xfrm_selector_upspec_parse(st
>> -switch (sel->proto) {
>> -case IPPROTO_TCP:
>> -case IPPROTO_UDP:
>> --case IPPROTO_SCTP:
>> -case IPPROTO_DCCP:
>> -case IPPROTO_IP: /* to allow shared SA for different protocols */
>> -break;

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH v3 0/4]: imx6: update to Linux 4.14

[Hauke Mehrtens]

On 02/18/2018 12:35 PM, John Crispin wrote:
> 
> 
> On 17/02/18 13:30, Hauke Mehrtens wrote:
>> On 02/15/2018 05:34 PM, Tim Harvey wrote:
>>> Testted on a Gateworks GW54xx. Does not support enabling imx-drm modules
>>> yet as those will need some adjustments based on kernel configs.
>>>
>>> v3:
>>>   - included missing patch for pcie enumeration fix
>>>
>>> v2:
>>>   - move dwc pci patch to generic (Koen)
>>>   - added E1000E driver (used on GW552x)
>>>   - remove unnecessary EXT2/EXT3 (Michael)
>>>   - remove config default config for 14.4
>>>
>>> Tim Harvey (4):
>>>    kernel: backport dwc pci enumeration fix
>>>    imx6: add support for Linux 4.14
>>>    imx6: switch to Linux 4.14
>>>    imx6: remove support for 4.9
>>>
>> Hi Tim,
>>
>> can you please test compile this with the following configuration and
>> fix the problems that show up:
>>
>> $ ./scripts/diffconfig.sh
>> CONFIG_TARGET_imx6=y
>> CONFIG_TARGET_imx6_Generic=y
>> CONFIG_TARGET_BOARD="imx6"
>> CONFIG_ALL_KMODS=y
> 
> running that test just now

I already tried this yesterday and it failed for me.

Hauke


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] mvebu to kernel 4.14

[Hauke Mehrtens]

Hi,

I would like to use kernel 4.14 by default on the mvebu target soon.
If you are aware of any regressions compared to kernel 4.9 then please
report them, now.

I only have a Linksys device here for testing and I haven't tested the
SFP functionality, would be nice if someone could test if that still
works with kernel 4.14.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH] add support for OCTEON TX target

[Hauke Mehrtens]

On 02/15/2018 06:42 PM, Tim Harvey wrote:
> On Tue, Feb 13, 2018 at 12:51 PM, Hauke Mehrtens <ha...@hauke-m.de> wrote:
>> On 02/13/2018 09:46 PM, Hauke Mehrtens wrote:
>>> Hi Tim,
>>>
>>> sorry that I haven't reviewed this earlyer, but now I saw some problems,
>>> see my comments inline.
>>>
>>> Can you please create a follow up patch based on current master branch.
> 
> Hauke,
> 
> Thanks for your review! Looks like John committed already (thanks
> John!) but I will send followup patches for the things you point out.
> 
> comments/questions below;
> 
> 
>>>> diff --git a/target/linux/octeontx/Makefile 
>>>> b/target/linux/octeontx/Makefile
>>>> new file mode 100644
>>>> index 000..bbe8149
>>>> --- /dev/null
>>>> +++ b/target/linux/octeontx/Makefile
>>>> @@ -0,0 +1,27 @@
>>>> +#
>>>> +# Copyright (C) 2018 OpenWrt.org
>>>> +#
>>>> +# This is free software, licensed under the GNU General Public License v2.
>>>> +# See /LICENSE for more information.
>>>> +#
>>>> +include $(TOPDIR)/rules.mk
>>>> +
>>>> +ARCH:=aarch64
>>>> +BOARD:=octeontx
>>>> +BOARDNAME:=Octeon-TX
>>>> +FEATURES:=targz pcie gpio rtc usb
>>>
>>> I think you should define fpu here, but arm64 anyway has a fpu.
>>>
>>>> +CFLAGS:=-Os -pipe -fno-caller-saves
>>>
>>> You should not define CFLAGS for the toolchain as this will also leak
>>> into other targets if they share the same toolchain.
>>>
>>> Can you try to remove the CFLAGS setting if it still works?
>>> The build system will then set it to "-Os -pipe -mcpu=generic"
> 
> I'll add fpu and remove CFLAGS after testing.
> 
>>>
>>>> +
>>>> +MAINTAINER:=Tim Harvey <thar...@gateworks.com>
>>>> +
>>>> +KERNEL_PATCHVER:=4.14
>>>> +
>>>> +define Target/Description
>>>> +Build images for Octeon-TX CN80XX/CN81XX based boards
>>>> +endef
>>>> +
>>>> +include $(INCLUDE_DIR)/target.mk
>>>> +
>>>> +KERNELNAME:=Image
>>>> +
>>>> +$(eval $(call BuildTarget))
>>> 
>>>> diff --git a/target/linux/octeontx/config-4.14 
>>>> b/target/linux/octeontx/config-4.14
>>>> new file mode 100644
>>>> index 000..97d0cc6
>>>> --- /dev/null
>>>> +++ b/target/linux/octeontx/config-4.14
>>>> @@ -0,0 +1,670 @@
>>> .
>>>> +# CONFIG_CRYPTO_SHA512_ARM64 is not set
>>>> +CONFIG_CRYPTO_SIMD=y
>>>> +CONFIG_CRYPTO_WORKQUEUE=y
>>>> +CONFIG_DCACHE_WORD_ACCESS=y
>>>> +# CONFIG_DEBUG_ALIGN_RODATA is not set
>>>> +# CONFIG_DEBUG_BLK_CGROUP is not set
>>>> +CONFIG_DEBUG_INFO=y
>>>
>>> Is this needed by default?
> 
> no - will remove
> 
>>>
>>>> +CONFIG_DEFAULT_IOSCHED="noop"
>>>> +CONFIG_DEFAULT_NOOP=y
>>>> +# CONFIG_DEVPORT is not set
>>>> +CONFIG_DEVTMPFS=y
>>>> +CONFIG_DEVTMPFS_MOUNT=y
>>>> +CONFIG_DMADEVICES=y
>>>> +CONFIG_DMA_CMA=y
>>>> +CONFIG_DMA_ENGINE=y
>>>> +# CONFIG_DMA_NOOP_OPS is not set
>>>> +CONFIG_DMA_OF=y
>>>> +CONFIG_DMA_SHARED_BUFFER=y
>>>> +# CONFIG_DMA_VIRT_OPS is not set
>>>> +CONFIG_DNS_RESOLVER=y
>>>> +# CONFIG_DRM_LIB_RANDOM is not set
>>>> +CONFIG_DTC=y
>>>> +CONFIG_DT_IDLE_STATES=y
>>>> +CONFIG_EDAC=y
>>>> +# CONFIG_EDAC_DEBUG is not set
>>>> +CONFIG_EDAC_LEGACY_SYSFS=y
>>>> +CONFIG_EDAC_SUPPORT=y
>>>> +CONFIG_EDAC_THUNDERX=y
>>>> +# CONFIG_EDAC_XGENE is not set
>>>> +CONFIG_EEPROM_AT24=y
>>>> +# CONFIG_EVM is not set
>>>> +CONFIG_EXT2_FS=y
>>>> +CONFIG_EXT3_FS=y
>>>
>>> Please activate ext2 and 3 support in ext4 instead.
> 
> done - I actually am removing all EXT static as I believe F2FS is
> preferred for MMC.
> 
>>>
>>>> +# CONFIG_EXT3_FS_POSIX_ACL is not set
>>>> +# CONFIG_EXT3_FS_SECURITY is not set
>>>> +CONFIG_EXT4_FS=y
>>>> +CONFIG_EXT4_FS_POSIX_ACL=y
>>>> +# CONFIG_F2FS_CHECK_FS is not set
>>>> +CONFIG_F2FS_FS=y
>>>> +# CONFIG_F2FS_FS_SECURITY is not set
>>>> +CONFIG_F2FS_FS_XATTR=y
>>>> +CONFI

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH v3 1/4] kernel: backport dwc pci enumeration fix

[Hauke Mehrtens]

On 02/15/2018 05:34 PM, Tim Harvey wrote:
> Backport of:  http://patchwork.ozlabs.org/patch/860701/
> 
> Signed-off-by: Tim Harvey 
> ---
>  .../generic/pending-4.14/812-pci-dwc-fix-enumeration.patch| 11 
> +++
>  1 file changed, 11 insertions(+)
>  create mode 100644 
> target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch
> 
> diff --git 
> a/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch 
> b/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch
> new file mode 100644
> index 000..ce9e815
> --- /dev/null
> +++ b/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch

Please put this into target/linux/generic/backport-4.14/ as this is or
will be a backport from the mainline kernel.

Can you also add the original commit comment.
> @@ -0,0 +1,11 @@
> +--- a/drivers/pci/dwc/pcie-designware-host.c
>  b/drivers/pci/dwc/pcie-designware-host.c
> +@@ -607,7 +607,7 @@ void dw_pcie_setup_rc(struct pcie_port *
> + /* setup bus numbers */
> + val = dw_pcie_readl_dbi(pci, PCI_PRIMARY_BUS);
> + val &= 0xff00;
> +-val |= 0x00010100;
> ++val |= 0x00ff0100;
> + dw_pcie_writel_dbi(pci, PCI_PRIMARY_BUS, val);
> + 
> + /* setup command register */
> 


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH v3 0/4]: imx6: update to Linux 4.14

[Hauke Mehrtens]

On 02/15/2018 05:34 PM, Tim Harvey wrote:
> Testted on a Gateworks GW54xx. Does not support enabling imx-drm modules
> yet as those will need some adjustments based on kernel configs.
> 
> v3:
>  - included missing patch for pcie enumeration fix
> 
> v2:
>  - move dwc pci patch to generic (Koen)
>  - added E1000E driver (used on GW552x)
>  - remove unnecessary EXT2/EXT3 (Michael)
>  - remove config default config for 14.4
> 
> Tim Harvey (4):
>   kernel: backport dwc pci enumeration fix
>   imx6: add support for Linux 4.14
>   imx6: switch to Linux 4.14
>   imx6: remove support for 4.9
> 
Hi Tim,

can you please test compile this with the following configuration and
fix the problems that show up:

$ ./scripts/diffconfig.sh
CONFIG_TARGET_imx6=y
CONFIG_TARGET_imx6_Generic=y
CONFIG_TARGET_BOARD="imx6"
CONFIG_ALL_KMODS=y

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] iproute2: Add support for ports in xfrm on SCTP

[Hauke Mehrtens]

Remove this old patch which prevents showing the xfrm ports for SCTP

This was added in commit 60c1f0f64d23 ("finally move buildroot-ng to trunk")
---
 .../network/utils/iproute2/patches/006-no_sctp.patch   | 18 --
 1 file changed, 18 deletions(-)
 delete mode 100644 package/network/utils/iproute2/patches/006-no_sctp.patch

diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch 
b/package/network/utils/iproute2/patches/006-no_sctp.patch
deleted file mode 100644
index e23fbcd77d..00
--- a/package/network/utils/iproute2/patches/006-no_sctp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 a/ip/ipxfrm.c
-+++ b/ip/ipxfrm.c
-@@ -454,7 +454,6 @@ void xfrm_selector_print(struct xfrm_sel
-   switch (sel->proto) {
-   case IPPROTO_TCP:
-   case IPPROTO_UDP:
--  case IPPROTO_SCTP:
-   case IPPROTO_DCCP:
-   default: /* XXX */
-   if (sel->sport_mask)
-@@ -1329,7 +1328,6 @@ static int xfrm_selector_upspec_parse(st
-   switch (sel->proto) {
-   case IPPROTO_TCP:
-   case IPPROTO_UDP:
--  case IPPROTO_SCTP:
-   case IPPROTO_DCCP:
-   case IPPROTO_IP: /* to allow shared SA for different protocols 
*/
-   break;
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH] add support for OCTEON TX target

[Hauke Mehrtens]

On 02/13/2018 09:46 PM, Hauke Mehrtens wrote:
> Hi Tim,
> 
> sorry that I haven't reviewed this earlyer, but now I saw some problems,
> see my comments inline.
> 
> Can you please create a follow up patch based on current master branch.
> 
> On 01/24/2018 12:15 AM, Tim Harvey wrote:
>> The Cavium OCTEON TX is an ARM 64-bit SoC leveraging CPU cores and
>> periperhals from the Cavium ThunderX SoC.
>>
>> This initial support provides a 4.14 kernel and kernel+initramfs that is
>> bootable on the Gateworks Newport GW630x as well as the Cavium sff8104
>> reference board.
>>
>> Signed-off-by: Tim Harvey <thar...@gateworks.com>
>> ---
>>  target/linux/octeontx/Makefile |  27 +
>>  .../octeontx/base-files/etc/board.d/02_network |  18 +
>>  target/linux/octeontx/base-files/etc/inittab   |   5 +
>>  target/linux/octeontx/base-files/lib/octeontx.sh   |  43 ++
>>  target/linux/octeontx/config-4.14  | 670 
>> +
>>  target/linux/octeontx/image/Makefile   |  21 +
>>  ...x-add-support-for-rgmii-internal-delay-mo.patch | 148 +
>>  ...hunderx-workaround-BGX-TX-Underflow-issue.patch | 117 
>>  8 files changed, 1049 insertions(+)
>>  create mode 100644 target/linux/octeontx/Makefile
>>  create mode 100644 target/linux/octeontx/base-files/etc/board.d/02_network
>>  create mode 100644 target/linux/octeontx/base-files/etc/inittab
>>  create mode 100644 target/linux/octeontx/base-files/lib/octeontx.sh
>>  create mode 100644 target/linux/octeontx/config-4.14
>>  create mode 100644 target/linux/octeontx/image/Makefile
>>  create mode 100644 
>> target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch
>>  create mode 100644 
>> target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
>>
>> diff --git a/target/linux/octeontx/Makefile b/target/linux/octeontx/Makefile
>> new file mode 100644
>> index 000..bbe8149
>> --- /dev/null
>> +++ b/target/linux/octeontx/Makefile
>> @@ -0,0 +1,27 @@
>> +#
>> +# Copyright (C) 2018 OpenWrt.org
>> +#
>> +# This is free software, licensed under the GNU General Public License v2.
>> +# See /LICENSE for more information.
>> +#
>> +include $(TOPDIR)/rules.mk
>> +
>> +ARCH:=aarch64
>> +BOARD:=octeontx
>> +BOARDNAME:=Octeon-TX
>> +FEATURES:=targz pcie gpio rtc usb
> 
> I think you should define fpu here, but arm64 anyway has a fpu.
> 
>> +CFLAGS:=-Os -pipe -fno-caller-saves
> 
> You should not define CFLAGS for the toolchain as this will also leak
> into other targets if they share the same toolchain.
> 
> Can you try to remove the CFLAGS setting if it still works?
> The build system will then set it to "-Os -pipe -mcpu=generic"
> 
>> +
>> +MAINTAINER:=Tim Harvey <thar...@gateworks.com>
>> +
>> +KERNEL_PATCHVER:=4.14
>> +
>> +define Target/Description
>> +Build images for Octeon-TX CN80XX/CN81XX based boards
>> +endef
>> +
>> +include $(INCLUDE_DIR)/target.mk
>> +
>> +KERNELNAME:=Image
>> +
>> +$(eval $(call BuildTarget))
> 
>> diff --git a/target/linux/octeontx/config-4.14 
>> b/target/linux/octeontx/config-4.14
>> new file mode 100644
>> index 000..97d0cc6
>> --- /dev/null
>> +++ b/target/linux/octeontx/config-4.14
>> @@ -0,0 +1,670 @@
> .
>> +# CONFIG_CRYPTO_SHA512_ARM64 is not set
>> +CONFIG_CRYPTO_SIMD=y
>> +CONFIG_CRYPTO_WORKQUEUE=y
>> +CONFIG_DCACHE_WORD_ACCESS=y
>> +# CONFIG_DEBUG_ALIGN_RODATA is not set
>> +# CONFIG_DEBUG_BLK_CGROUP is not set
>> +CONFIG_DEBUG_INFO=y
> 
> Is this needed by default?
> 
>> +CONFIG_DEFAULT_IOSCHED="noop"
>> +CONFIG_DEFAULT_NOOP=y
>> +# CONFIG_DEVPORT is not set
>> +CONFIG_DEVTMPFS=y
>> +CONFIG_DEVTMPFS_MOUNT=y
>> +CONFIG_DMADEVICES=y
>> +CONFIG_DMA_CMA=y
>> +CONFIG_DMA_ENGINE=y
>> +# CONFIG_DMA_NOOP_OPS is not set
>> +CONFIG_DMA_OF=y
>> +CONFIG_DMA_SHARED_BUFFER=y
>> +# CONFIG_DMA_VIRT_OPS is not set
>> +CONFIG_DNS_RESOLVER=y
>> +# CONFIG_DRM_LIB_RANDOM is not set
>> +CONFIG_DTC=y
>> +CONFIG_DT_IDLE_STATES=y
>> +CONFIG_EDAC=y
>> +# CONFIG_EDAC_DEBUG is not set
>> +CONFIG_EDAC_LEGACY_SYSFS=y
>> +CONFIG_EDAC_SUPPORT=y
>> +CONFIG_EDAC_THUNDERX=y
>> +# CONFIG_EDAC_XGENE is not set
>> +CONFIG_EEPROM_AT24=y
>> +# CONFIG_EVM is not set
>> +CONFIG_EXT2_FS=y
>> +CONFIG_EXT3_FS=y
> 
&

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH] add support for OCTEON TX target

[Hauke Mehrtens]

Hi Tim,

sorry that I haven't reviewed this earlyer, but now I saw some problems,
see my comments inline.

Can you please create a follow up patch based on current master branch.

On 01/24/2018 12:15 AM, Tim Harvey wrote:
> The Cavium OCTEON TX is an ARM 64-bit SoC leveraging CPU cores and
> periperhals from the Cavium ThunderX SoC.
> 
> This initial support provides a 4.14 kernel and kernel+initramfs that is
> bootable on the Gateworks Newport GW630x as well as the Cavium sff8104
> reference board.
> 
> Signed-off-by: Tim Harvey 
> ---
>  target/linux/octeontx/Makefile |  27 +
>  .../octeontx/base-files/etc/board.d/02_network |  18 +
>  target/linux/octeontx/base-files/etc/inittab   |   5 +
>  target/linux/octeontx/base-files/lib/octeontx.sh   |  43 ++
>  target/linux/octeontx/config-4.14  | 670 
> +
>  target/linux/octeontx/image/Makefile   |  21 +
>  ...x-add-support-for-rgmii-internal-delay-mo.patch | 148 +
>  ...hunderx-workaround-BGX-TX-Underflow-issue.patch | 117 
>  8 files changed, 1049 insertions(+)
>  create mode 100644 target/linux/octeontx/Makefile
>  create mode 100644 target/linux/octeontx/base-files/etc/board.d/02_network
>  create mode 100644 target/linux/octeontx/base-files/etc/inittab
>  create mode 100644 target/linux/octeontx/base-files/lib/octeontx.sh
>  create mode 100644 target/linux/octeontx/config-4.14
>  create mode 100644 target/linux/octeontx/image/Makefile
>  create mode 100644 
> target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch
>  create mode 100644 
> target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
> 
> diff --git a/target/linux/octeontx/Makefile b/target/linux/octeontx/Makefile
> new file mode 100644
> index 000..bbe8149
> --- /dev/null
> +++ b/target/linux/octeontx/Makefile
> @@ -0,0 +1,27 @@
> +#
> +# Copyright (C) 2018 OpenWrt.org
> +#
> +# This is free software, licensed under the GNU General Public License v2.
> +# See /LICENSE for more information.
> +#
> +include $(TOPDIR)/rules.mk
> +
> +ARCH:=aarch64
> +BOARD:=octeontx
> +BOARDNAME:=Octeon-TX
> +FEATURES:=targz pcie gpio rtc usb

I think you should define fpu here, but arm64 anyway has a fpu.

> +CFLAGS:=-Os -pipe -fno-caller-saves

You should not define CFLAGS for the toolchain as this will also leak
into other targets if they share the same toolchain.

Can you try to remove the CFLAGS setting if it still works?
The build system will then set it to "-Os -pipe -mcpu=generic"

> +
> +MAINTAINER:=Tim Harvey 
> +
> +KERNEL_PATCHVER:=4.14
> +
> +define Target/Description
> + Build images for Octeon-TX CN80XX/CN81XX based boards
> +endef
> +
> +include $(INCLUDE_DIR)/target.mk
> +
> +KERNELNAME:=Image
> +
> +$(eval $(call BuildTarget))

> diff --git a/target/linux/octeontx/config-4.14 
> b/target/linux/octeontx/config-4.14
> new file mode 100644
> index 000..97d0cc6
> --- /dev/null
> +++ b/target/linux/octeontx/config-4.14
> @@ -0,0 +1,670 @@
.
> +# CONFIG_CRYPTO_SHA512_ARM64 is not set
> +CONFIG_CRYPTO_SIMD=y
> +CONFIG_CRYPTO_WORKQUEUE=y
> +CONFIG_DCACHE_WORD_ACCESS=y
> +# CONFIG_DEBUG_ALIGN_RODATA is not set
> +# CONFIG_DEBUG_BLK_CGROUP is not set
> +CONFIG_DEBUG_INFO=y

Is this needed by default?

> +CONFIG_DEFAULT_IOSCHED="noop"
> +CONFIG_DEFAULT_NOOP=y
> +# CONFIG_DEVPORT is not set
> +CONFIG_DEVTMPFS=y
> +CONFIG_DEVTMPFS_MOUNT=y
> +CONFIG_DMADEVICES=y
> +CONFIG_DMA_CMA=y
> +CONFIG_DMA_ENGINE=y
> +# CONFIG_DMA_NOOP_OPS is not set
> +CONFIG_DMA_OF=y
> +CONFIG_DMA_SHARED_BUFFER=y
> +# CONFIG_DMA_VIRT_OPS is not set
> +CONFIG_DNS_RESOLVER=y
> +# CONFIG_DRM_LIB_RANDOM is not set
> +CONFIG_DTC=y
> +CONFIG_DT_IDLE_STATES=y
> +CONFIG_EDAC=y
> +# CONFIG_EDAC_DEBUG is not set
> +CONFIG_EDAC_LEGACY_SYSFS=y
> +CONFIG_EDAC_SUPPORT=y
> +CONFIG_EDAC_THUNDERX=y
> +# CONFIG_EDAC_XGENE is not set
> +CONFIG_EEPROM_AT24=y
> +# CONFIG_EVM is not set
> +CONFIG_EXT2_FS=y
> +CONFIG_EXT3_FS=y

Please activate ext2 and 3 support in ext4 instead.

> +# CONFIG_EXT3_FS_POSIX_ACL is not set
> +# CONFIG_EXT3_FS_SECURITY is not set
> +CONFIG_EXT4_FS=y
> +CONFIG_EXT4_FS_POSIX_ACL=y
> +# CONFIG_F2FS_CHECK_FS is not set
> +CONFIG_F2FS_FS=y
> +# CONFIG_F2FS_FS_SECURITY is not set
> +CONFIG_F2FS_FS_XATTR=y
> +CONFIG_F2FS_STAT_FS=y
...

You should run "make kernel_oldconfig" to refresh the configuration.

There is also something missing in this configuration or in the generic
one, see this error from the build bot:
http://phase1.builds.lede-project.org/builders/octeontx%2Fgeneric/builds/0/steps/kmods/logs/stdio

Please test compile it with this configuration:
CONFIG_TARGET_octeontx=y
CONFIG_TARGET_octeontx_Default=y
CONFIG_TARGET_BOARD="octeontx"
CONFIG_ALL_KMODS=y


___
Lede-dev mailing list
Lede-dev@lists.infradead.org

Re: [LEDE-DEV] [PATCH 1/4] kernel: add missing config symbols

[Hauke Mehrtens]

On 02/01/2018 11:35 PM, Tim Harvey wrote:
> Signed-off-by: Tim Harvey 
> ---
>  target/linux/generic/config-4.14 | 9 -
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/target/linux/generic/config-4.14 
> b/target/linux/generic/config-4.14
> index fa389bf..89f2f43 100644
> --- a/target/linux/generic/config-4.14
> +++ b/target/linux/generic/config-4.14
> @@ -658,6 +658,7 @@ CONFIG_BT_HCIUART_BCSP=y
>  CONFIG_BT_HCIUART_H4=y
>  # CONFIG_BT_HCIUART_LL is not set
>  # CONFIG_BT_HCIUART_MRVL is not set
> +# CONFIG_BT_HCIUART_NOKIA is not set

This should be fixed by this commit:
https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=a5199379c0914573613d3f9d1ca0efd369639b32

>  # CONFIG_BT_HCIUART_QCA is not set
>  # CONFIG_BT_HCIVHCI is not set
>  # CONFIG_BT_HIDP is not set
> @@ -1143,6 +1144,7 @@ CONFIG_DQL=y
>  # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
>  # CONFIG_DRM_DP_AUX_CHARDEV is not set
>  # CONFIG_DRM_DUMB_VGA_DAC is not set
> +# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
>  # CONFIG_DRM_DW_HDMI_CEC is not set
>  # CONFIG_DRM_ETNAVIV is not set
>  # CONFIG_DRM_EXYNOS is not set
> @@ -1167,12 +1169,14 @@ CONFIG_DQL=y
>  # CONFIG_DRM_OMAP is not set
>  # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
>  # CONFIG_DRM_PANEL_LG_LG4573 is not set
> +# CONFIG_DRM_PANEL_LVDS is not set
>  # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
>  # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
>  # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
>  # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
>  # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
>  # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
> +# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
>  # CONFIG_DRM_PARADE_PS8622 is not set
>  # CONFIG_DRM_PL111 is not set
>  # CONFIG_DRM_QXL is not set
> @@ -1181,6 +1185,7 @@ CONFIG_DQL=y
>  # CONFIG_DRM_SII902X is not set
>  # CONFIG_DRM_SIL_SII8620 is not set
>  # CONFIG_DRM_STI is not set
> +# CONFIG_DRM_STM is not set
>  # CONFIG_DRM_TILCDC is not set
>  # CONFIG_DRM_TINYDRM is not set
>  # CONFIG_DRM_TI_TFP410 is not set
> @@ -2214,6 +2219,7 @@ CONFIG_KERNFS=y
>  # CONFIG_KMX61 is not set
>  # CONFIG_KPROBES is not set
>  # CONFIG_KPROBES_SANITY_TEST is not set
> +# CONFIG_KPROBE_EVENTS is not set
>  # CONFIG_KS7010 is not set
>  # CONFIG_KS8842 is not set
>  # CONFIG_KS8851 is not set
> @@ -4944,6 +4950,7 @@ CONFIG_TMPFS_XATTR=y
>  # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
>  # CONFIG_TRACE_BRANCH_PROFILING is not set
>  # CONFIG_TRACE_ENUM_MAP_FILE is not set
> +# CONFIG_TRACE_EVAL_MAP_FILE is not set

This was fixed here:
https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=3a2a54c055f970376c9f19a4cd04d7e13037d959

>  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
>  # CONFIG_TRACE_SINK is not set
>  # CONFIG_TRACING_EVENTS_GPIO is not set
> @@ -4994,7 +5001,7 @@ CONFIG_UNIX98_PTYS=y
>  # CONFIG_UNIX_DIAG is not set
>  # CONFIG_UNUSED_SYMBOLS is not set
>  # CONFIG_UPROBES is not set
> -# CONFIG_UPROBE_EVENT is not set
> +# CONFIG_UPROBE_EVENTS is not set
>  # CONFIG_US5182D is not set
>  # CONFIG_USB is not set
>  # CONFIG_USBIP_CORE is not set
> 


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 01/10] kernel: ubifs: create use file system format 4 by default

[Hauke Mehrtens]

Instead of creating an ubifs file system with format version 5 by
default on empty UBI volumes use the older format 4 by default. This
will make it possible to mount these file systems also on older kernel
versions.

When a user wants to do a sysupgrade from kernel 4.14 to kernel 4.9 the
old kernel has to read the file system created by the more recent kernel
which currently does not work for ubifs.

This fixes the problem by creating file systems which are compatible
with older kernel versions by default.
Kernel 4.14 will still be able to read and write UBI FS file system
version 5, it will just not be used when a ubifs partition is created
implicitly on an empty UBI volume.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 target/linux/generic/config-4.14   |  1 +
 ...ption-to-create-UBI-FS-version-4-on-empty.patch | 63 ++
 2 files changed, 64 insertions(+)
 create mode 100644 
target/linux/generic/pending-4.14/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 1048e3d028..9821c11578 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -4975,6 +4975,7 @@ CONFIG_TTY=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 # CONFIG_UBIFS_FS_ENCRYPTION is not set
+CONFIG_UBIFS_FS_FORMAT4=y
 # CONFIG_UBIFS_FS_SECURITY is not set
 # CONFIG_UBSAN is not set
 # CONFIG_UCB1400_CORE is not set
diff --git 
a/target/linux/generic/pending-4.14/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch
 
b/target/linux/generic/pending-4.14/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch
new file mode 100644
index 00..4b413996f2
--- /dev/null
+++ 
b/target/linux/generic/pending-4.14/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch
@@ -0,0 +1,63 @@
+From 93c33e6a7f3b0aef99d02252e6232a3d8b80f2d5 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <ha...@hauke-m.de>
+Date: Sun, 21 Jan 2018 15:47:50 +0100
+Subject: ubifs: Add option to create UBI FS version 4 on empty UBI volume
+
+Instead of creating an ubifs file system with format version 5 by
+default on empty UBI volumes add a compile option to create an older ubi
+with file system format version 4 instated. This allows it to be mount
+as a volume on kernel versions < 4.10, which does not support format
+version 5.
+We saw that some people can not access their older data when they
+downgraded from kernel 4.14 to kernel 4.9 to prevent this this option
+would help.
+
+Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
+---
+ fs/ubifs/Kconfig | 13 +
+ fs/ubifs/sb.c|  6 ++
+ 2 files changed, 19 insertions(+)
+
+--- a/fs/ubifs/Kconfig
 b/fs/ubifs/Kconfig
+@@ -74,3 +74,16 @@ config UBIFS_FS_SECURITY
+ the extended attribute support in advance.
+ 
+ If you are not using a security module, say N.
++
++config UBIFS_FS_FORMAT4
++  bool "Use file system format version 4 for new file systems"
++  depends on UBIFS_FS
++  help
++Instead of creating new file systems with the new ubifs file
++system version 5, use the old format version 4 for implicitly
++by the driver created file systems on an empty UBI volume. This
++makes it possible to  mount these file systems also with kernel
++versions before 4.10. The driver will still support file system
++format version 5 for ubifs file systems created with version 5.
++
++If you are unsure, say N.
+--- a/fs/ubifs/sb.c
 b/fs/ubifs/sb.c
+@@ -176,7 +176,9 @@ static int create_default_filesystem(str
+   tmp64 = (long long)max_buds * c->leb_size;
+   if (big_lpt)
+   sup_flags |= UBIFS_FLG_BIGLPT;
++#ifndef CONFIG_UBIFS_FS_FORMAT4
+   sup_flags |= UBIFS_FLG_DOUBLE_HASH;
++#endif
+ 
+   sup->ch.node_type  = UBIFS_SB_NODE;
+   sup->key_hash  = UBIFS_KEY_HASH_R5;
+@@ -192,7 +194,11 @@ static int create_default_filesystem(str
+   sup->jhead_cnt = cpu_to_le32(DEFAULT_JHEADS_CNT);
+   sup->fanout= cpu_to_le32(DEFAULT_FANOUT);
+   sup->lsave_cnt = cpu_to_le32(c->lsave_cnt);
++#ifdef CONFIG_UBIFS_FS_FORMAT4
++  sup->fmt_version   = cpu_to_le32(4);
++#else
+   sup->fmt_version   = cpu_to_le32(UBIFS_FORMAT_VERSION);
++#endif
+   sup->time_gran = cpu_to_le32(DEFAULT_TIME_GRAN);
+   if (c->mount_opts.override_compr)
+   sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 03/10] mvebu: move files to files-4.9 and files-4.4 folder

[Hauke Mehrtens]

This is needed to prevent copying it into kernel 4.14.
These device tree files are already integrated into kernel 4.14 and we
would like to use the upstream versions only.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 .../{files => files-4.4}/arch/arm/boot/dts/armada-385-linksys-rango.dts   | 0
 .../{files => files-4.4}/arch/arm/boot/dts/armada-385-linksys-shelby.dts  | 0
 .../{files => files-4.9}/arch/arm/boot/dts/armada-385-linksys-rango.dts   | 0
 .../{files => files-4.9}/arch/arm/boot/dts/armada-385-linksys-shelby.dts  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 copy target/linux/mvebu/{files => 
files-4.4}/arch/arm/boot/dts/armada-385-linksys-rango.dts (100%)
 copy target/linux/mvebu/{files => 
files-4.4}/arch/arm/boot/dts/armada-385-linksys-shelby.dts (100%)
 rename target/linux/mvebu/{files => 
files-4.9}/arch/arm/boot/dts/armada-385-linksys-rango.dts (100%)
 rename target/linux/mvebu/{files => 
files-4.9}/arch/arm/boot/dts/armada-385-linksys-shelby.dts (100%)

diff --git 
a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts 
b/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
similarity index 100%
copy from 
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
copy to 
target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-rango.dts
diff --git 
a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts 
b/target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-shelby.dts
similarity index 100%
copy from 
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts
copy to 
target/linux/mvebu/files-4.4/arch/arm/boot/dts/armada-385-linksys-shelby.dts
diff --git 
a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts 
b/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
similarity index 100%
rename from 
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
rename to 
target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-rango.dts
diff --git 
a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts 
b/target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-shelby.dts
similarity index 100%
rename from 
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts
rename to 
target/linux/mvebu/files-4.9/arch/arm/boot/dts/armada-385-linksys-shelby.dts
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 10/10] mvebu: use kernel 4.14 by default

[Hauke Mehrtens]

This switches to kernel 4.14 by default.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 target/linux/mvebu/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index a07aa7cf2d..6f0c1925c2 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Imre Kaloz <ka...@openwrt.org>
 
-KERNEL_PATCHVER:=4.9
+KERNEL_PATCHVER:=4.14
 
 include $(INCLUDE_DIR)/target.mk
 
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 04/10] mvebu: copy config and patches from 4.9 to 4.14

[Hauke Mehrtens]

This is in preparation for the 4.14 port, this is just coping all the
files to make it easier to see the differences between kernel 4.9 and
kernel 4.14.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 target/linux/mvebu/{config-4.9 => config-4.14}| 0
 .../linux/mvebu/{patches-4.4 => patches-4.14}/002-add_powertables.patch   | 0
 .../linux/mvebu/{patches-4.9 => patches-4.14}/003-add_switch_nodes.patch  | 0
 .../004-add_sata_disk_activity_trigger.patch  | 0
 target/linux/mvebu/{patches-4.9 => patches-4.14}/010-build_new_dtbs.patch | 0
 .../linux/mvebu/{patches-4.9 => patches-4.14}/100-find_active_root.patch  | 0
 .../linux/mvebu/{patches-4.9 => patches-4.14}/102-revert_i2c_delay.patch  | 0
 .../mvebu/{patches-4.9 => patches-4.14}/103-remove-nand-driver-bug.patch  | 0
 .../104-linksys_mamba_disable_keep_config.patch   | 0
 .../{patches-4.9 => patches-4.14}/106-enable-bm-on-linksys-devices.patch  | 0
 .../{patches-4.9 => patches-4.14}/110-pxa3xxx_revert_irq_thread.patch | 0
 .../{patches-4.9 => patches-4.14}/120-net-mvneta-add-BQL-support.patch| 0
 .../{patches-4.9 => patches-4.14}/130-irqchip-armada-xp-backport.patch| 0
 .../200-gpio_mvebu_add_limited_pwm_support.patch  | 0
 .../201-dt_bindings_extend_mvebu_gpio_documentation_with_pwm.patch| 0
 .../202-mvebu_xp_add_pwm_properties_to_dtsi_files.patch   | 0
 .../203-arm_mvebu_enable_pwm_in_defconfig.patch   | 0
 .../204-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch| 0
 .../{patches-4.9 => patches-4.14}/205-armada-385-rd-mtd-partitions.patch  | 0
 .../206-ARM-mvebu-385-ap-Add-partitions.patch | 0
 .../mvebu/{patches-4.9 => patches-4.14}/210-clearfog_switch_node.patch| 0
 .../220-ARM-dts-armada388-clearfog-add-SFP-module-support.patch   | 0
 .../{patches-4.9 => patches-4.14}/300-mvneta-tx-queue-workaround.patch| 0
 .../400-phy-provide-a-hook-for-link-up-link-down-events.patch | 0
 .../401-net-phy-move-phy-MMD-accessors-to-phy-core.c.patch| 0
 .../402-net-phy-make-phy_-read-write-_mmd-generic-MMD-access.patch| 0
 .../403-net-phy-avoid-setting-unsupported-EEE-advertisments.patch | 0
 .../404-net-phy-restart-phy-autonegotiation-after-EEE-advert.patch| 0
 .../405-net-phy-allow-EEE-with-SGMII-interface-modes.patch| 0
 .../406-net-phy-improve-phylib-correctness-for-non-autoneg-s.patch| 0
 .../407-net-phy-add-802.3-clause-45-support-to-phylib.patch   | 0
 .../408-net-phy-hook-up-clause-45-autonegotiation-restart.patch   | 0
 .../409-net-phy-don-t-double-read-clause-45-status-register.patch | 0
 .../410-net-phy-allow-settings-table-to-support-more-than-32.patch| 0
 .../411-net-phy-split-out-PHY-speed-and-duplex-string-genera.patch| 0
 .../412-net-phy-move-phy_lookup_setting-and-guts-of-phy_supp.patch| 0
 .../413-phy-export-phy_start_machine-for-phylink.patch| 0
 .../mvebu/{patches-4.9 => patches-4.14}/414-phy-add-I2C-mdio-bus.patch| 0
 .../415-phylink-add-phylink-infrastructure.patch  | 0
 .../416-phylink-add-hooks-for-SFP-support.patch   | 0
 .../417-sfp-add-phylink-based-SFP-module-support.patch| 0
 .../418-sfp-display-SFP-module-information.patch  | 0
 .../{patches-4.9 => patches-4.14}/419-net-mvneta-convert-to-phylink.patch | 0
 .../420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch| 0
 .../421-phylink-add-ethtool-nway_reset-support.patch  | 0
 .../422-net-mvneta-add-nway_reset-support.patch   | 0
 .../423-phylink-add-flow-control-support.patch| 0
 .../424-net-mvneta-add-flow-control-support-via-phylink.patch | 0
 .../425-net-mvneta-enable-flow-control-for-PHY-connections.patch  | 0
 .../426-net-mvneta-enable-flow-control-for-fixed-connections.patch| 0
 .../mvebu/{patches-4.9 => patches-4.14}/427-phylink-add-EEE-support.patch | 0
 .../{patches-4.9 => patches-4.14}/428-net-mvneta-add-EEE-support.patch| 0
 .../429-phylink-add-module-EEPROM-support.patch   | 0
 .../430-net-mvneta-add-module-EEPROM-reading-support.patch| 0
 .../431-sfp-phylink-hook-up-eeprom-functions.patch| 0
 .../432-phy-marvell-88E1512-add-flow-control-support.patch| 0
 .../433-phy-marvell-88E-add-flow-control-support.patch| 0
 .../434-phy-marvell-88E1540-add-flow-control-support.patch| 0
 .../436-phylink-propagate-PHY-interface-mode-to-MAC-driver.patch  | 0
 .../437-phylink-ensure-link-drops-are-reported.patch

[LEDE-DEV] [PATCH v3 00/10] mvebu: add kernel 4.14 support

[Hauke Mehrtens]

This add support for kernel 4.14 to the mvebu target. My main reason to 
add kernel 4.14 support is to make it easier to also add support for the 
Marvell Armada 3700LP ARM64 SoCs especially the ESPRESSObin board. 

I tested this on my WRT1200AC board and got positive feedback form 
multiple other community members.

My current working tree for this target can be found here:
https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14

I am waiting for positive and negative feedback on these patches, if you 
run into a problem which you do not have with kernel 4.9 please report 
this.

I do not plan to apply the change of the default kernel at the beginning.

changes in:
v3:
 * Fix the wifi configuration migration, it is now executed before the 
   devices are detected and forms in both directions.
 * fix minor patch that does not apply any more with 4.14.18
 * add update of mwlwifi

v2:
 * refresh on current generic kernel 4.14 integration
 * create ubifs fs format version 4 also with kernel 4.14, this should 
   fix sysupgrade (downgrade) from kernel 4.14 to 4.9
 * rename the wireless driver path when upgrading

Chris Breuer (1):
  mwlwifi: Update to latest commit 20180208

Hauke Mehrtens (9):
  kernel: ubifs: create use file system format 4 by default
  mac80211: move wifi detect hotplug script to later
  mvebu: move files to files-4.9 and files-4.4 folder
  mvebu: copy config and patches from 4.9 to 4.14
  mvebu: Make kernel 4.14 patches apply
  mvebu: Migrate uci config to new PCIe path
  mwlwifi: use PKG_SOURCE_DATE instead of version
  mwlwifi: fix compile problem with kernel 4.14
  mvebu: use kernel 4.14 by default

 package/kernel/mac80211/Makefile   |   4 +-
 package/kernel/mwlwifi/Makefile|   6 +-
 .../mwlwifi/patches/001-remove-vfs_write.patch |  92 ++
 target/linux/generic/config-4.14   |   1 +
 ...ption-to-create-UBI-FS-version-4-on-empty.patch |  63 ++
 target/linux/mvebu/Makefile|   2 +-
 .../etc/hotplug.d/ieee80211/00-wifi-config-migrate |  41 +
 target/linux/mvebu/config-4.14 | 486 ++
 .../arch/arm/boot/dts/armada-385-linksys-rango.dts |   0
 .../arm/boot/dts/armada-385-linksys-shelby.dts |   0
 .../arch/arm/boot/dts/armada-385-linksys-rango.dts |   0
 .../arm/boot/dts/armada-385-linksys-shelby.dts |   0
 .../mvebu/patches-4.14/002-add_powertables.patch   | 770 
 .../mvebu/patches-4.14/003-add_switch_nodes.patch  |  40 +
 .../004-add_sata_disk_activity_trigger.patch   |  39 +
 .../mvebu/patches-4.14/100-find_active_root.patch  |  60 ++
 .../mvebu/patches-4.14/102-revert_i2c_delay.patch  |  15 +
 .../103-remove-nand-driver-bug.patch   |   0
 .../104-linksys_mamba_disable_keep_config.patch|  10 +
 .../110-pxa3xxx_revert_irq_thread.patch|  69 ++
 .../205-armada-385-rd-mtd-partitions.patch |   0
 .../206-ARM-mvebu-385-ap-Add-partitions.patch  |   0
 .../patches-4.14/210-clearfog_switch_node.patch|  21 +
 .../300-mvneta-tx-queue-workaround.patch   |  35 +
 ...bu-indicate-failure-to-enter-deeper-sleep.patch |  40 +
 .../401-pci-mvebu-time-out-reset-on-link-up.patch  |  60 ++
 .../402-sfp-display-SFP-module-information.patch   | 290 ++
 .../403-net-mvneta-convert-to-phylink.patch| 979 +
 .../404-net-mvneta-hack-fix-phy_interface.patch|  28 +
 ...disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch |  56 ++
 ...-mvneta-add-module-EEPROM-reading-support.patch |  44 +
 ...y-fixed-phy-remove-fixed_phy_update_state.patch |  80 ++
 ...dule-eeprom-ethtool-access-into-netdev-co.patch | 181 
 ...409-sfp-use-netdev-sfp_bus-for-start-stop.patch |  34 +
 ...-allow-marvell-10G-phy-support-to-use-SFP.patch | 131 +++
 .../patches-4.14/411-sfp-add-sfp-compatible.patch  |  24 +
 ...-armada388-clearfog-emmc-on-clearfog-base.patch |  87 ++
 ...ada388-clearfog-increase-speed-of-i2c0-to.patch |  42 +
 ...armada388-clearfog-add-SFP-module-support.patch |  81 ++
 ...dts-armada388-clearfog-document-MPP-usage.patch | 124 +++
 40 files changed, 4029 insertions(+), 6 deletions(-)
 create mode 100644 package/kernel/mwlwifi/patches/001-remove-vfs_write.patch
 create mode 100644 
target/linux/generic/pending-4.14/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch
 create mode 100644 
target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
 create mode 100644 target/linux/mvebu/config-4.14
 copy target/linux/mvebu/{files => 
files-4.4}/arch/arm/boot/dts/armada-385-linksys-rango.dts (100%)
 copy target/linux/mvebu/{files => 
files-4.4}/arch/arm/boot/dts/armada-385-linksys-shelby.dts (100%)
 rename target/linux/mvebu/{files => 
files-4.9}/arch/arm/boot/dts/armada-385-linksys-rango.dts (100%)
 rename target/linux/mvebu/{files => 
files-4.9}/arch/arm/boot/dts/armada-385-linksys-shelby.dts (100%)
 create mode 100644 target/linux/mvebu/patc

[LEDE-DEV] [PATCH v3 06/10] mvebu: Migrate uci config to new PCIe path

[Hauke Mehrtens]

The name of the PCIe controller node in device tree changed between
kernel 4.9 and kernel 4.14. Migrate the configuration when an update
from kernel 4.9 to 4.14 or back is done to the new name to make
the existing wifi configuration compatible with the new names.

This replaces the "pcie-controller" part with "pcie" on all nodes if the
file exists in sys fs.

This is not done in the uci-defualts, because they are getting executed
to late in the boot process. The kernel module gets loaded before the
uci-defaults scripts are executed. When the mwlwifi driver gets loaded
it will trigger an event via hotplug to detect new devices and as the
paths are not in the uci configuration they will be added again.
When the migration is done before the script will detect that they are
already there.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 .../etc/hotplug.d/ieee80211/00-wifi-config-migrate | 41 ++
 1 file changed, 41 insertions(+)
 create mode 100644 
target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate

diff --git 
a/target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate 
b/target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
new file mode 100644
index 00..a8173b3117
--- /dev/null
+++ 
b/target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# The pcie-controller device was renamed to pcie in Linux kernel 4.14
+# commit 28fbb9c539e2 ("ARM: dts: marvell: fix PCI bus dtc warnings").
+# This script migrates the path in the UCI configuration from the old
+# name to the new name and also back, when am upgrade or downgrade is
+# done. It checks if the name exists before changing the configuration.
+# This has to be done before the 10-wifi-detect script from mac80211 is
+# executed because this would add the devices again under the new path
+# name.
+
+. /lib/functions.sh
+
+PATH_CHANGED=0
+
+rename_wifi_path() {
+   local path_old=$(uci get wireless.${1}.path)
+   local path_new=$(echo ${path_old} | sed "${2}")
+
+   if [ -e "/sys/devices/platform/${path_new}" ] && [ ${path_old} != 
${path_new} ]
+   then 
+   uci set wireless.${1}.path=${path_new}
+   PATH_CHANGED=1
+   fi
+}
+
+rename_wifi_path_list() {
+   # migration from kernel 4.9 to 4.14
+   rename_wifi_path $1 "s/soc:pcie-controller/soc:pcie/"
+   # migration from kernel 4.14 to 4.9
+   rename_wifi_path $1 "s/soc:pcie/soc:pcie-controller/"
+}
+
+[ "${ACTION}" = "add" ] && {
+   [ ! -e /etc/config/wireless ] && return
+
+   config_load wireless
+   config_foreach rename_wifi_path_list wifi-device
+
+   [ "$PATH_CHANGED" = "1" ] && uci commit wireless
+}
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 08/10] mwlwifi: use PKG_SOURCE_DATE instead of version

[Hauke Mehrtens]

Using PKG_SOURCE_DATE instead of PKG_VERSION will make the build system
generate the version based on the date and the git hash. This way the
tar file name changes when the git hash changes and this avoids problems
when someone forgets to change the version, but changes the git hash.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/kernel/mwlwifi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index fca2a386aa..48de8da41f 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -8,7 +8,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwlwifi
-PKG_VERSION:=10.3.4.0-20180208
 PKG_RELEASE=1
 
 PKG_LICENSE:=ISC
@@ -16,8 +15,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2018-02-08
 PKG_SOURCE_VERSION:=064e888e801d5e4c3638e92ee18a2cde06a6f2d0
-PKG_MIRROR_HASH:=606c66a458c65b572d73c56bd9e69ec9c45a5c989c17442ebd3076dd76f2aea2
+PKG_MIRROR_HASH:=9214ffcf43781c71a9d13baa0d515d8d3f64c5f853636b186b9633af286e443a
 
 PKG_MAINTAINER:=Imre Kaloz <ka...@openwrt.org>
 PKG_BUILD_PARALLEL:=1
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 07/10] mwlwifi: Update to latest commit 20180208

[Hauke Mehrtens]

From: Chris Breuer 

Changes since last merge into OpenWrt since 2017-12-14:
 - Added debugfs file tx_hist.
 - Added debugfs file fixed_rate.
 - Added debugfs file ba_hist.
 - Modified the way to establish BA stream.
 - Added code to control BF type.
 - Added functions to check/dump dhcp packet.
 - Upgrade 88W8964 firmware to 9.3.2.4.
 - Added debugfs file coredump.
 - Corrected the way to transmit multicast packets.
 - Change driver version to 10.3.4.0-20180118.
 - Corrected the way to get qos control.
 - Assigned broadcast dhcpoffer to another queue.
 - Separated broadcast and multicast packets. Bump to latest commit 20180206

Signed-off-by: Chris Breuer 
---
 package/kernel/mwlwifi/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index f8e70e54a8..fca2a386aa 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwlwifi
-PKG_VERSION:=10.3.4.0-20171214
+PKG_VERSION:=10.3.4.0-20180208
 PKG_RELEASE=1
 
 PKG_LICENSE:=ISC
@@ -16,8 +16,8 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=843d00cd9c134629b9dad7162831ec5f136399b3
-PKG_MIRROR_HASH:=080c491473f0dbe9a7cac0fa3c6d004bf2dc3bd953a9f9d074eb8876a86437c2
+PKG_SOURCE_VERSION:=064e888e801d5e4c3638e92ee18a2cde06a6f2d0
+PKG_MIRROR_HASH:=606c66a458c65b572d73c56bd9e69ec9c45a5c989c17442ebd3076dd76f2aea2
 
 PKG_MAINTAINER:=Imre Kaloz 
 PKG_BUILD_PARALLEL:=1
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 09/10] mwlwifi: fix compile problem with kernel 4.14

[Hauke Mehrtens]

vfs_write() is not exported on kernel 4.14 any more and kernel_write()
should be used instead.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 .../mwlwifi/patches/001-remove-vfs_write.patch | 92 ++
 1 file changed, 92 insertions(+)
 create mode 100644 package/kernel/mwlwifi/patches/001-remove-vfs_write.patch

diff --git a/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch 
b/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch
new file mode 100644
index 00..9703d1d688
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/001-remove-vfs_write.patch
@@ -0,0 +1,92 @@
+--- a/debugfs.c
 b/debugfs.c
+@@ -279,7 +279,6 @@ static void core_dump_file(u8 *valbuf, u
+  u32 append, u32 totallen, bool textmode)
+ {
+   struct file *filp_core = NULL;
+-  mm_segment_t oldfs;
+   char file_name[40];
+   u8 *buf = kmalloc(length * 3, GFP_KERNEL);
+   u8 *data_p = buf;
+@@ -292,9 +291,6 @@ static void core_dump_file(u8 *valbuf, u
+   sprintf(file_name, "/dev/shm/coredump-%x-%x",
+   region, (region + totallen));
+ 
+-  oldfs = get_fs();
+-  set_fs(KERNEL_DS);
+-
+   if (append)
+   filp_core = filp_open(file_name, O_RDWR | O_APPEND, 0);
+   else
+@@ -317,15 +313,15 @@ static void core_dump_file(u8 *valbuf, u
+   }
+   data_p = buf + j;
+   data_p += sprintf(data_p, "\n");
+-  vfs_write(filp_core, buf, strlen(buf),
+-_core->f_pos);
++  kernel_write(filp_core, buf, strlen(buf),
++   _core->f_pos);
+   } else
+-  vfs_write(filp_core, valbuf, length, _core->f_pos);
++  kernel_write(filp_core, valbuf, length,
++   _core->f_pos);
+ 
+   filp_close(filp_core, current->files);
+   }
+ 
+-  set_fs(oldfs);
+   kfree(buf);
+ }
+ 
+@@ -1338,7 +1334,6 @@ static ssize_t mwl_debugfs_ba_hist_read(
+   u8 bmap0flag, nobaflag;
+   char buff[500], file_location[20];
+   struct file *filp_bahisto;
+-  mm_segment_t oldfs;
+   u8 *data_p = buff;
+   ssize_t ret;
+ 
+@@ -1354,13 +1349,10 @@ static ssize_t mwl_debugfs_ba_hist_read(
+   memset(file_location, 0, sizeof(file_location));
+   sprintf(file_location, "/tmp/ba_histo-%d", priv->ba_aid);
+ 
+-  oldfs = get_fs();
+-  set_fs(KERNEL_DS);
+   filp_bahisto = filp_open(file_location,
+O_RDWR | O_CREAT | O_TRUNC, 0);
+ 
+   if (IS_ERR(filp_bahisto)) {
+-  set_fs(oldfs);
+   ret = -EIO;
+   goto err;
+   }
+@@ -1401,8 +1393,8 @@ static ssize_t mwl_debugfs_ba_hist_read(
+ 
+   /* Buffer is full. Write to file and reset buf */
+   if ((strlen(buff) + 36) >= 500) {
+-  vfs_write(filp_bahisto, buff, strlen(buff),
+-_bahisto->f_pos);
++  kernel_write(filp_bahisto, buff, strlen(buff),
++   _bahisto->f_pos);
+   mdelay(2);
+   memset(buff, 0, sizeof(buff));
+   data_p = buff;
+@@ -1426,8 +1418,8 @@ static ssize_t mwl_debugfs_ba_hist_read(
+   data_p += sprintf(data_p, "%8d\n", nobaflag);
+   }
+ 
+-  vfs_write(filp_bahisto, buff, strlen(buff),
+-_bahisto->f_pos);
++  kernel_write(filp_bahisto, buff, strlen(buff),
++   _bahisto->f_pos);
+   len += scnprintf(p + len, size - len,
+"hole: %d, expect: %d, bmap0: %d, noba: %d\n",
+baholecnt, baexpcnt, bmap0cnt, nobacnt);
+@@ -1440,7 +1432,6 @@ static ssize_t mwl_debugfs_ba_hist_read(
+priv->ba_aid);
+ 
+   filp_close(filp_bahisto, current->files);
+-  set_fs(oldfs);
+ 
+   ret = simple_read_from_buffer(ubuf, count, ppos, p, len);
+ 
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v3 02/10] mac80211: move wifi detect hotplug script to later

[Hauke Mehrtens]

Make it easily possible to add a custom script in front of this hotplug
script which adds new devices. This is needed for the mvebu target in
which we want to migrate the old configuration before new devices are
getting detected.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 package/kernel/mac80211/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index c9a5a8f7c6..6ea07fdbfb 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=2017-11-01
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_HASH:=8437ab7886b988c8152e7a4db30b7f41009e49a3b2cb863edd05da1ecd7eb05a
 
@@ -1821,7 +1821,7 @@ define KernelPackage/cfg80211/install
$(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
$(INSTALL_BIN) ./files/lib/netifd/wireless/mac80211.sh 
$(1)/lib/netifd/wireless
$(INSTALL_DIR) $(1)/etc/hotplug.d/ieee80211
-   $(INSTALL_DATA) ./files/mac80211.hotplug 
$(1)/etc/hotplug.d/ieee80211/00-wifi-detect
+   $(INSTALL_DATA) ./files/mac80211.hotplug 
$(1)/etc/hotplug.d/ieee80211/10-wifi-detect
 endef
 
 define KernelPackage/ipw2100/install
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] mediatek: activate fpu feature flag

[Hauke Mehrtens]

The arm CPUs uses in the supported Mediatket SoCs have a FPU accordingly
to the datasheet, activate it also. The CPU subtype "neon-vfpv4" is
selected, but the toolcahin generated for this SoC will still be
compiled with soft float and not with the hard float ABI as we haven't
the fpu feature flag set. If this toolchain is reused by other targets
this will even affect other targets.

Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 target/linux/mediatek/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile
index 4ebac09a6e..6824111d85 100644
--- a/target/linux/mediatek/Makefile
+++ b/target/linux/mediatek/Makefile
@@ -6,7 +6,7 @@ ARCH:=arm
 BOARD:=mediatek
 BOARDNAME:=MediaTek Ralink ARM
 SUBTARGETS:=32
-FEATURES:=squashfs nand ubifs
+FEATURES:=squashfs nand ubifs fpu
 MAINTAINER:=John Crispin <j...@phrozen.org>
 
 KERNEL_PATCHVER:=4.9
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] kernel: rename CONFIG_TRACE_ENUM_MAP_FILE to CONFIG_TRACE_EVAL_MAP_FILE

[Hauke Mehrtens]

This config option was renamed in upstream Linux commit 681bec0367
("tracing: Rename update the enum_map file")

Reported-by: Rosen Penev <ros...@gmail.com>
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de>
---
 target/linux/generic/config-4.14 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 39c37744c9..3b7985a9ed 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -4943,7 +4943,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TRACER_SNAPSHOT is not set
 # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH v2 0/5] mvebu: add kernel 4.14 support

[Hauke Mehrtens]

On 02/09/2018 11:57 PM, Rosen Penev wrote:
> On Fri, Feb 9, 2018 at 1:52 PM, Hauke Mehrtens <ha...@hauke-m.de> wrote:
>> On 01/21/2018 06:53 PM, Hauke Mehrtens wrote:
>>> This add support for kernel 4.14 to the mvebu target. My main reason to
>>> add kernel 4.14 support is to make it easier to also add support for the
>>> Marvell Armada 3700LP ARM64 SoCs especially the ESPRESSObin board.
>>>
>>> I do not have any of the currently supported boards so I can not runtime
>>> test this myself, Lucian Cristian already tested an older version of
>>> these patches on one of his boards.
>>>
>>> My current working tree for this target can be found here:
>>> https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14
>>> This tree also contains the code needed for the ESPRESSObin, but we
>>> still have some problems with the image creation, the bootloader boots
>>> by default the kernel + dtb from a ext4 file system on a SD card and
>>> also uses this partition as root file system.
>>> Tomasz Maciej Nowak is working on the image generation for the
>>> ESPRESSObin board.
>>>
>>> I am waiting for positive and negative feedback on these patches, if you
>>> run into a problem which you do not have with kernel 4.9 please report
>>> this.
>>>
>>> changes in:
>>> v2:
>>>  * refresh on current generic kernel 4.14 integration
>>>  * create ubifs fs format version 4 also with kernel 4.14, this should
>>>fix sysupgrade (downgrade) from kernel 4.14 to 4.9
>>>  * rename the wireless driver path when upgrading
>>>
>>>
>>> Hauke Mehrtens (5):
>>>   kernel: ubifs: create use file system format 4 by default
>>>   mvebu: move files to files-4.9 and files-4.4 folder
>>>   mvebu: copy config and patches from 4.9 to 4.14
>>>   mvebu: Make kernel 4.14 patches apply
>>>   mvebu: migrate uci config to new PCIe path
>>>
>>
>> I haven't heard of any problems, expected that one patch does not apply
>> any more with kernel 4.14.18, which is fixed now.
>>
>> I will merge this on Sunday if I do not get any negative feedback.
>>
>> You can find my tree here:
>> https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14
> i just pulled your staging tree and decided to compile firmware for my
> Turris Omnia.
> 
> CONFIG_TRACE_EVAL_MAP_FILE makes the kernel fail. It needs to be
> defined somewhere.

Can you please send me the output of ./scripts/diffconfig.sh please.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/5] x86: add support for microcode update

[Hauke Mehrtens]

On 02/09/2018 09:46 PM, Philip Prindeville wrote:
> 
> 
>> On Jan 18, 2018, at 2:15 PM, Hauke Mehrtens <ha...@hauke-m.de> wrote:
>>
>> On 01/18/2018 01:51 PM, Nick Lowe wrote:
>>> Does an update to the Kernel, 4.9.77 and 4.14.14 need to be made to
>>> properly address this? There are fixes to mitigate Spectre.
>>
>> We even need a patch for GCC which will be in GCC 8 and 7.3.
>> For master we should backport it to GCC 5.5, but what do we want to do
>> with 17.01 and 15.05 ?
>>
>> The AMD microcoded updater needs at least kernel 4.15, 4.14.13, 4.9.76,
>> 4.4.111  which we already have.
>>
>> Hauke
> 
> 
> For those of us following this from the sidelines (but not too closely), 
> what’s the relationship of GCC to microcode updating?
> 
> -Philip

GCC 7.3 supports retpoline which helps to mitigate one of the Spectre
variants. Some of the mitigations are already done by some ASM code in
the kernel, but not everything.
The microcode update will provides some extra registers or instructions
to also mitigate Spectre or help the software to mitigate it.

Intel released here a plan which CPUs will get an updated microcode and
in which state it is:
https://newsroom.intel.com/wp-content/uploads/sites/11/2018/02/microcode-update-guidance.pdf

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH v2 0/5] mvebu: add kernel 4.14 support

[Hauke Mehrtens]

On 01/21/2018 06:53 PM, Hauke Mehrtens wrote:
> This add support for kernel 4.14 to the mvebu target. My main reason to 
> add kernel 4.14 support is to make it easier to also add support for the 
> Marvell Armada 3700LP ARM64 SoCs especially the ESPRESSObin board. 
> 
> I do not have any of the currently supported boards so I can not runtime 
> test this myself, Lucian Cristian already tested an older version of
> these patches on one of his boards.
> 
> My current working tree for this target can be found here:
> https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14
> This tree also contains the code needed for the ESPRESSObin, but we 
> still have some problems with the image creation, the bootloader boots 
> by default the kernel + dtb from a ext4 file system on a SD card and 
> also uses this partition as root file system.
> Tomasz Maciej Nowak is working on the image generation for the 
> ESPRESSObin board.
> 
> I am waiting for positive and negative feedback on these patches, if you 
> run into a problem which you do not have with kernel 4.9 please report 
> this.
> 
> changes in:
> v2:
>  * refresh on current generic kernel 4.14 integration
>  * create ubifs fs format version 4 also with kernel 4.14, this should 
>fix sysupgrade (downgrade) from kernel 4.14 to 4.9
>  * rename the wireless driver path when upgrading
> 
> 
> Hauke Mehrtens (5):
>   kernel: ubifs: create use file system format 4 by default
>   mvebu: move files to files-4.9 and files-4.4 folder
>   mvebu: copy config and patches from 4.9 to 4.14
>   mvebu: Make kernel 4.14 patches apply
>   mvebu: migrate uci config to new PCIe path
> 

I haven't heard of any problems, expected that one patch does not apply
any more with kernel 4.14.18, which is fixed now.

I will merge this on Sunday if I do not get any negative feedback.

You can find my tree here:
https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH v2 0/5] mvebu: add kernel 4.14 support

[Hauke Mehrtens]

On 02/09/2018 12:27 AM, Lucian Cristian wrote:
> On 21.01.2018 19:53, Hauke Mehrtens wrote:
>> This add support for kernel 4.14 to the mvebu target. My main reason to
>> add kernel 4.14 support is to make it easier to also add support for the
>> Marvell Armada 3700LP ARM64 SoCs especially the ESPRESSObin board.
>>
>> I do not have any of the currently supported boards so I can not runtime
>> test this myself, Lucian Cristian already tested an older version of
>> these patches on one of his boards.
>>
>> My current working tree for this target can be found here:
>> https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14
>>
>> This tree also contains the code needed for the ESPRESSObin, but we
>> still have some problems with the image creation, the bootloader boots
>> by default the kernel + dtb from a ext4 file system on a SD card and
>> also uses this partition as root file system.
>> Tomasz Maciej Nowak is working on the image generation for the
>> ESPRESSObin board.
>>
>> I am waiting for positive and negative feedback on these patches, if you
>> run into a problem which you do not have with kernel 4.9 please report
>> this.
>>
>> changes in:
>> v2:
>>   * refresh on current generic kernel 4.14 integration
>>   * create ubifs fs format version 4 also with kernel 4.14, this should
>>     fix sysupgrade (downgrade) from kernel 4.14 to 4.9
>>   * rename the wireless driver path when upgrading
>>
>>
>> Hauke Mehrtens (5):
>>    kernel: ubifs: create use file system format 4 by default
>>    mvebu: move files to files-4.9 and files-4.4 folder
>>    mvebu: copy config and patches from 4.9 to 4.14
>>    mvebu: Make kernel 4.14 patches apply
>>    mvebu: migrate uci config to new PCIe path
>>
>>   target/linux/generic/config-4.14   |   1 +
>>   ...ption-to-create-UBI-FS-version-4-on-empty.patch |  63 ++
>>   .../base-files/etc/uci-defaults/05-migrate-wifi    |  23 +
>>   target/linux/mvebu/config-4.14 | 486 ++
>>   .../arch/arm/boot/dts/armada-385-linksys-rango.dts |   0
>>   .../arm/boot/dts/armada-385-linksys-shelby.dts |   0
>>   .../arch/arm/boot/dts/armada-385-linksys-rango.dts |   0
>>   .../arm/boot/dts/armada-385-linksys-shelby.dts |   0
>>   .../mvebu/patches-4.14/002-add_powertables.patch   | 770
>> 
>>   .../mvebu/patches-4.14/003-add_switch_nodes.patch  |  40 +
>>   .../004-add_sata_disk_activity_trigger.patch   |  39 +
>>   .../mvebu/patches-4.14/100-find_active_root.patch  |  60 ++
>>   .../mvebu/patches-4.14/102-revert_i2c_delay.patch  |  15 +
>>   .../103-remove-nand-driver-bug.patch   |   0
>>   .../104-linksys_mamba_disable_keep_config.patch    |  10 +
>>   .../110-pxa3xxx_revert_irq_thread.patch    |  69 ++
>>   .../205-armada-385-rd-mtd-partitions.patch |   0
>>   .../206-ARM-mvebu-385-ap-Add-partitions.patch  |   0
>>   .../patches-4.14/210-clearfog_switch_node.patch    |  21 +
>>   .../300-mvneta-tx-queue-workaround.patch   |  35 +
>>   ...bu-indicate-failure-to-enter-deeper-sleep.patch |  40 +
>>   .../401-pci-mvebu-time-out-reset-on-link-up.patch  |  60 ++
>>   .../402-sfp-display-SFP-module-information.patch   | 290 ++
>>   .../403-net-mvneta-convert-to-phylink.patch    | 979
>> +
>>   .../404-net-mvneta-hack-fix-phy_interface.patch    |  28 +
>>   ...disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch |  56 ++
>>   ...-mvneta-add-module-EEPROM-reading-support.patch |  44 +
>>   ...y-fixed-phy-remove-fixed_phy_update_state.patch |  80 ++
>>   ...dule-eeprom-ethtool-access-into-netdev-co.patch | 181 
>>   ...409-sfp-use-netdev-sfp_bus-for-start-stop.patch |  34 +
>>   ...-allow-marvell-10G-phy-support-to-use-SFP.patch | 130 +++
>>   .../patches-4.14/411-sfp-add-sfp-compatible.patch  |  24 +
>>   ...-armada388-clearfog-emmc-on-clearfog-base.patch |  87 ++
>>   ...ada388-clearfog-increase-speed-of-i2c0-to.patch |  42 +
>>   ...armada388-clearfog-add-SFP-module-support.patch |  81 ++
>>   ...dts-armada388-clearfog-document-MPP-usage.patch | 124 +++
>>   36 files changed, 3912 insertions(+)
>>   create mode 100644
>> target/linux/generic/pending-4.14/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch
>>
>>   create mode 100644
>> target/linux/mvebu/base-files/etc/uci-defaults/05-migrate-wifi
>>   create mode 100644 target/linux/mvebu/config-4.14
>>   copy target/linux/mvebu/{files =>
>> files-4.4}/arch/arm/

Re: [LEDE-DEV] [PATCH] kernel: backport fix undefined abort

[Hauke Mehrtens]

On 01/30/2018 04:32 PM, Andrey Jr. Melnikov wrote:
> Evgeniy Didin <evgeniy.di...@synopsys.com> wrote:
> 
>> While building mpi.ko module with stable Linux v4.14.14 an error occured:
>>> ERROR: "abort" [lib/mpi/mpi.ko] undefined!
>> In upstream Linux 4.15 this issue is fixed:
>> Commit 7c2c11b208be ("arch: define weak abort()")
>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7c2c11b208be09c156573fc0076b7b3646e05219
> 
>> Commit dc8635b78cd8 ("kernel/exit.c: export abort() to modules")
>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dc8635b78cd8669c37e230058d18c33af7451ab1
> 
>> So lets add backport patches until these fixes
>> are not applied in stable version.
> 
>> Signed-off-by: Evgeniy Didin <evgeniy.di...@synopsys.com>
>> Cc: Alexey Brodkin <abrod...@synopsys.com>
>> CC: John Crispin <j...@phrozen.org>
>> CC: Hauke Mehrtens <ha...@hauke-m.de>
> 
> Copy this description into commit comments. After next patch rebase - it lost.

The patch already contain the full commit message and the hash so it is
pretty easy to find where they are from. I think this patch looks good.
I still hope that this will go into the 4.14 stable tree and we do not
have to maintain this any more.

Hauke

> 
>> ---
>>  .../080-v4.15-0001-arch-define-weak-abort.patch| 51 +++
>>  ...002-kernel-exit.c-export-abort-to-modules.patch | 74 
>> ++
>>  2 files changed, 125 insertions(+)
>>  create mode 100644 
>> target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
>>  create mode 100644 
>> target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
> 
>> diff --git 
>> a/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
>>  
>> b/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
>> new file mode 100644
>> index 00..2d247a39e4
>> --- /dev/null
>> +++ 
>> b/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
>> @@ -0,0 +1,51 @@
>> +From 7c2c11b208be09c156573fc0076b7b3646e05219 Mon Sep 17 00:00:00 2001
>> +From: Sudip Mukherjee <sudipm.mukher...@gmail.com>
>> +Date: Thu, 14 Dec 2017 15:33:19 -0800
>> +Subject: [PATCH] arch: define weak abort()
>> +
>> +gcc toggle -fisolate-erroneous-paths-dereference (default at -O2
>> +onwards) isolates faulty code paths such as null pointer access, divide
>> +by zero etc.  If gcc port doesnt implement __builtin_trap, an abort() is
>> +generated which causes kernel link error.
>> +
>> +In this case, gcc is generating abort due to 'divide by zero' in
>> +lib/mpi/mpih-div.c.
>> +
>> +Currently 'frv' and 'arc' are failing.  Previously other arch was also
>> +broken like m32r was fixed by commit d22e3d69ee1a ("m32r: fix build
>> +failure").
>> +
>> +Let's define this weak function which is common for all arch and fix the
>> +problem permanently.  We can even remove the arch specific 'abort' after
>> +this is done.
>> +
>> +Link: 
>> http://lkml.kernel.org/r/1513118956-8718-1-git-send-email-sudipm.mukher...@gmail.com
>> +Signed-off-by: Sudip Mukherjee <sudipm.mukher...@gmail.com>
>> +Cc: Alexey Brodkin <alexey.brod...@synopsys.com>
>> +Cc: Vineet Gupta <vineet.gup...@synopsys.com>
>> +Cc: Sudip Mukherjee <sudipm.mukher...@gmail.com>
>> +Signed-off-by: Andrew Morton <a...@linux-foundation.org>
>> +Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
>> +---
>> + kernel/exit.c | 8 
>> + 1 file changed, 8 insertions(+)
>> +
>> +diff --git a/kernel/exit.c b/kernel/exit.c
>> +index 6b4298a41167..df0c91d5606c 100644
>> +--- a/kernel/exit.c
>>  b/kernel/exit.c
>> +@@ -1755,3 +1755,11 @@ COMPAT_SYSCALL_DEFINE5(waitid,
>> +   return -EFAULT;
>> + }
>> + #endif
>> ++
>> ++__weak void abort(void)
>> ++{
>> ++  BUG();
>> ++
>> ++  /* if that doesn't kill us, halt */
>> ++  panic("Oops failed to kill thread");
>> ++}
>> +-- 
>> +2.11.0
>> +
>> diff --git 
>> a/target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
>>  
>> b/target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
>> new file mode 100644
>> index 00..5b95b6798d
>> --- /dev/null
>> +++ 
>&g

Re: [LEDE-DEV] [PATCH] archs38: bump kernel to 4.14.

[Hauke Mehrtens]

On 01/29/2018 04:35 PM, Evgeniy Didin wrote:
> Hello Hauke,
> 
> There are two patches, which solves problem with undefined "Abort":
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/comm
> it/?id=7c2c11b208be09c156573fc0076b7b3646e05219
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/comm
> it/?id=dc8635b78cd8669c37e230058d18c33af7451ab1
> 
> These patches are applied in Linux 4.15 ver.
> 
> I have placed these patches in target/linux/generic/backport-4.14 and
> build finished without errors.
>  
> I expect these patches will be backported in upstream 4.14 branch
> anytime soon. Until these patches are accepted should I add them with 
> separate patch or should I add them in patch-series with kernel version
> update for archs38?

Please create a separate patch which adds these to patches to
target/linux/generic/backport-4.14

I haven't seen them in the 4.14 stable queue:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-4.14

You could write to the stable mailing list to get this backported to
stable kernel 4.14, see this for details:
https://github.com/torvalds/linux/blob/master/Documentation/process/stable-kernel-rules.rst

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] archs38: bump kernel to 4.14.

[Hauke Mehrtens]

Hi,

On 01/23/2018 05:48 PM, Evgeniy Didin wrote:
> Update Linux kernel version from 4.9 to 4.14 for archs38.
> config-4.14 was simply regenerated with "make kernel_menuconfig".
> 
> Signed-off-by: Evgeniy Didin 
> Cc: Alexey Brodkin 
> Cc: John Crispin 
> ---
>  target/linux/archs38/Makefile  |  2 +-
>  target/linux/archs38/{config-4.9 => config-4.14}   | 52 
> +++---
>  ...stmmac-Disable-frame-filtering-completely.patch |  0
>  3 files changed, 28 insertions(+), 26 deletions(-)
>  rename target/linux/archs38/{config-4.9 => config-4.14} (85%)
>  rename target/linux/archs38/{patches-4.9 => 
> patches-4.14}/700-stmmac-Disable-frame-filtering-completely.patch (100%)

When compiling I am getting this error:

.
  Building modules, stage 2.
  MODPOST 14 modules
ERROR: "abort" [lib/mpi/mpi.ko] undefined!
scripts/Makefile.modpost:92: recipe for target '__modpost' failed
make[6]: *** [__modpost] Error 1
Makefile:1215: recipe for target 'modules' failed
make[5]: *** [modules] Error 2
...

This module has the abort symbol:
hauke@hauke-desktop:~/openwrt/lede$ nm
build_dir/target-arc_archs_uClibc/linux-archs38_generic/linux-4.14.14/lib/mpi/mpi.ko
|fgrep abort
 U abort
hauke@hauke-desktop:~/openwrt/lede$

This is my configuration:
hauke@hauke-desktop:~/openwrt/lede$ ./scripts/diffconfig.sh
CONFIG_TARGET_archs38=y
CONFIG_TARGET_archs38_generic=y
CONFIG_TARGET_archs38_generic_Default=y
CONFIG_PACKAGE_kmod-crypto-aead=y
CONFIG_PACKAGE_kmod-crypto-authenc=y
CONFIG_PACKAGE_kmod-crypto-hash=y
CONFIG_PACKAGE_kmod-crypto-hw-ccp=y
CONFIG_PACKAGE_kmod-crypto-manager=y
CONFIG_PACKAGE_kmod-crypto-null=y
CONFIG_PACKAGE_kmod-crypto-pcompress=y
CONFIG_PACKAGE_kmod-crypto-rsa=y
CONFIG_PACKAGE_kmod-crypto-sha1=y
CONFIG_PACKAGE_kmod-crypto-sha256=y
CONFIG_PACKAGE_kmod-random-core=y

I am also using your new toolchain based on gcc 7.1.

Does the arc CPU also need some special handling like some MIPS CPUs:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bbc25bee37d2b32cf3a1fab9195b6da3a185614a

> diff --git 
> a/target/linux/archs38/patches-4.9/700-stmmac-Disable-frame-filtering-completely.patch
>  
> b/target/linux/archs38/patches-4.14/700-stmmac-Disable-frame-filtering-completely.patch
> similarity index 100%
> rename from 
> target/linux/archs38/patches-4.9/700-stmmac-Disable-frame-filtering-completely.patch
> rename to 
> target/linux/archs38/patches-4.14/700-stmmac-Disable-frame-filtering-completely.patch

Is this patch still needed? Did you check if this problem still exists
with kernel 4.14?

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] curl: Switch all TLS libraries to use ca-bundle.

[Hauke Mehrtens]

On 01/24/2018 05:28 AM, Rosen Penev wrote:
> At least one application (transmission) depends on CURL_CA_BUNDLE being
> set in order to operate properly (Could not connect to tracker errors).
> As far as I can tell, there's no real drawback to doing this for all
> TLS libraries supported by curl.

Do all of these libraries support --with-ca-bundle ?


> 
> Signed-off-by: Rosen Penev 
> ---
>  package/network/utils/curl/Makefile | 10 ++
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/package/network/utils/curl/Makefile 
> b/package/network/utils/curl/Makefile
> index 17fcf70..930bd10 100644
> --- a/package/network/utils/curl/Makefile
> +++ b/package/network/utils/curl/Makefile
> @@ -111,13 +111,15 @@ CONFIGURE_ARGS += \
>   --without-nss \
>   --without-libmetalink \
>   --without-librtmp \
> + --without-ca-path \
> + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
>   \
>   $(call autoconf_bool,CONFIG_IPV6,ipv6) \
>   \
> - $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr" 
> --without-ca-path 
> --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \
> - $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" 
> --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \
> - $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" 
> --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \
> - $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" 
> --without-ca-path 
> --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \
> + $(if 
> $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl)
>  \
> + $(if 
> $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) 
> \
> + $(if 
> $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \
> + $(if 
> $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls)
>  \
>   \
>   $(if 
> $(CONFIG_LIBCURL_LIBIDN),--with-libidn="$(STAGING_DIR)/usr",--without-libidn) 
> \
>   $(if 
> $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) 
> \
> 


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev