diff --git a/include/trusted-firmware-a.mk b/include/trusted-firmware-a.mk index b89014b249..ec3e4f4e6b 100644 --- a/include/trusted-firmware-a.mk +++ b/include/trusted-firmware-a.mk @@ -73,6 +73,7 @@ define Build/Compile/Trusted-Firmware-A CROSS_COMPILE=$(TARGET_CROSS) \ OPENSSL_DIR=$(STAGING_DIR_HOST) \ PLAT=$(PLAT) \ + BUILD_STRING="OpenWRT v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \ $(TFA_MAKE_FLAGS) endef diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 5cfe08a2f8..3b0ba65a33 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -36,6 +36,7 @@ boot() { ln -sf /tmp/resolv.conf.d/resolv.conf.auto /tmp/resolv.conf grep -q debugfs /proc/filesystems && /bin/mount -o noatime -t debugfs debugfs /sys/kernel/debug grep -q bpf /proc/filesystems && /bin/mount -o nosuid,nodev,noexec,noatime,mode=0700 -t bpf bpffs /sys/fs/bpf + grep -q pstore /proc/filesystems && /bin/mount -o noatime -t pstore pstore /sys/fs/pstore [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe /sbin/kmodloader diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 1f84b8eb19..c4669edb52 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2.3 +PKG_VERSION:=2.4 PKG_RELEASE:=1 -PKG_HASH:=37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21 +PKG_HASH:=bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b PKG_MAINTAINER:=Vladimir Vid @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk define Trusted-Firmware-A/Default BUILD_TARGET:=mvebu BUILD_SUBTARGET:=cortexa53 - TFA_IMAGE:=flash-image.bin uart-images.tgz + TFA_IMAGE:=flash-image.bin uart-images.tgz.bin UBOOT:= DDR_TOPOLOGY:= CLOCKSPRESET:= @@ -32,7 +32,7 @@ define Trusted-Firmware-A/espressobin-512mb BUILD_DEVICES:=globalscale_espressobin UBOOT:=espressobin DDR_TOPOLOGY:=0 - CLOCKSPRESET:=CPU_800_DDR_800 + CLOCKSPRESET:=CPU_1000_DDR_800 PLAT:=a3700 endef @@ -42,17 +42,7 @@ define Trusted-Firmware-A/espressobin-v3-v5-1gb-1cs BUILD_DEVICES:=globalscale_espressobin UBOOT:=espressobin DDR_TOPOLOGY:=4 - CLOCKSPRESET:=CPU_800_DDR_800 - PLAT:=a3700 -endef - -define Trusted-Firmware-A/espressobin-v3-v5-1gb-1cs-emmc - NAME:=Marvell ESPRESSObin V3-V5 (1GB 1CS, eMMC) - DEPENDS:=+u-boot-espressobin-emmc - BUILD_DEVICES:=globalscale_espressobin-emmc - UBOOT:=espressobin-emmc - DDR_TOPOLOGY:=4 - CLOCKSPRESET:=CPU_800_DDR_800 + CLOCKSPRESET:=CPU_1000_DDR_800 PLAT:=a3700 endef @@ -62,17 +52,7 @@ define Trusted-Firmware-A/espressobin-v3-v5-1gb-2cs BUILD_DEVICES:=globalscale_espressobin UBOOT:=espressobin DDR_TOPOLOGY:=2 - CLOCKSPRESET:=CPU_800_DDR_800 - PLAT:=a3700 -endef - -define Trusted-Firmware-A/espressobin-v3-v5-1gb-2cs-emmc - NAME:=Marvell ESPRESSObin V3-V5 (1GB 2CS, eMMC) - DEPENDS:=+u-boot-espressobin-emmc - BUILD_DEVICES:=globalscale_espressobin-emmc - UBOOT:=espressobin-emmc - DDR_TOPOLOGY:=2 - CLOCKSPRESET:=CPU_800_DDR_800 + CLOCKSPRESET:=CPU_1000_DDR_800 PLAT:=a3700 endef @@ -82,17 +62,7 @@ define Trusted-Firmware-A/espressobin-v3-v5-2gb BUILD_DEVICES:=globalscale_espressobin UBOOT:=espressobin DDR_TOPOLOGY:=7 - CLOCKSPRESET:=CPU_800_DDR_800 - PLAT:=a3700 -endef - -define Trusted-Firmware-A/espressobin-v3-v5-2gb-emmc - NAME:=Marvell ESPRESSObin V3-V5 (2GB, eMMC) - DEPENDS:=+u-boot-espressobin-emmc - BUILD_DEVICES:=globalscale_espressobin-emmc - UBOOT:=espressobin-emmc - DDR_TOPOLOGY:=7 - CLOCKSPRESET:=CPU_800_DDR_800 + CLOCKSPRESET:=CPU_1000_DDR_800 PLAT:=a3700 endef @@ -102,17 +72,7 @@ define Trusted-Firmware-A/espressobin-v7-1gb BUILD_DEVICES:=globalscale_espressobin-v7 UBOOT:=espressobin DDR_TOPOLOGY:=5 - CLOCKSPRESET:=CPU_800_DDR_800 - PLAT:=a3700 -endef - -define Trusted-Firmware-A/espressobin-v7-1gb-emmc - NAME:=Marvell ESPRESSObin V7 (1GB, eMMC) - DEPENDS:=+u-boot-espressobin - BUILD_DEVICES:=globalscale_espressobin-v7-emmc - UBOOT:=espressobin-emmc - DDR_TOPOLOGY:=5 - CLOCKSPRESET:=CPU_800_DDR_800 + CLOCKSPRESET:=CPU_1000_DDR_800 PLAT:=a3700 endef @@ -122,17 +82,7 @@ define Trusted-Firmware-A/espressobin-v7-2gb BUILD_DEVICES:=globalscale_espressobin-v7 UBOOT:=espressobin DDR_TOPOLOGY:=6 - CLOCKSPRESET:=CPU_800_DDR_800 - PLAT:=a3700 -endef - -define Trusted-Firmware-A/espressobin-v7-2gb-emmc - NAME:=Marvell ESPRESSObin V7 (2GB, eMMC) - DEPENDS:=+u-boot-espressobin - BUILD_DEVICES:=globalscale_espressobin-v7-emmc - UBOOT:=espressobin-emmc - DDR_TOPOLOGY:=6 - CLOCKSPRESET:=CPU_800_DDR_800 + CLOCKSPRESET:=CPU_1000_DDR_800 PLAT:=a3700 endef @@ -150,15 +100,10 @@ endef TFA_TARGETS:= \ espressobin-512mb \ espressobin-v3-v5-1gb-1cs \ - espressobin-v3-v5-1gb-1cs-emmc \ espressobin-v3-v5-1gb-2cs \ - espressobin-v3-v5-1gb-2cs-emmc \ espressobin-v3-v5-2gb \ - espressobin-v3-v5-2gb-emmc \ espressobin-v7-1gb \ - espressobin-v7-1gb-emmc \ espressobin-v7-2gb \ - espressobin-v7-2gb-emmc \ udpu TFA_MAKE_FLAGS += \ @@ -168,32 +113,34 @@ TFA_MAKE_FLAGS += \ WTP=$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \ DDR_TOPOLOGY=$(DDR_TOPOLOGY) \ CLOCKSPRESET=$(CLOCKSPRESET) \ + A3700_UTILS_COMMIT_ID=$(A3700_UTILS_RELEASE) \ + MV_DDR_COMMIT_ID=$(MV_DDR_RELEASE) \ all \ - fip + mrvl_flash A3700_UTILS_NAME:=a3700-utils -A3700_UTILS_RELEASE:=09679790 +A3700_UTILS_RELEASE:=5598e150 A3700_UTILS_SOURCE=$(A3700_UTILS_NAME)-$(A3700_UTILS_RELEASE).tar.bz2 define Download/a3700-utils FILE:=$(A3700_UTILS_SOURCE) PROTO:=git URL:=https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git - VERSION:=096797908ddd69a679fd55595c41fc02809829a9 - MIRROR_HASH:=9276d63d41b2e221c2fd5cceee988ca26eff5005747787f084868b3940173b7a + VERSION:=5598e150fa3a1568256c30223fd2b214d729f26a + MIRROR_HASH:=4c3a3bed97833d08af4e42995c0c5af6c107f990fd492cd90aa3e79134d2751e SUBDIR:=$(A3700_UTILS_NAME) endef MV_DDR_NAME:=mv-ddr-marvell -MV_DDR_RELEASE:=mainline +MV_DDR_RELEASE:=6fb99002 MV_DDR_SOURCE:=$(MV_DDR_NAME)-$(MV_DDR_RELEASE).tar.bz2 define Download/mv-ddr-marvell FILE:=$(MV_DDR_SOURCE) PROTO:=git URL:=https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git - VERSION:=a881467ef0f0185e6570dd0483023fde93cbb5f5 - MIRROR_HASH:=19f34817616c583b2b5f2612705857cf2120f6c2132355217899b1403c3fd336 + VERSION:=6fb99002be5dec9c7f5375b074f53148dbc0739c + MIRROR_HASH:=6836e5ea47618a7ee2f96a1a6bd8218f003789b877e521fdfcb008f2f6475dd6 SUBDIR:=$(MV_DDR_NAME) endef @@ -218,7 +165,9 @@ define Build/Prepare mkdir -p $(STAGING_DIR_IMAGE) $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(A3700_UTILS_SOURCE) + $(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME),./patches-a3700-utils) $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(MV_DDR_SOURCE) + $(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME),./patches-mv-ddr-marvell) $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(LINARO_SOURCE) endef diff --git a/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch new file mode 100644 index 0000000000..745e615074 --- /dev/null +++ b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch @@ -0,0 +1,13 @@ +diff --git a/wtmi/sys_init/Makefile b/wtmi/sys_init/Makefile +--- a/wtmi/sys_init/Makefile ++++ b/wtmi/sys_init/Makefile +@@ -51,7 +51,8 @@ ECHO = @echo + SED = @sed + + LOCAL_VERSION_STRING ?= -armada +-BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h") ++A3700_UTILS_COMMIT_ID ?= $(shell git log -n 1 --pretty=format:"%h") ++BUILD_STRING := $(A3700_UTILS_COMMIT_ID) + VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING) + + CPUOPTS = -mthumb -mcpu=cortex-m3 -mlittle-endian diff --git a/package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch b/package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch new file mode 100644 index 0000000000..1c7c61d43c --- /dev/null +++ b/package/boot/arm-trusted-firmware-mvebu/patches-mv-ddr-marvell/001-version.patch @@ -0,0 +1,12 @@ +diff --git a/scripts/localversion.sh b/scripts/localversion.sh +--- a/scripts/localversion.sh ++++ b/scripts/localversion.sh +@@ -103,7 +103,7 @@ MV_DDR_ROOT=$1 + MV_DDR_VER_CSRC=$2 + + # get mv_ddr git commit id +-MV_DDR_COMMIT_ID=`git -C $MV_DDR_ROOT rev-parse --verify --quiet --short HEAD 2> /dev/null` ++test -z "$MV_DDR_COMMIT_ID" && MV_DDR_COMMIT_ID=`git -C $MV_DDR_ROOT rev-parse --verify --quiet --short HEAD 2> /dev/null` + + # check for uncommitted changes in mv_ddr git + MV_DDR_DIRTY_CHK=`git -C $MV_DDR_ROOT diff-index --name-only HEAD 2> /dev/null` diff --git a/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch b/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch index fc1a24a8ff..ad4e1e9f71 100644 --- a/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch +++ b/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch @@ -1,6 +1,6 @@ --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile -@@ -19,7 +19,7 @@ ifeq (${DEBUG},1) +@@ -20,7 +20,7 @@ ifeq (${DEBUG},1) else HOSTCCFLAGS += -O2 endif @@ -9,7 +9,7 @@ ifeq (${V},0) Q := @ -@@ -27,7 +27,7 @@ else +@@ -28,7 +28,7 @@ else Q := endif diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile index 25dd2526e5..37e93d1f51 100644 --- a/package/boot/uboot-mvebu/Makefile +++ b/package/boot/uboot-mvebu/Makefile @@ -8,10 +8,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2020.10 +PKG_VERSION:=2021.01 PKG_RELEASE:=1 -PKG_HASH:=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 +PKG_HASH:=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk @@ -42,13 +42,6 @@ define U-Boot/espressobin UBOOT_CONFIG:=mvebu_espressobin-88f3720 endef -define U-Boot/espressobin-emmc - NAME:=Marvell ESPRESSObin - BUILD_SUBTARGET:=cortexa53 - UBOOT_CONFIG:=mvebu_espressobin-88f3720 - UBOOT_MAKE_FLAGS+=DEVICE_TREE=armada-3720-espressobin-emmc -endef - define U-Boot/uDPU NAME:=Methode uDPU BUILD_SUBTARGET:=cortexa53 @@ -58,7 +51,6 @@ UBOOT_TARGETS:= \ clearfog \ helios4 \ espressobin \ - espressobin-emmc \ uDPU Build/Exports:=$(Host/Exports) diff --git a/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch b/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch deleted file mode 100644 index 85c61098f8..0000000000 --- a/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch +++ /dev/null @@ -1,64 +0,0 @@ -From cdcfd9211c805624a702b6ff81b9bd9515344749 Mon Sep 17 00:00:00 2001 -From: Andre Heider -Date: Fri, 4 Sep 2020 16:34:22 +0200 -Subject: [PATCH] arm64: dts: armada-3720-espressobin: use Linux - model/compatible strings - -Fix the actual board vendor and ease synching dts files from Linux. - -Signed-off-by: Andre Heider ---- - arch/arm/dts/armada-3720-espressobin.dts | 4 ++-- - board/Marvell/mvebu_armada-37xx/board.c | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- a/arch/arm/dts/armada-3720-espressobin.dts -+++ b/arch/arm/dts/armada-3720-espressobin.dts -@@ -50,8 +50,8 @@ - #include "armada-372x.dtsi" - - / { -- model = "Marvell Armada 3720 Community Board ESPRESSOBin"; -- compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710"; -+ model = "Globalscale Marvell ESPRESSOBin Board"; -+ compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710"; - - chosen { - stdout-path = "serial0:115200n8"; ---- a/board/Marvell/mvebu_armada-37xx/board.c -+++ b/board/Marvell/mvebu_armada-37xx/board.c -@@ -88,14 +88,14 @@ int board_late_init(void) - if (env_get("fdtfile")) - return 0; - -- if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) -+ if (!of_machine_is_compatible("globalscale,espressobin")) - return 0; - - /* If the memory controller has been configured for DDR4, we're running on v7 */ - ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS) - & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4; - -- emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc"); -+ emmc = of_machine_is_compatible("globalscale,espressobin-emmc"); - - if (ddr4 && emmc) - env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb"); -@@ -248,7 +248,7 @@ static int mii_multi_chip_mode_write(str - /* Bring-up board-specific network stuff */ - int board_network_enable(struct mii_dev *bus) - { -- if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) -+ if (!of_machine_is_compatible("globalscale,espressobin")) - return 0; - - /* -@@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd - int part_off; - - /* Fill SPI MTD partitions for Linux kernel on Espressobin */ -- if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) -+ if (!of_machine_is_compatible("globalscale,espressobin")) - return 0; - - spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor"); diff --git a/package/boot/uboot-mvebu/patches/132-arm64-dts-armada-3720-espressobin-split-common-parts.patch b/package/boot/uboot-mvebu/patches/132-arm64-dts-armada-3720-espressobin-split-common-parts.patch deleted file mode 100644 index 1ca8b8d8dc..0000000000 --- a/package/boot/uboot-mvebu/patches/132-arm64-dts-armada-3720-espressobin-split-common-parts.patch +++ /dev/null @@ -1,368 +0,0 @@ -From a9ac1dd46a4fd11880be80227e1eb102e3c61dd8 Mon Sep 17 00:00:00 2001 -From: Andre Heider -Date: Fri, 4 Sep 2020 15:38:58 +0200 -Subject: [PATCH] arm64: dts: armada-3720-espressobin: split common parts - to .dtsi - -Move most of the dts to the new common armada-3720-espressobin.dtsi -file, just like Linux, but keep the current, downstream based, version. - -The dts itself is imported from Linux. - -Signed-off-by: Andre Heider ---- - arch/arm/dts/armada-3720-espressobin.dts | 164 +-------------------- - arch/arm/dts/armada-3720-espressobin.dtsi | 167 ++++++++++++++++++++++ - 2 files changed, 174 insertions(+), 157 deletions(-) - create mode 100644 arch/arm/dts/armada-3720-espressobin.dtsi - ---- a/arch/arm/dts/armada-3720-espressobin.dts -+++ b/arch/arm/dts/armada-3720-espressobin.dts -@@ -1,170 +1,20 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) - /* -- * Device Tree file for Marvell Armada 3720 community board -- * (ESPRESSOBin) -+ * Device Tree file for Globalscale Marvell ESPRESSOBin Board - * Copyright (C) 2016 Marvell - * -- * Gregory CLEMENT -- * Konstantin Porotchkin -+ * Romain Perier - * -- * This file is dual-licensed: you can use it either under the terms -- * of the GPL or the X11 license, at your option. Note that this dual -- * licensing only applies to this file, and not this project as a -- * whole. -- * -- * a) This file is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of the -- * License, or (at your option) any later version. -- * -- * This file is distributed in the hope that it will be useful -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * Or, alternatively -- * -- * b) Permission is hereby granted, free of charge, to any person -- * obtaining a copy of this software and associated documentation -- * files (the "Software"), to deal in the Software without -- * restriction, including without limitation the rights to use -- * copy, modify, merge, publish, distribute, sublicense, and/or -- * sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following -- * conditions: -- * -- * The above copyright notice and this permission notice shall be -- * included in all copies or substantial portions of the Software. -- * -- * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+/* -+ * Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf - */ - - /dts-v1/; - --#include "armada-372x.dtsi" -+#include "armada-3720-espressobin.dtsi" - - / { - model = "Globalscale Marvell ESPRESSOBin Board"; - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710"; -- -- chosen { -- stdout-path = "serial0:115200n8"; -- }; -- -- aliases { -- ethernet0 = ð0; -- i2c0 = &i2c0; -- spi0 = &spi0; -- }; -- -- memory { -- device_type = "memory"; -- reg = <0x00000000 0x00000000 0x00000000 0x20000000>; -- }; -- -- vcc_sd_reg0: regulator@0 { -- compatible = "regulator-gpio"; -- regulator-name = "vcc_sd0"; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <3300000>; -- regulator-type = "voltage"; -- states = <1800000 0x1 -- 3300000 0x0>; -- gpios = <&gpionb 4 GPIO_ACTIVE_HIGH>; -- }; --}; -- --&comphy { -- max-lanes = <3>; -- phy0 { -- phy-type = ; -- phy-speed = ; -- }; -- -- phy1 { -- phy-type = ; -- phy-speed = ; -- }; -- -- phy2 { -- phy-type = ; -- phy-speed = ; -- }; --}; -- --ð0 { -- status = "okay"; -- pinctrl-names = "default"; -- pinctrl-0 = <&rgmii_pins>, <&smi_pins>; -- phy-mode = "rgmii"; -- phy_addr = <0x1>; -- fixed-link { -- speed = <1000>; -- full-duplex; -- }; --}; -- --&i2c0 { -- pinctrl-names = "default"; -- pinctrl-0 = <&i2c1_pins>; -- status = "okay"; --}; -- --/* CON3 */ --&sata { -- status = "okay"; --}; -- --&sdhci0 { -- pinctrl-names = "default"; -- pinctrl-0 = <&sdio_pins>; -- bus-width = <4>; -- cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>; -- vqmmc-supply = <&vcc_sd_reg0>; -- status = "okay"; --}; -- --&spi0 { -- status = "okay"; -- pinctrl-names = "default"; -- pinctrl-0 = <&spi_quad_pins>; -- -- spi-flash@0 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "st,m25p128", "jedec,spi-nor"; -- reg = <0>; /* Chip select 0 */ -- spi-max-frequency = <50000000>; -- m25p,fast-read; -- }; --}; -- --/* Exported on the micro USB connector CON32 through an FTDI */ --&uart0 { -- pinctrl-names = "default"; -- pinctrl-0 = <&uart1_pins>; -- status = "okay"; --}; -- --/* CON29 */ --&usb2 { -- status = "okay"; --}; -- --/* CON31 */ --&usb3 { -- status = "okay"; --}; -- --&pcie0 { -- pinctrl-names = "default"; -- pinctrl-0 = <&pcie_pins>; -- reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; -- status = "okay"; - }; ---- /dev/null -+++ b/arch/arm/dts/armada-3720-espressobin.dtsi -@@ -0,0 +1,167 @@ -+/* -+ * Device Tree file for Marvell Armada 3720 community board -+ * (ESPRESSOBin) -+ * Copyright (C) 2016 Marvell -+ * -+ * Gregory CLEMENT -+ * Konstantin Porotchkin -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "armada-372x.dtsi" -+ -+/ { -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ aliases { -+ ethernet0 = ð0; -+ i2c0 = &i2c0; -+ spi0 = &spi0; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x00000000 0x00000000 0x20000000>; -+ }; -+ -+ vcc_sd_reg0: regulator@0 { -+ compatible = "regulator-gpio"; -+ regulator-name = "vcc_sd0"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-type = "voltage"; -+ states = <1800000 0x1 -+ 3300000 0x0>; -+ gpios = <&gpionb 4 GPIO_ACTIVE_HIGH>; -+ }; -+}; -+ -+&comphy { -+ max-lanes = <3>; -+ phy0 { -+ phy-type = ; -+ phy-speed = ; -+ }; -+ -+ phy1 { -+ phy-type = ; -+ phy-speed = ; -+ }; -+ -+ phy2 { -+ phy-type = ; -+ phy-speed = ; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&rgmii_pins>, <&smi_pins>; -+ phy-mode = "rgmii"; -+ phy_addr = <0x1>; -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+}; -+ -+&i2c0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins>; -+ status = "okay"; -+}; -+ -+/* CON3 */ -+&sata { -+ status = "okay"; -+}; -+ -+&sdhci0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdio_pins>; -+ bus-width = <4>; -+ cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>; -+ vqmmc-supply = <&vcc_sd_reg0>; -+ status = "okay"; -+}; -+ -+&spi0 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi_quad_pins>; -+ -+ spi-flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "st,m25p128", "jedec,spi-nor"; -+ reg = <0>; /* Chip select 0 */ -+ spi-max-frequency = <50000000>; -+ m25p,fast-read; -+ }; -+}; -+ -+/* Exported on the micro USB connector CON32 through an FTDI */ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins>; -+ status = "okay"; -+}; -+ -+/* CON29 */ -+&usb2 { -+ status = "okay"; -+}; -+ -+/* CON31 */ -+&usb3 { -+ status = "okay"; -+}; -+ -+&pcie0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pcie_pins>; -+ reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; -+ status = "okay"; -+}; diff --git a/package/boot/uboot-mvebu/patches/133-arm64-dts-a3720-add-support-for-boards-with-populate.patch b/package/boot/uboot-mvebu/patches/133-arm64-dts-a3720-add-support-for-boards-with-populate.patch deleted file mode 100644 index 1e2944b5a2..0000000000 --- a/package/boot/uboot-mvebu/patches/133-arm64-dts-a3720-add-support-for-boards-with-populate.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 408bba2fb84ad0b02c3f9529065126b40899e256 Mon Sep 17 00:00:00 2001 -From: Andre Heider -Date: Fri, 4 Sep 2020 15:44:41 +0200 -Subject: [PATCH] arm64: dts: a3720: add support for espressobin with - populated emmc - -Import armada-3720-espressobin-emmc.dts from Linux, but use sdhc1 for -emmc, since our dtsi is still based on downstream and sdhc0 is used for -the sd card. - -Signed-off-by: Andre Heider ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/armada-3720-espressobin-emmc.dts | 44 +++++++++++++++++++ - doc/README.marvell | 7 ++- - 3 files changed, 50 insertions(+), 2 deletions(-) - create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts - ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harm - dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-3720-db.dtb \ - armada-3720-espressobin.dtb \ -+ armada-3720-espressobin-emmc.dtb \ - armada-3720-turris-mox.dtb \ - armada-3720-uDPU.dtb \ - armada-375-db.dtb \ ---- /dev/null -+++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts -@@ -0,0 +1,44 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Device Tree file for Globalscale Marvell ESPRESSOBin Board with eMMC -+ * Copyright (C) 2018 Marvell -+ * -+ * Romain Perier -+ * Konstantin Porotchkin -+ * -+ */ -+/* -+ * Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf -+ */ -+ -+/dts-v1/; -+ -+#include "armada-3720-espressobin.dtsi" -+ -+/ { -+ model = "Globalscale Marvell ESPRESSOBin Board (eMMC)"; -+ compatible = "globalscale,espressobin-emmc", "globalscale,espressobin", -+ "marvell,armada3720", "marvell,armada3710"; -+}; -+ -+/* U11 */ -+&sdhci1 { -+ non-removable; -+ bus-width = <8>; -+ mmc-ddr-1_8v; -+ mmc-hs400-1_8v; -+ marvell,xenon-emmc; -+ marvell,xenon-tun-count = <9>; -+ marvell,pad-type = "fixed-1-8v"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc_pins>; -+ status = "okay"; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ mmccard: mmccard@0 { -+ compatible = "mmc-card"; -+ reg = <0>; -+ }; -+}; ---- a/doc/README.marvell -+++ b/doc/README.marvell -@@ -43,8 +43,11 @@ Build Procedure - In order to prevent this, the required device-tree MUST be set during compilation. - All device-tree files are located in ./arch/arm/dts/ folder. - -- For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with -- just default device-tree from defconfig using: -+ For the EspressoBin board with populated eMMC device use -+ # make DEVICE_TREE=armada-3720-espressobin-emmc -+ -+ For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board) -+ compile u-boot with just default device-tree from defconfig using: - - # make - diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index 9ea28735a1..a95d429311 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=5.9 +PKG_VERSION:=5.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) -PKG_HASH:=39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9 +PKG_HASH:=fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=LGPL-2.1-or-later diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile index d5b51e91d6..516bd94386 100644 --- a/package/kernel/ath10k-ct/Makefile +++ b/package/kernel/ath10k-ct/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-12-24 -PKG_SOURCE_VERSION:=b753e8bf22b94297acbaa370b4cb0be87e3da4b8 -PKG_MIRROR_HASH:=e026296208e0c20fd0775704c2167da5a447aef4080cedc5fba0797f0e180d8d +PKG_SOURCE_DATE:=2021-01-11 +PKG_SOURCE_VERSION:=9fe1df7d4f783b6b0cd1c99d11979e5a6e6fc40b +PKG_MIRROR_HASH:=4e30e256716611045e930b95eadaa8bfcadd5bdd8bbe3869cfe0f377920e812b # Build the 5.8 ath10k-ct driver version. # Probably this should match as closely as diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 584029e6fe..fe3e526ef1 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git -PKG_SOURCE_DATE:=2021-01-03 -PKG_SOURCE_VERSION:=3bda90079ec5574ef469e2a7804808302f17769d -PKG_MIRROR_HASH:=61ce5cb49e911f7a279d4825002858a39e3f6dc0e22670c240d1992741f7b56f +PKG_SOURCE_DATE:=2021-01-06 +PKG_SOURCE_VERSION:=8d8a8cd35137ff0fa11b6be455fdd596a8d7d2e9 +PKG_MIRROR_HASH:=7149b4a434a35c1e64b20c708c0abbd381e034a2a1b4fbc1b7da0b039568b5b5 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index ca3756b34d..2b5f96b206 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates -PKG_VERSION:=20200601 +PKG_VERSION:=20210119 PKG_RELEASE:=1 PKG_MAINTAINER:= PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates -PKG_HASH:=43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63 +PKG_HASH:=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/system/selinux-policy/Makefile b/package/system/selinux-policy/Makefile index dad57e16b8..491b26a83e 100644 --- a/package/system/selinux-policy/Makefile +++ b/package/system/selinux-policy/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=selinux-policy PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git -PKG_VERSION:=0.4 -PKG_MIRROR_HASH:=6bf4df7df2e1a4f641e4068ec79b1f4921e29e531d5b76843f39c79470e646f8 +PKG_VERSION:=0.5 +PKG_MIRROR_HASH:=c96a8cf7ac3445c52a28150c5000a55bde8112402bc77ccfee825cff0bdc8a03 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 31a66493e9..f4b870cc47 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.36.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36 @@ -534,10 +534,20 @@ TARGET_CFLAGS += $(FPIC) -std=gnu99 define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/blkid.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/blkid.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/blkid.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fdisk.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/fdisk.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/fdisk.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mount.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/mount.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/mount.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/smartcols.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/smartcols.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/smartcols.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/uuid.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/uuid.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/uuid.pc $(INSTALL_DIR) $(1)/usr/include/blkid $(CP) $(PKG_INSTALL_DIR)/usr/include/blkid/blkid.h $(1)/usr/include/blkid diff --git a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch deleted file mode 100644 index 4797f7d159..0000000000 --- a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/libuuid/Makemodule.am -+++ b/libuuid/Makemodule.am -@@ -4,7 +4,6 @@ include libuuid/man/Makemodule.am - include libuuid/src/Makemodule.am - - pkgconfig_DATA += libuuid/uuid.pc --PATHFILES += libuuid/uuid.pc - EXTRA_DIST += libuuid/COPYING - - endif # BUILD_LIBUUID ---- a/configure.ac -+++ b/configure.ac -@@ -2522,18 +2522,23 @@ AC_CONFIG_HEADERS([config.h]) - # - AC_CONFIG_FILES([ - Makefile -+libblkid/blkid.pc - libblkid/docs/Makefile - libblkid/docs/version.xml - libblkid/src/blkid.h -+libfdisk/fdisk.pc - libfdisk/docs/Makefile - libfdisk/docs/version.xml - libfdisk/src/libfdisk.h -+libmount/mount.pc - libmount/docs/Makefile - libmount/docs/version.xml - libmount/src/libmount.h -+libsmartcols/smartcols.pc - libsmartcols/docs/Makefile - libsmartcols/docs/version.xml - libsmartcols/src/libsmartcols.h -+libuuid/uuid.pc - po/Makefile.in - ]) - ---- a/libblkid/Makemodule.am -+++ b/libblkid/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libblkid/docs - endif - - pkgconfig_DATA += libblkid/blkid.pc --PATHFILES += libblkid/blkid.pc - dist_man_MANS += libblkid/libblkid.3 - EXTRA_DIST += libblkid/COPYING - ---- a/libmount/Makemodule.am -+++ b/libmount/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libmount/docs - endif - - pkgconfig_DATA += libmount/mount.pc --PATHFILES += libmount/mount.pc - EXTRA_DIST += libmount/COPYING - - endif # BUILD_LIBMOUNT ---- a/libsmartcols/Makemodule.am -+++ b/libsmartcols/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libsmartcols/docs - endif - - pkgconfig_DATA += libsmartcols/smartcols.pc --PATHFILES += libsmartcols/smartcols.pc - EXTRA_DIST += libsmartcols/COPYING - - endif # BUILD_LIBSMARTCOLS ---- a/libfdisk/Makemodule.am -+++ b/libfdisk/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libfdisk/docs - endif - - pkgconfig_DATA += libfdisk/fdisk.pc --PATHFILES += libfdisk/fdisk.pc - EXTRA_DIST += libfdisk/COPYING - - endif # BUILD_LIBFDISK diff --git a/rules.mk b/rules.mk index b1b69eabf9..b658e93020 100644 --- a/rules.mk +++ b/rules.mk @@ -431,8 +431,8 @@ $(shell \ ) endef -COMMITCOUNT = $(if $(DUMP),,$(call commitcount)) -AUTORELEASE = $(if $(DUMP),,$(call commitcount,1)) +COMMITCOUNT = $(if $(DUMP),0,$(call commitcount)) +AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1)) all: FORCE: ; diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts index dee271541e..57f1acf5f1 100644 --- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts +++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts @@ -50,31 +50,30 @@ }; thermal-zones { - chassis-thermal { + hdd-thermal { polling-delay = <20000>; polling-delay-passive = <2000>; - thermal-sensors = <&hdd0_temp>, <&hdd1_temp>; - coefficients = <1 1>; + thermal-sensors = <&hdd0_temp>; /* only one drivetemp sensor is supported */ trips { - chassis_alert1: chassis-alert1 { + hdd_alert1: trip1 { temperature = <36000>; hysteresis = <2000>; type = "active"; }; - chassis_alert2: chassis-alert2 { - temperature = <46000>; + hdd_alert2: trip2 { + temperature = <44000>; hysteresis = <2000>; type = "active"; }; - chassis_alert3: chassis-alert3 { - temperature = <56000>; + hdd_alert3: trip3 { + temperature = <52000>; hysteresis = <2000>; type = "passive"; }; - chassis_crit: chassis-crit { - temperature = <66000>; + hdd_crit: trip4 { + temperature = <60000>; hysteresis = <2000>; type = "critical"; }; @@ -82,19 +81,48 @@ cooling-maps { map1 { - trip = <&chassis_alert1>; + trip = <&hdd_alert1>; cooling-device = <&system_fan THERMAL_NO_LIMIT 1>; }; map2 { - trip = <&chassis_alert2>; + trip = <&hdd_alert2>; cooling-device = <&system_fan 2 2>; }; map3 { - trip = <&chassis_alert3>; + trip = <&hdd_alert3>; cooling-device = <&system_fan 3 THERMAL_NO_LIMIT>; }; }; }; + + ethphy-thermal { + polling-delay = <20000>; + polling-delay-passive = <2000>; + + thermal-sensors = <ðphy0>; + + trips { + ethphy_alert1: trip1 { + temperature = <65000>; + hysteresis = <4000>; + type = "passive"; + }; + + ethphy_crit: trip2 { + temperature = <100000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + + cooling-maps { + map1 { + trip = <ðphy_alert1>; + cooling-device = <&system_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + }; + }; }; gpio_keys { @@ -243,6 +271,7 @@ marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED function */ <0x3 0x11 0x1 0x4401>, /* LED polarity */ <0x3 0x12 0x1 0x4905>; /* LED timer */ + #thermal-sensor-cells = <0>; }; }; diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk index ea20a25a29..968e2a38f4 100644 --- a/target/linux/mvebu/image/cortexa9.mk +++ b/target/linux/mvebu/image/cortexa9.mk @@ -32,8 +32,9 @@ define Device/cznic_turris-omnia DEVICE_VENDOR := CZ.NIC DEVICE_MODEL := Turris Omnia KERNEL_INSTALL := 1 + SOC := armada-385 KERNEL := kernel-bin - KERNEL_INITRAMFS := kernel-bin + KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ wpad-basic-wolfssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \ @@ -42,7 +43,6 @@ define Device/cznic_turris-omnia IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip IMAGE_NAME = $$(2) - SOC := armada-385 SUPPORTED_DEVICES += armada-385-turris-omnia BOOT_SCRIPT := turris-omnia endef diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 7941f6d4d9..aaeb253353 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -12,8 +12,8 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=d3cb8f6222a3cb955712b720d7c0c0dba37898f9 -PKG_MIRROR_HASH:=c3e97ad622eafaf539b733a18c0d62e9fb4c0f18d190b7bcc0e93611e582fb1e +PKG_SOURCE_VERSION:=760e1d287825fa91d4d5a0cc921340c740d803e2 +PKG_MIRROR_HASH:=3ea50e679a241faec8d0e90c9db84a19a42e03dd08328aee406a9ec56393104d PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz diff --git a/tools/Makefile b/tools/Makefile index ffc8d5e4b1..cfbc268545 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -75,6 +75,7 @@ $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile $(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/upx/compile := $(curdir)/ucl/compile $(curdir)/zlib/compile := $(curdir)/cmake/compile +$(curdir)/zstd/compile := $(curdir)/cmake/compile ifneq ($(HOST_OS),Linux) $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile @@ -84,7 +85,7 @@ endif ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) $(foreach tool, $(filter-out xz zstd patch pkgconf libressl cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile)) tools-y += ccache -$(curdir)/ccache/compile := $(curdir)/cmake/compile $(curdir)/zstd/compile +$(curdir)/ccache/compile := $(curdir)/zstd/compile endif # in case there is no patch tool on the host we need to make patch tool a diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile index 4ec910d4ba..a0106f15f2 100644 --- a/tools/zstd/Makefile +++ b/tools/zstd/Makefile @@ -1,22 +1,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zstd -PKG_VERSION:=1.4.4 +PKG_VERSION:=1.4.8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/facebook/zstd/archive/ -PKG_HASH:=a364f5162c7d1a455cc915e8e3cf5f4bd8b75d09bc0f53965b0c9ca1383c52c8 +PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION) +PKG_HASH:=32478297ca1500211008d596276f5367c54198495cf677e9439f4791a4c69f24 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:facebook:zstandard +CMAKE_SOURCE_SUBDIR:=build/cmake HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk -HOSTCC := $(HOSTCC_NOCACHE) -HOST_MAKE_FLAGS = PREFIX=$(HOST_BUILD_PREFIX) HAVE_ZLIB=0 HAVE_LZMA=0 HAVE_LZ4=0 +CMAKE_HOST_OPTIONS += \ + -DBUILD_TESTING=OFF \ + -DCMAKE_C_COMPILER_LAUNCHER="" \ + -DCMAKE_C_COMPILER=$(HOSTCC_NOCACHE) \ + -DZSTD_LEGACY_SUPPORT=OFF $(eval $(call HostBuild)) diff --git a/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch b/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch deleted file mode 100644 index 6d743aa385..0000000000 --- a/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001 -Message-Id: <06a57cf57e3c4e887cadcf688e3081154f3f6db4.1589392463.git.mschiffer@universe-factory.net> -From: Bimba Shrestha -Date: Thu, 6 Feb 2020 14:10:51 -0800 -Subject: [PATCH] [build-issue] More portable header prefix usage (#) (#1987) - -* make 4.3 build issue fix - -* Changing header name and adding comment ---- - programs/Makefile | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/programs/Makefile b/programs/Makefile -index b75314a83f43..a9ee3cb5311b 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -94,9 +94,12 @@ endif - - VOID = /dev/null - -+# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/) -+NUM_SYMBOL := \# -+ - # thread detection - NO_THREAD_MSG := ==> no threads, building without multithreading support --HAVE_PTHREAD := $(shell printf '\#include \nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) -+HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) - HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0) - ifeq ($(HAVE_THREAD), 1) - THREAD_MSG := ==> building with threading support -@@ -108,7 +111,7 @@ endif - - # zlib detection - NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support --HAVE_ZLIB := $(shell printf '\#include \nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) -+HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) - ifeq ($(HAVE_ZLIB), 1) - ZLIB_MSG := ==> building zstd with .gz compression support - ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS -@@ -119,7 +122,7 @@ endif - - # lzma detection - NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support --HAVE_LZMA := $(shell printf '\#include \nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) -+HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) - ifeq ($(HAVE_LZMA), 1) - LZMA_MSG := ==> building zstd with .xz/.lzma compression support - LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS -@@ -130,7 +133,7 @@ endif - - # lz4 detection - NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support --HAVE_LZ4 := $(shell printf '\#include \n\#include \nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) -+HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include \n\#include \nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) - ifeq ($(HAVE_LZ4), 1) - LZ4_MSG := ==> building zstd with .lz4 compression support - LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS --- -2.26.2 -