Re: [OpenWrt-Devel] [PATCH v2 0/7] Move caldata extraction and MAC patching to common file
> -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Adrian Schmutzler > Sent: Sonntag, 22. September 2019 11:57 > To: openwrt-devel@lists.openwrt.org > Subject: [OpenWrt-Devel] [PATCH v2 0/7] Move caldata extraction and MAC > patching to common file > > This is an update of my patchset unifying caldata extraction and MAC > patching. I've improved some tiny things and despite that mostly done > rebasing. > I've also included the patch for the special situation in lantiq I sent > separately > for v1. > > The patchset removes 417 lines of redundant code, which despite that also > included several variations of the same approach. > > This has been tested on: > - ath79/ath9k: WDR4300 v1 > - ath79/ath10k: Archer C60 v2 > - ipq806x: TP-Link C2600 > Tested on mpc85xx (WDR4900 v1). openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] uboot-envtools: remove erasesize from MMC config
Erasesize doesn't belong in the u-boot env config for block devices as it is known to be 512 byte aligned. Signed-off-by: Tim Harvey --- package/boot/uboot-envtools/files/imx6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-envtools/files/imx6 b/package/boot/uboot-envtools/files/imx6 index fb05f13..330efb2 100644 --- a/package/boot/uboot-envtools/files/imx6 +++ b/package/boot/uboot-envtools/files/imx6 @@ -24,8 +24,8 @@ apalis*) ubootenv_add_uci_config /dev/mtd1 0x8 0x2 0x4 else # board boots from microSD - ubootenv_add_uci_config /dev/mmcblk0 0xb1400 0x2 0x2 - ubootenv_add_uci_config /dev/mmcblk0 0xd1400 0x2 0x2 + ubootenv_add_uci_config /dev/mmcblk0 0xb1400 0x2 + ubootenv_add_uci_config /dev/mmcblk0 0xd1400 0x2 fi ;; wandboard) -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] imx6: bootscript: use partition UUID for rootfs if possible
Specifying root filesystem by device is non-deterministic for several reasons:
- USB device unmeration order is not garunteeed for USB storage devs
- MMC devs ordering is determined by the instance of the MMC host controller
including non-storage SDIO devices which can throw off numbering depending
on kernel versions.
It is recommended to use partition UUID
Signed-off-by: Tim Harvey
---
target/linux/imx6/image/bootscript-ventana | 34 ++
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/target/linux/imx6/image/bootscript-ventana
b/target/linux/imx6/image/bootscript-ventana
index 8451caf..06e2015 100644
--- a/target/linux/imx6/image/bootscript-ventana
+++ b/target/linux/imx6/image/bootscript-ventana
@@ -1,4 +1,4 @@
-echo "Gateworks Ventana OpenWrt Boot script v1.02"
+echo "Gateworks Ventana OpenWrt Boot script v1.03"
# set some defaults
# set some defaults
@@ -9,7 +9,7 @@ setenv bootargs console=${console},${baudrate}
setenv loadaddr 1080
setenv fdt_addr 1800
-# detect dtype and bootdev by looking for kernel on media the bootloader
+# detect dtype by looking for kernel on media the bootloader
# has mounted (in order of preference: usb/mmc/sata)
#
# This assumes the bootloader has already started the respective subsystem
@@ -31,18 +31,9 @@ else
fi
echo "detected dtype:$dtype"
fi
-if test -n "$bootdev" ; then
- echo "Using bootdev from env: $bootdev"
-else
- if itest.s "x${dtype}" == "xmmc" ; then
- bootdev=mmcblk0p1
- else
- bootdev=sda1
- fi
-fi
+echo "Booting from ${dtype}..."
if itest.s "x${dtype}" == "xnand" ; then
- echo "Booting from NAND..."
# fix partition name
# OpenWrt kernel bug prevents partition name of 'rootfs' from booting
# instead name the partition ubi which is what is looked for by
@@ -54,9 +45,24 @@ if itest.s "x${dtype}" == "xnand" ; then
# enable UBI fastmap support
setenv bootargs "${bootargs} ubi.fm_autoconvert=1"
else
- echo "Booting from block device ${bootdev}..."
setenv fsload "${fs}load ${dtype} ${disk}:1"
- setenv root "root=/dev/${bootdev} rootfstype=${fs} rootwait rw"
+ part uuid ${dtype} ${disk}:1 uuid
+ if test -z "${uuid}"; then
+ # fallback to bootdev
+ if test -n "$bootdev" ; then
+ echo "Using bootdev from env: $bootdev"
+ else
+ if itest.s "x${dtype}" == "xmmc" ; then
+ bootdev=mmcblk0p1
+ else
+ bootdev=sda1
+ fi
+ fi
+ setenv root "root=/dev/${bootdev}"
+ else
+ setenv root "root=PARTUUID=${uuid}"
+ fi
+ setenv root "$root rootfstype=${fs} rootwait rw"
fi
setenv bootargs "${bootargs}" "${root}" "${video}" "${extra}"
--
2.7.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] imx6: bootscript: enable UBI fastmap support
UBI Fastmap support is stable in the 4.4 kernel so lets take
advantage of it to shave off 5-10 seconds of boot time.
Signed-off-by: Tim Harvey
---
target/linux/imx6/image/bootscript-ventana | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/linux/imx6/image/bootscript-ventana
b/target/linux/imx6/image/bootscript-ventana
index 941afb5..8451caf 100644
--- a/target/linux/imx6/image/bootscript-ventana
+++ b/target/linux/imx6/image/bootscript-ventana
@@ -1,4 +1,4 @@
-echo "Gateworks Ventana OpenWrt Boot script v1.01"
+echo "Gateworks Ventana OpenWrt Boot script v1.02"
# set some defaults
# set some defaults
@@ -51,6 +51,8 @@ if itest.s "x${dtype}" == "xnand" ; then
echo "mtdparts:${mtdparts}"
setenv fsload ubifsload
setenv root "ubi0:ubi ubi.mtd=2 rootfstype=squashfs,ubifs"
+ # enable UBI fastmap support
+ setenv bootargs "${bootargs} ubi.fm_autoconvert=1"
else
echo "Booting from block device ${bootdev}..."
setenv fsload "${fs}load ${dtype} ${disk}:1"
--
2.7.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ath79: Clean up GL-AR300M DTS/DTSI inclusions
Hi, > -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Jeff Kletsky > Sent: Mittwoch, 2. Oktober 2019 21:06 > To: openwrt-devel@lists.openwrt.org > Cc: Jeff Kletsky > Subject: [OpenWrt-Devel] [PATCH] ath79: Clean up GL-AR300M DTS/DTSI > inclusions > > From: Jeff Kletsky > Reviewed-by: Adrian Schmutzler openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ath79: Clean up GL-AR300M DTS/DTSI inclusions
From: Jeff Kletsky
Modify GL-AR300M-Lite and GL-AR300M (NOR):
* Include qca9531_glinet_gl-ar300m.dtsi directly
rather than qca9531_glinet_gl-ar300m-nor.dts
* Remove redundant inclusion of gpio.h and input.h
Signed-off-by: Jeff Kletsky
---
target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts | 2 +-
target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
index e29af5411d..b2cb5bc261 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-#include "qca9531_glinet_gl-ar300m-nor.dts"
+#include "qca9531_glinet_gl-ar300m.dtsi"
/ {
compatible = "glinet,gl-ar300m-lite", "qca,qca9531";
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
index 02196cf9c4..22e5ae4e74 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
@@ -1,8 +1,5 @@
/dts-v1/;
-#include
-#include
-
#include "qca9531_glinet_gl-ar300m.dtsi"
/ {
--
2.20.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH luci] luci-mod-system: check for sysupgrade with backup possibility
On Wed, 25 Sep 2019 at 17:55, Rafał Miłecki wrote: > From: Rafał Miłecki > > Some firmware images may not support preserving backup. In such cases > display a warning and disable relevant checkbox. Signed-off-by: Rafał Miłecki ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Find tradeshows and conferences near you
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- Hi there! Find your next opportunity at an event of your interest 10times is the world's largest business event platform to find events, business conferences, trade shows, global seminars, networking meets and workshops. Events near me Connect with 40m+ event goers world wide. 300k business events from around the globe. Professionals from more than 100 industries. Network with event-goers from more than 200 countries & 8000 cities. For any queries, reach out to Helpdesk Download our official Apps | Manage Email Subscription Unsubscribe From This List http://links.10times.com/asm/unsubscribe/?user_id=1002061&data=ABz-jzR5iVLKUP6IJ1vB96hMlU56YuBDeFzWLGAEoOAU7LdPrwYR9j2RdlTUTMXbvCKV3V-vBEsZy0uEgnHfb-OC8UtpakhE8a_jFNMrmqynsY4ulrWtWTLvPTKOMxS4Xt6xc-U2RQcPvOiKJmdW_gm2bd6C01MsbBj6f4KZnObLblaFRsjVm-IBuaRdEx5E2pA61fG82c4dML0KtxRUwmar0jYutVDqIU5MRCR4T6zBsYfAaL8wAtMmoyriYqS-l4r0dQAvlol9jHufFmnvC9ATFLSRb5CrKZEcyWztVUyapFbKy6pxZ25_-Lk8QVGvNj_Oa4tb3dxbyJ85sYQY2m6-beEoqe3-U5rqV404zZg7NrjmDswhhnkMtE-XjukWVblQ3zYXvXYh-IFRJFSNz6mFYcMfldNZZCVUP_1P5sDaLVeBGgJi6rDNZlhri3QDlGFibuuXlXIdUDAwUwxrSpkL_TJkCVAo4OD4U54tekjVC2aN1smgpmrsEZRg5dqx | Manage Email Preferences http://links.10times.com/asm/?user_id=1002061&data=WTeu4IXi3Qcw-_vSr9lLXrenY7As55ZCbP-cx0eK3NrErDAb5dQ_ww3whgaUtVa_0TJIBuZn4ThlsDy3EN7NSC2pl7YGllcclKjojR0zg6ZSzVa4X7OyMQdFN2PQ9BuhqAq4qQxAjk-xN1nxEAQx8SzcYdhG_Uh0_OYpVpgq0J9ZM9AJWZOaPBolTiN3XiyJ5UmdAbvGVJQmd98pK2typX7n2uSnKpS24Evn0CU7wKbSykfEM8tSPjccaB9CJZpXb9jehNoI-Uh2BsxGtDJBPJOUBwNuyIHjFx1Z8N3ZE_PdJkvHDo5cBS807mHwc6jrvqKtmDps_hnnW8K3UhIbbfZDBFCw155ve7v0OPgzauJ67Fugbc2GNZN4cJcCjErb2ZDn0qwsFl0zRlV-H3dhIgtcejL5ahZWt7RzjM55NlntY2VArhsyD_KBSwHF58WcJNBBzNeyGrRlVCnIR4Ze9xwnN2wr0bXeaazgemAsq44=--- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2] toolchain/gcc: switch to version 8 by default
Main motivation for this commit is the introduction of `-ffile-prefix-map=` which alows reproducible build path. Compiling tested without errors on the following targets: * ath79 * brcm2708 * brcm63xx * ixp4xx * ramips * sunxi * x86 CC: Andre Heider Thanks to Andre for the iremap fixup Signed-off-by: Paul Spooren --- config/Config-build.in | 2 -- .../patches/120-strip-cflags-from-binary.patch | 2 +- rules.mk | 8 toolchain/gcc/Config.in| 8 ++-- toolchain/gcc/Config.version | 14 -- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/config/Config-build.in b/config/Config-build.in index 9669fc86c7..872e5c12ab 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -243,7 +243,6 @@ menu "Global build settings" config PKG_CC_STACKPROTECTOR_STRONG bool "Strong" select GCC_LIBSSP if !USE_MUSL - depends on !GCC_VERSION_4_8 depends on KERNEL_CC_STACKPROTECTOR_STRONG endchoice @@ -258,7 +257,6 @@ menu "Global build settings" config KERNEL_CC_STACKPROTECTOR_REGULAR bool "Regular" config KERNEL_CC_STACKPROTECTOR_STRONG - depends on !GCC_VERSION_4_8 bool "Strong" endchoice diff --git a/package/libs/openssl/patches/120-strip-cflags-from-binary.patch b/package/libs/openssl/patches/120-strip-cflags-from-binary.patch index 75fb9d1684..7faec9ab88 100644 --- a/package/libs/openssl/patches/120-strip-cflags-from-binary.patch +++ b/package/libs/openssl/patches/120-strip-cflags-from-binary.patch @@ -17,7 +17,7 @@ index 2c619c62e8..893128345a 100644 DEPEND[cversion.o]=buildinf.h -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" -+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(filter-out -I% -iremap% -fmacro-prefix-map%,$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q))" "$(PLATFORM)" ++GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(filter-out -I% -iremap% -fmacro-prefix-map% -ffile-prefix-map%,$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q))" "$(PLATFORM)" DEPEND[buildinf.h]=../configdata.pm GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) diff --git a/rules.mk b/rules.mk index b140fbca70..7063cf3ad6 100644 --- a/rules.mk +++ b/rules.mk @@ -139,11 +139,11 @@ else TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME) endif -ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),) - ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y) -iremap = -fmacro-prefix-map=$(1)=$(2) - else +ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),) + ifeq ($(CONFIG_GCC_USE_IREMAP),y) iremap = -iremap$(1):$(2) + else +iremap = -ffile-prefix-map=$(1)=$(2) endif endif diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 0977f9b4e7..3882815d7f 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -2,8 +2,7 @@ choice prompt "GCC compiler Version" if TOOLCHAINOPTS - default GCC_USE_VERSION_8 if arc - default GCC_USE_VERSION_7 + default GCC_USE_VERSION_8 help Select the version of gcc you wish to use. @@ -22,6 +21,11 @@ choice bool "gcc 9.x" endchoice +config GCC_USE_IREMAP + default y if ( GCC_USE_VERSION_5 || GCC_USE_VERSION_7 ) + default n + bool + config GCC_USE_GRAPHITE bool prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index d9732b3e0d..0658f3d52b 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -2,23 +2,17 @@ config GCC_VERSION_5 default y if GCC_USE_VERSION_5 bool -config GCC_VERSION_8 - default y if GCC_USE_VERSION_8 - default y if arc && !GCC_USE_VERSION_9 +config GCC_VERSION_7 + default y if GCC_USE_VERSION_7 bool config GCC_VERSION_9 default y if GCC_USE_VERSION_9 bool -config GCC_USE_EMBEDDED_PATH_REMAP - default y if ( GCC_VERSION_8 || GCC_VERSION_9 ) - default n - bool - config GCC_VERSION string default "5.5.0" if GCC_VERSION_5 - default "8.3.0" if GCC_VERSION_8 + default "7.4.0" if GCC_VERSION_7 default "9.2.0" if GCC_VERSION_9 - default "7.4.0" + default "8.3.0" -- 2.23.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
