From 2e94284f5c781b3e0757e00467c4562a16eee578 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 3 Jul 2020 10:44:32 +0200 Subject: kernels: re-enable the tg3 driver The tg3 driver was removed because its upstream driver loads a nonfree firmware. However with linux-libre, the driver works fine without any nonfree firmware, at least on some computers like the HP NC6320. That driver is also typically enabled by Trisquel and Jason Self's linux-libre repository. This regression was introduced in linux-libre by the following commit: 32075365d upgpkg: libre/linux-libre 4.16.9_gnu-1 The following configuration: CONFIG_TIGON3=m CONFIG_TIGON3_HWMON=y is used in the following upstream kernels and configurations: - config in linux-armv7 from Arch Linux ARM - config.i686 in linux from Arch Linux 32 - config from linux from Arch Linux Signed-off-by: Denis 'GNUtoo' Carikli --- libre/linux-libre-lts/PKGBUILD | 2 +- libre/linux-libre-lts/config.armv7h | 3 ++- libre/linux-libre-lts/config.i686 | 3 ++- libre/linux-libre-lts/config.x86_64 | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'libre/linux-libre-lts') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 27def27f3..612554d3d 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -15,7 +15,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-lts pkgver=5.4.48 -pkgrel=1 +pkgrel=2 pkgdesc='LTS Linux-libre' rcnver=5.4.40 rcnrel=armv7-x27 diff --git a/libre/linux-libre-lts/config.armv7h b/libre/linux-libre-lts/config.armv7h index aaee80648..461a6c31b 100644 --- a/libre/linux-libre-lts/config.armv7h +++ b/libre/linux-libre-lts/config.armv7h @@ -2852,7 +2852,8 @@ CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_BCMGENET is not set CONFIG_BNX2=m CONFIG_CNIC=m -# CONFIG_TIGON3 is not set +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m # CONFIG_SYSTEMPORT is not set CONFIG_BNXT=m diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index b30f363d3..7d818b148 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -3044,7 +3044,8 @@ CONFIG_B44_PCI=y CONFIG_BCMGENET=m CONFIG_BNX2=m CONFIG_CNIC=m -# CONFIG_TIGON3 is not set +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_SYSTEMPORT=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 663de0fa6..84ab9d44b 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -3064,7 +3064,8 @@ CONFIG_B44_PCI=y CONFIG_BCMGENET=m CONFIG_BNX2=m CONFIG_CNIC=m -# CONFIG_TIGON3 is not set +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_SYSTEMPORT=m -- cgit v1.2.3