From 364739a491ef7f55c7c963c46831ab8487177c2f Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 28 Feb 2020 18:27:02 +0000 Subject: [PATCH 1/4] kernel: x86_64: drop CALGARY IOMMU on 5.4 It's snuck back in on kernel 5.4 configs, so drop it there too. Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/x86/64/config-5.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4 index 7afce44091..ceee923b0f 100644 --- a/target/linux/x86/64/config-5.4 +++ b/target/linux/x86/64/config-5.4 @@ -70,8 +70,8 @@ CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_BTT=y -CONFIG_CALGARY_IOMMU=y -CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +# CONFIG_CALGARY_IOMMU is not set +# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set CONFIG_CONNECTOR=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set From a5100a0bd1f405f975d41f56a96f5f9569c572f8 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 29 Feb 2020 16:50:52 +0000 Subject: [PATCH 2/4] build: simplify gnu-getopt search getopt is the only command where /usr/local/bin is specified explicitly. All other commands are assumed to exist in the PATH in one form or another. Remove this exception and require gnugetopt/getopt to be in the user's PATH. In the case of macos Homebrew, getopt is 'keg only' hence not linked into /usr/local/bin whilst other commands are linked and likely found by virtue of /usr/local/bin being in PATH. Since 2019 Homebrew is very reluctant to install links that have potential to override default OS behaviour, eg: following instructions on our current 'how to build on macos' wiki page: $ brew ln gnu-getopt --force Warning: Refusing to link macOS-provided software: gnu-getopt If you need to have gnu-getopt first in your PATH run: echo 'export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"' >> ~/.zshrc A better option for macos is to link getopt as 'gnugetopt' in /usr/local/bin, thus the build system will find 'gnugetopt' but other applications looking for just 'getopt' will find the original macos binary. Ultimately it makes sense that 'GNU' dependencies are placed in /usr/local/bin and /usr/local/bin is included in the user's PATH. Signed-off-by: Kevin Darbyshire-Bryant --- include/prereq-build.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 6fec4c1a4a..19904853f1 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -125,7 +125,6 @@ $(eval $(call SetupHostCommand,grep,Please install GNU 'grep', \ $(eval $(call SetupHostCommand,getopt, \ Please install an extended getopt version that supports --long, \ gnugetopt -o t --long test -- --test | grep '^ *--test *--', \ - /usr/local/bin/getopt -o t --long test -- --test | grep '^ *--test *--', \ getopt -o t --long test -- --test | grep '^ *--test *--')) $(eval $(call SetupHostCommand,stat,Cannot find a file stat utility, \ From ee92838dd2a777c94d70bb08a4cc983214367b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 2 Mar 2020 12:11:58 +0100 Subject: [PATCH 3/4] kernel: iio: fix st-accel dependencies properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing register map access SPI/I2C modules. Signed-off-by: Petr Štetiar --- package/kernel/linux/modules/iio.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index 0d30321d70..986838c0ae 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -303,7 +303,7 @@ $(eval $(call KernelPackage,iio-st_accel)) define KernelPackage/iio-st_sensors-i2c SUBMENU:=$(IIO_MENU) TITLE:=STMicroelectronics accelerometer 3-Axis Driver (I2C) - DEPENDS:=+kmod-iio-st_accel +kmod-i2c-core + DEPENDS:=+kmod-iio-st_accel +kmod-i2c-core +kmod-regmap-i2c KCONFIG:= CONFIG_IIO_ST_ACCEL_I2C_3AXIS FILES:=$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_i2c.ko AUTOLOAD:=$(call AutoLoad,56,st_sensors_i2c) @@ -319,7 +319,7 @@ $(eval $(call KernelPackage,iio-st_sensors-i2c)) define KernelPackage/iio-st_sensors-spi SUBMENU:=$(IIO_MENU) TITLE:=STMicroelectronics accelerometer 3-Axis Driver (SPI) - DEPENDS:=+kmod-iio-st_accel + DEPENDS:=+kmod-iio-st_accel +kmod-regmap-spi KCONFIG:= CONFIG_IIO_ST_ACCEL_SPI_3AXIS FILES:=$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_spi.ko AUTOLOAD:=$(call AutoLoad,56,st_sensors_spi) From 0493d57e04774d47921a7d2014b567455d5dc16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 2 Mar 2020 22:03:09 +0100 Subject: [PATCH 4/4] bcm53xx: fix ASUS firmwares to use vendor format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Image building process was missing "asus-trx" step which resulted in raw TRX files (without ASUS footer with device id). Fixes: 0b9de8daa70e ("bcm53xx: add profiles for all other (SoftMAC) devices") Signed-off-by: Rafał Miłecki --- target/linux/bcm53xx/image/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index f438fd1208..610af03abe 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -79,7 +79,7 @@ endef define Build/asus-trx $(STAGING_DIR_HOST)/bin/asustrx \ - -p $(PRODUCTID) -i $@ -o $@.new + -p $(ASUS_PRODUCTID) -i $@ -o $@.new mv $@.new $@ endef @@ -107,8 +107,10 @@ define Build/seama-nand -i $@.entity endef -DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD +DEVICE_VARS += ASUS_PRODUCTID DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR +DEVICE_VARS += SIGNATURE +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD DEVICE_VARS += LUXUL_BOARD IEEE8021X := wpad-basic @@ -138,35 +140,40 @@ define Device/Default endef define Device/asus + DEVICE_VENDOR := ASUS IMAGES := trx IMAGE/trx := append-ubi | trx-nand | asus-trx endef define Device/asus-rt-ac56u - DEVICE_VENDOR := ASUS + $(call Device/asus) DEVICE_MODEL := RT-AC56U DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-AC56U endef TARGET_DEVICES += asus-rt-ac56u define Device/asus-rt-ac68u - DEVICE_VENDOR := ASUS + $(call Device/asus) DEVICE_MODEL := RT-AC68U DEVICE_PACKAGES := $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-AC68U endef TARGET_DEVICES += asus-rt-ac68u define Device/asus-rt-ac87u - DEVICE_VENDOR := ASUS + $(call Device/asus) DEVICE_MODEL := RT-AC87U DEVICE_PACKAGES := $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-AC87U endef TARGET_DEVICES += asus-rt-ac87u define Device/asus-rt-n18u - DEVICE_VENDOR := ASUS + $(call Device/asus) DEVICE_MODEL := RT-N18U DEVICE_PACKAGES := $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-N18U endef TARGET_DEVICES += asus-rt-n18u