docs/releases/v2017.1.rst

@@ -13,6 +13,10 @@ many hacks that were required to make the build work with older OpenWrt releases
 The *output/modules* directory is now called *output/packages* and provides a
 replacement for the whole repository with target-specific packages of LEDE (in
 contrast to packages that are common for all targets of the same architecture).
+Another change to the build system makes it necessary that the same *GLUON_RELEASE*
+value that is used to build the images is also set for ``make manifest``.
+
+GCC 4.8 or newer is now required to build Gluon.
 
 **Note: There is an issue in all Gluon versions before 2016.2.6 that will
 lead to x86 systems losing their configuration when upgrading to Gluon 2017.1!**
@@ -127,7 +131,8 @@ site.mk
 ^^^^^^^
 
 * The *gluon-legacy* package does not exist anymore
-* All *gluon-luci-* packages have been renamed to *gluon-web-*
+* All *gluon-luci-* packages have been renamed to *gluon-web-*;
+  *gluon-luci-portconfig* is now called *gluon-web-network*
 * The *gluon-next-node* package has been merged into the Gluon core and must not
   be specified in *site.mk* anymore
 

docs/site-example/site.mk

@@ -25,7 +25,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-setup-mode \
 	gluon-status-page \
 	haveged \
-	iptables \
 	iwinfo
 
 ##	DEFAULT_GLUON_RELEASE

patches/lede/0031-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 20 Jun 2017 11:01:27 +0200
+Subject: generic: mtd: backport unlock support and asserted fixes for certain Winbond/Spansion flash chips
+
+diff --git a/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..c8aafe2ebbf7368f47e8f4d7a24dd5e45583a136
+--- /dev/null
++++ b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
+@@ -0,0 +1,66 @@
++From 32321e950d8a237d7e8f3a9b76220007dfa87544 Mon Sep 17 00:00:00 2001
++Message-Id: <32321e950d8a237d7e8f3a9b76220007dfa87544.1462572686.git.mschiffer@universe-factory.net>
++From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
++Date: Mon, 28 Dec 2015 17:54:51 -0300
++Subject: [PATCH] mtd: spi-nor: wait until lock/unlock operations are ready
++
++On Micron and Numonyx devices, the status register write command
++(WRSR), raises a work-in-progress bit (WIP) on the status register.
++The datasheets for these devices specify that while the status
++register write is in progress, the status register WIP bit can still
++be read to check the end of the operation.
++
++This commit adds a wait_till_ready call on lock/unlock operations,
++which is required for Micron and Numonyx but should be harmless for
++others. This is needed to prevent applications from issuing erase or
++program operations before the unlock operation is completed.
++
++Reported-by: Stas Sergeev <stsp@list.ru>
++Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
++Signed-off-by: Brian Norris <computersforpeace@gmail.com>
++---
++ drivers/mtd/spi-nor/spi-nor.c | 12 ++++++++++--
++ 1 file changed, 10 insertions(+), 2 deletions(-)
++
++--- a/drivers/mtd/spi-nor/spi-nor.c
+++++ b/drivers/mtd/spi-nor/spi-nor.c
++@@ -463,6 +463,7 @@ static int stm_lock(struct spi_nor *nor,
++ 	u8 status_old, status_new;
++ 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
++ 	u8 shift = ffs(mask) - 1, pow, val;
+++	int ret;
++ 
++ 	status_old = read_sr(nor);
++ 
++@@ -499,7 +500,10 @@ static int stm_lock(struct spi_nor *nor,
++ 		return -EINVAL;
++ 
++ 	write_enable(nor);
++-	return write_sr(nor, status_new);
+++	ret = write_sr(nor, status_new);
+++	if (ret)
+++		return ret;
+++	return spi_nor_wait_till_ready(nor);
++ }
++ 
++ /*
++@@ -513,6 +517,7 @@ static int stm_unlock(struct spi_nor *no
++ 	uint8_t status_old, status_new;
++ 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
++ 	u8 shift = ffs(mask) - 1, pow, val;
+++	int ret;
++ 
++ 	status_old = read_sr(nor);
++ 
++@@ -547,7 +552,10 @@ static int stm_unlock(struct spi_nor *no
++ 		return -EINVAL;
++ 
++ 	write_enable(nor);
++-	return write_sr(nor, status_new);
+++	ret = write_sr(nor, status_new);
+++	if (ret)
+++		return ret;
+++	return spi_nor_wait_till_ready(nor);
++ }
++ 
++ /*
+diff --git a/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..0541c95594ec14f62b5db787f4d52d5a42777cdc
+--- /dev/null
++++ b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
+@@ -0,0 +1,33 @@
++From edf891ef9ab773363f8e58022a26d7d31604aed6 Mon Sep 17 00:00:00 2001
++Message-Id: <edf891ef9ab773363f8e58022a26d7d31604aed6.1462572703.git.mschiffer@universe-factory.net>
++From: Brian Norris <computersforpeace@gmail.com>
++Date: Fri, 29 Jan 2016 11:25:30 -0800
++Subject: [PATCH] mtd: spi-nor: wait for SR_WIP to clear on initial unlock
++
++Fixup a piece leftover by commit 32321e950d8a ("mtd: spi-nor: wait until
++lock/unlock operations are ready"). That commit made us wait for the WIP
++bit to settle after lock/unlock operations, but it missed the open-coded
++"unlock" that happens at probe() time.
++
++We should probably have this code utilize the unlock() routines in the
++future, to avoid duplication, but unfortunately, flash which need to be
++unlocked don't all have a proper ->flash_unlock() callback.
++
++Signed-off-by: Brian Norris <computersforpeace@gmail.com>
++Cc: Stas Sergeev <stsp@users.sourceforge.net>
++Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
++Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
++---
++ drivers/mtd/spi-nor/spi-nor.c | 1 +
++ 1 file changed, 1 insertion(+)
++
++--- a/drivers/mtd/spi-nor/spi-nor.c
+++++ b/drivers/mtd/spi-nor/spi-nor.c
++@@ -1169,6 +1169,7 @@ int spi_nor_scan(struct spi_nor *nor, co
++ 	    info->flags & SPI_NOR_HAS_LOCK) {
++ 		write_enable(nor);
++ 		write_sr(nor, 0);
+++		spi_nor_wait_till_ready(nor);
++ 	}
++ 
++ 	if (!mtd->name)
+diff --git a/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..7c6530a5e0e8bc144e1d4497428e3c3691c2ef22
+--- /dev/null
++++ b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+@@ -0,0 +1,18 @@
++--- a/drivers/mtd/spi-nor/spi-nor.c
+++++ b/drivers/mtd/spi-nor/spi-nor.c
++@@ -1161,6 +1161,7 @@ int spi_nor_scan(struct spi_nor *nor, co
++ 	    JEDEC_MFR(info) == SNOR_MFR_INTEL ||
++ 	    JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
++ 	    JEDEC_MFR(info) == SNOR_MFR_SST ||
+++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
++ 	    info->flags & SPI_NOR_HAS_LOCK) {
++ 		write_enable(nor);
++ 		write_sr(nor, 0);
++@@ -1178,6 +1179,7 @@ int spi_nor_scan(struct spi_nor *nor, co
++ 
++ 	/* NOR protection support for STmicro/Micron chips and similar */
++ 	if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
+++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
++ 		info->flags & SPI_NOR_HAS_LOCK) {
++ 		nor->flash_lock = stm_lock;
++ 		nor->flash_unlock = stm_unlock;

scripts/common.inc.sh

@@ -18,6 +18,10 @@ alias() {
 	:
 }
 
+manifest_alias() {
+	:
+}
+
 packages() {
 	:
 }

scripts/generate_manifest.sh

@@ -9,6 +9,7 @@ default_sysupgrade_ext='.bin'
 
 output=
 aliases=
+manifest_aliases=
 
 sysupgrade_ext=
 
@@ -33,6 +34,10 @@ generate() {
 		for alias in $aliases; do
 			generate_line "$alias" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}-sysupgrade${sysupgrade_ext}"
 		done
+
+		for alias in $manifest_aliases; do
+			generate_line "$alias" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-sysupgrade${sysupgrade_ext}"
+		done
 	fi
 }
 
