-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
meta-lxatac-bsp: linux-lxatac: upgrade to 6.8
umpf tag is now: 6.8/customers/lxa/lxatac/20240321-1 The tag includes the following topic branches: - v6.8/topic/reproducible-build - v6.7/topic/net-ksz-switch - v6.8/topic/mmc-fix - v6.8/customers/lxa/lxatac This means we got rid of two topic branches, thanks to Uwe's mainlining efforts, but gained two new topic branches: - v6.7/topic/net-ksz-switch Fixes RGMII drive strength configuration on our ethernet switch, that we need for EMI reasons. This means we were able to drop our previous hack that sets the drive strength. - v6.8/topic/mmc-fix Fixes a regression in the MMC subsystem. The linux-lxatac.bb has also changed a bit because umpf has started setting the PV variable series.inc in a way that collided with our previous definition. Signed-off-by: Leonard Göhrs <[email protected]>
- Loading branch information
Showing
28 changed files
with
697 additions
and
1,335 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
53 changes: 53 additions & 0 deletions
53
...ernel/linux/files/patches/0002-lib-build_OID_registry-Don-t-mention-the-full-path-o.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]> | ||
Date: Wed, 13 Mar 2024 22:19:56 +0100 | ||
Subject: [PATCH] lib/build_OID_registry: Don't mention the full path of the | ||
script in output | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
This change strips the full path of the script generating | ||
lib/oid_registry_data.c to just lib/build_OID_registry. The motivation | ||
for this change is Yocto emitting a build warning | ||
|
||
File /usr/src/debug/linux-lxatac/6.7-r0/lib/oid_registry_data.c in package linux-lxatac-src contains reference to TMPDIR [buildpaths] | ||
|
||
So this change brings us one step closer to make the build result | ||
reproducible independent of the build path. | ||
|
||
Forwarded: id:[email protected] (v2) | ||
Signed-off-by: Uwe Kleine-König <[email protected]> | ||
--- | ||
lib/build_OID_registry | 5 ++++- | ||
1 file changed, 4 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/lib/build_OID_registry b/lib/build_OID_registry | ||
index d7fc32ea8ac2..56d8bafeb848 100755 | ||
--- a/lib/build_OID_registry | ||
+++ b/lib/build_OID_registry | ||
@@ -8,6 +8,7 @@ | ||
# | ||
|
||
use strict; | ||
+use Cwd qw(abs_path); | ||
|
||
my @names = (); | ||
my @oids = (); | ||
@@ -17,6 +18,8 @@ if ($#ARGV != 1) { | ||
exit(2); | ||
} | ||
|
||
+my $abs_srctree = abs_path($ENV{'srctree'}); | ||
+ | ||
# | ||
# Open the file to read from | ||
# | ||
@@ -35,7 +38,7 @@ close IN_FILE || die; | ||
# | ||
open C_FILE, ">$ARGV[1]" or die; | ||
print C_FILE "/*\n"; | ||
-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n"; | ||
+print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ". Do not edit\n"; | ||
print C_FILE " */\n"; | ||
|
||
# |
50 changes: 0 additions & 50 deletions
50
...-bsp/recipes-kernel/linux/files/patches/0002-vt-conmakehash-improve-reproducibility.patch
This file was deleted.
Oops, something went wrong.
40 changes: 0 additions & 40 deletions
40
...s-kernel/linux/files/patches/0003-lib-build_OID_registry-fix-reproducibility-issues.patch
This file was deleted.
Oops, something went wrong.
63 changes: 63 additions & 0 deletions
63
...ernel/linux/files/patches/0003-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]> | ||
Date: Mon, 11 Mar 2024 12:25:09 +0100 | ||
Subject: [PATCH] tty: vt: conmakehash: Don't mention the full path of the | ||
input in output | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
This change strips $abs_srctree of the input file containing the | ||
character mapping table in the generated output. The motivation for this | ||
change is Yocto emitting a build warning | ||
|
||
WARNING: linux-lxatac-6.7-r0 do_package_qa: QA Issue: File /usr/src/debug/linux-lxatac/6.7-r0/drivers/tty/vt/consolemap_deftbl.c in package linux-lxatac-src contains reference to TMPDIR | ||
|
||
So this change brings us one step closer to make the build result | ||
reproducible independent of the build path. | ||
|
||
Forwarded: https://lore.kernel.org/lkml/[email protected] | ||
Signed-off-by: Uwe Kleine-König <[email protected]> | ||
--- | ||
drivers/tty/vt/conmakehash.c | 15 +++++++++++++-- | ||
1 file changed, 13 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c | ||
index cddd789fe46e..dc2177fec715 100644 | ||
--- a/drivers/tty/vt/conmakehash.c | ||
+++ b/drivers/tty/vt/conmakehash.c | ||
@@ -76,7 +76,8 @@ static void addpair(int fp, int un) | ||
int main(int argc, char *argv[]) | ||
{ | ||
FILE *ctbl; | ||
- char *tblname; | ||
+ const char *tblname, *rel_tblname; | ||
+ const char *abs_srctree; | ||
char buffer[65536]; | ||
int fontlen; | ||
int i, nuni, nent; | ||
@@ -101,6 +102,16 @@ int main(int argc, char *argv[]) | ||
} | ||
} | ||
|
||
+ abs_srctree = getenv("abs_srctree"); | ||
+ if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree))) | ||
+ { | ||
+ rel_tblname = tblname + strlen(abs_srctree); | ||
+ while (*rel_tblname == '/') | ||
+ ++rel_tblname; | ||
+ } | ||
+ else | ||
+ rel_tblname = tblname; | ||
+ | ||
/* For now we assume the default font is always 256 characters. */ | ||
fontlen = 256; | ||
|
||
@@ -253,7 +264,7 @@ int main(int argc, char *argv[]) | ||
#include <linux/types.h>\n\ | ||
\n\ | ||
u8 dfont_unicount[%d] = \n\ | ||
-{\n\t", argv[1], fontlen); | ||
+{\n\t", rel_tblname, fontlen); | ||
|
||
for ( i = 0 ; i < fontlen ; i++ ) | ||
{ |
56 changes: 56 additions & 0 deletions
56
...ernel/linux/files/patches/0101-net-dsa-microchip-make-sure-drive-strength-configura.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
From: Oleksij Rempel <[email protected]> | ||
Date: Mon, 4 Mar 2024 14:31:47 +0100 | ||
Subject: [PATCH] net: dsa: microchip: make sure drive strength configuration | ||
is not lost by soft reset | ||
|
||
This driver has two separate reset sequence in different places: | ||
- gpio/HW reset on start of ksz_switch_register() | ||
- SW reset on start of ksz_setup() | ||
|
||
The second one will overwrite drive strength configuration made in the | ||
ksz_switch_register(). | ||
|
||
To fix it, move ksz_parse_drive_strength() from ksz_switch_register() to | ||
ksz_setup(). | ||
|
||
Fixes: d67d7247f641 ("net: dsa: microchip: Add drive strength configuration") | ||
Signed-off-by: Oleksij Rempel <[email protected]> | ||
--- | ||
drivers/net/dsa/microchip/ksz_common.c | 10 ++++++---- | ||
1 file changed, 6 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c | ||
index 245dfb7a7a31..25a49708f484 100644 | ||
--- a/drivers/net/dsa/microchip/ksz_common.c | ||
+++ b/drivers/net/dsa/microchip/ksz_common.c | ||
@@ -2185,6 +2185,8 @@ static int ksz_pirq_setup(struct ksz_device *dev, u8 p) | ||
return ksz_irq_common_setup(dev, pirq); | ||
} | ||
|
||
+static int ksz_parse_drive_strength(struct ksz_device *dev); | ||
+ | ||
static int ksz_setup(struct dsa_switch *ds) | ||
{ | ||
struct ksz_device *dev = ds->priv; | ||
@@ -2206,6 +2208,10 @@ static int ksz_setup(struct dsa_switch *ds) | ||
return ret; | ||
} | ||
|
||
+ ret = ksz_parse_drive_strength(dev); | ||
+ if (ret) | ||
+ return ret; | ||
+ | ||
/* set broadcast storm protection 10% rate */ | ||
regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL], | ||
BROADCAST_STORM_RATE, | ||
@@ -4242,10 +4248,6 @@ int ksz_switch_register(struct ksz_device *dev) | ||
for (port_num = 0; port_num < dev->info->port_cnt; ++port_num) | ||
dev->ports[port_num].interface = PHY_INTERFACE_MODE_NA; | ||
if (dev->dev->of_node) { | ||
- ret = ksz_parse_drive_strength(dev); | ||
- if (ret) | ||
- return ret; | ||
- | ||
ret = of_get_phy_mode(dev->dev->of_node, &interface); | ||
if (ret == 0) | ||
dev->compat_interface = interface; |
Oops, something went wrong.