@@ -44,6 +49,7 @@ device() {
 
 	output="$1"
 	aliases=
+	manifest_aliases=
 
 	sysupgrade_ext="$default_sysupgrade_ext"
 }
@@ -53,6 +59,7 @@ sysupgrade_image() {
 
 	output="$1"
 	aliases=
+	manifest_aliases=
 
 	if [ "$3" ]; then
 		sysupgrade_ext="$3"
@@ -65,6 +72,10 @@ alias() {
 	aliases="$aliases $1"
 }
 
+manifest_alias() {
+	manifest_aliases="$manifest_aliases $1"
+}
+
 sysupgrade() {
 	if [ "$2" ]; then
 		sysupgrade_ext="$2"

targets/generic

@@ -4,6 +4,7 @@ config 'CONFIG_ALL_NONSHARED=y'
 
 config 'CONFIG_BUSYBOX_CUSTOM=y'
 config 'CONFIG_BUSYBOX_CONFIG_SHA256SUM=y'
+config 'CONFIG_BUSYBOX_CONFIG_SHA512SUM=y'
 config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set'
 
 config 'CONFIG_PACKAGE_ATH_DEBUG=y'

targets/ramips-rt305x

@@ -5,3 +5,5 @@ factory
 
 device vocore-16M vocore-16M
 factory
+
+device a5-v11 a5-v11

targets/x86-generic

@@ -7,3 +7,5 @@ factory_image x86-generic combined-ext4 .img.gz
 factory_image x86-generic combined-ext4 .vdi
 factory_image x86-generic combined-ext4 .vmdk
 sysupgrade_image x86-generic combined-ext4 .img.gz
+manifest_alias x86-kvm
+manifest_alias x86-xen_domu