summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS11
-rw-r--r--arch/arm/dts/k3-am642-evm-u-boot.dtsi4
-rw-r--r--arch/arm/dts/k3-am642-r5-sk.dts2
-rw-r--r--arch/arm/dts/k3-am642-sk-u-boot.dtsi4
-rw-r--r--board/freescale/ls2080aqds/MAINTAINERS1
-rw-r--r--board/freescale/ls2080ardb/MAINTAINERS2
-rw-r--r--drivers/net/Kconfig1
-rw-r--r--net/nfs.c4
-rw-r--r--test/py/tests/test_fs/test_fs_cmd.py2
-rw-r--r--test/py/tests/test_fs/test_squashfs/sqfs_common.py9
-rw-r--r--test/py/tests/test_part.py2
-rw-r--r--test/py/u_boot_console_base.py4
12 files changed, 35 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 56be0bfad00..28e4d382386 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -169,12 +169,23 @@ ARM ASPEED
M: Ryan Chen <ryan_chen@aspeedtech.com>
M: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
R: Aspeed BMC SW team <BMC-SW@aspeedtech.com>
+R: Joel Stanley <joel@jms.id.au>
S: Maintained
F: arch/arm/mach-aspeed/
F: arch/arm/include/asm/arch-aspeed/
F: board/aspeed/
F: drivers/clk/aspeed/
+F: drivers/crypto/aspeed/
+F: drivers/gpio/gpio-aspeed.c
+F: drivers/i2c/ast_i2c.[ch]
+F: drivers/mmc/aspeed_sdhci.c
+F: drivers/net/aspeed_mdio.c
+F: drivers/net/ftgmac100.[ch]
F: drivers/pinctrl/aspeed/
+F: drivers/pwm/pwm-aspeed.c
+F: drivers/ram/aspeed/
+F: drivers/reset/reset-ast2500.c
+F: drivers/watchdog/ast_wdt.c
N: aspeed
ARM BROADCOM BCM283X / BCM27XX
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi
index 0c2d9734091..055215cff8d 100644
--- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi
+++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi
@@ -8,6 +8,10 @@
stdout-path = "serial2:115200n8";
tick-timer = &timer1;
};
+
+ memory@80000000 {
+ u-boot,dm-spl;
+ };
};
&cbass_main{
diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
index 1f96e3fcacf..cf3ba0e209c 100644
--- a/arch/arm/dts/k3-am642-r5-sk.dts
+++ b/arch/arm/dts/k3-am642-r5-sk.dts
@@ -27,7 +27,7 @@
device_type = "memory";
/* 2G RAM */
reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-
+ u-boot,dm-spl;
};
a53_0: a53@0 {
diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi
index 65042281363..dda2c5d18a7 100644
--- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi
@@ -12,6 +12,10 @@
aliases {
mmc1 = &sdhci1;
};
+
+ memory@80000000 {
+ u-boot,dm-spl;
+ };
};
&cbass_main{
diff --git a/board/freescale/ls2080aqds/MAINTAINERS b/board/freescale/ls2080aqds/MAINTAINERS
index 84735dce289..39d02ae3f46 100644
--- a/board/freescale/ls2080aqds/MAINTAINERS
+++ b/board/freescale/ls2080aqds/MAINTAINERS
@@ -1,6 +1,7 @@
LS2080A BOARD
M: Priyanka Jain <priyanka.jain@nxp.com>
M: Rajesh Bhagat <rajesh.bhagat@nxp.com>
+M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
F: board/freescale/ls2080aqds/
F: board/freescale/ls2080a/ls2080aqds.c
diff --git a/board/freescale/ls2080ardb/MAINTAINERS b/board/freescale/ls2080ardb/MAINTAINERS
index 6e25b82db5b..f49d26af3a0 100644
--- a/board/freescale/ls2080ardb/MAINTAINERS
+++ b/board/freescale/ls2080ardb/MAINTAINERS
@@ -1,5 +1,6 @@
LS2080A BOARD
M: Priyanka Jain <priyanka.jain@nxp.com>
+M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
F: board/freescale/ls2080ardb/
F: board/freescale/ls2080a/ls2080ardb.c
@@ -10,6 +11,7 @@ F: configs/ls2080ardb_nand_defconfig
LS2088A_QSPI-boot BOARD
M: Priyanka Jain <priyanka.jain@nxp.com>
M: Rajesh Bhagat <rajesh.bhagat@nxp.com>
+M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
F: configs/ls2088ardb_qspi_defconfig
F: configs/ls2088ardb_tfa_defconfig
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7fe0e00649c..84d859c21eb 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -231,6 +231,7 @@ config DWC_ETH_QOS_TEGRA186
config E1000
bool "Intel PRO/1000 Gigabit Ethernet support"
+ depends on PCI
help
This driver supports Intel(R) PRO/1000 gigabit ethernet family of
adapters. For more information on how to identify your adapter, go
diff --git a/net/nfs.c b/net/nfs.c
index 3c01cebd96f..9152ab742ef 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -52,7 +52,7 @@ static const ulong nfs_timeout = CONFIG_NFS_TIMEOUT;
static char dirfh[NFS_FHSIZE]; /* NFSv2 / NFSv3 file handle of directory */
static char filefh[NFS3_FHSIZE]; /* NFSv2 / NFSv3 file handle */
-static int filefh3_length; /* (variable) length of filefh when NFSv3 */
+static unsigned int filefh3_length; /* (variable) length of filefh when NFSv3 */
static enum net_loop_state nfs_download_state;
static struct in_addr nfs_server_ip;
@@ -573,8 +573,6 @@ static int nfs_lookup_reply(uchar *pkt, unsigned len)
filefh3_length = ntohl(rpc_pkt.u.reply.data[1]);
if (filefh3_length > NFS3_FHSIZE)
filefh3_length = NFS3_FHSIZE;
- if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + filefh3_length) > len)
- return -NFS_RPC_DROP;
memcpy(filefh, rpc_pkt.u.reply.data + 2, filefh3_length);
}
diff --git a/test/py/tests/test_fs/test_fs_cmd.py b/test/py/tests/test_fs/test_fs_cmd.py
index ba39a53159e..700cf3591de 100644
--- a/test/py/tests/test_fs/test_fs_cmd.py
+++ b/test/py/tests/test_fs/test_fs_cmd.py
@@ -6,7 +6,7 @@ import pytest
@pytest.mark.boardspec('sandbox')
@pytest.mark.buildconfigspec('cmd_fs_generic')
-def test_dm_compat(u_boot_console):
+def test_fstypes(u_boot_console):
"""Test that `fstypes` prints a result which includes `sandbox`."""
output = u_boot_console.run_command('fstypes')
assert "Supported filesystems:" in output
diff --git a/test/py/tests/test_fs/test_squashfs/sqfs_common.py b/test/py/tests/test_fs/test_squashfs/sqfs_common.py
index 8b84c2cdca8..d1621dcce3a 100644
--- a/test/py/tests/test_fs/test_squashfs/sqfs_common.py
+++ b/test/py/tests/test_fs/test_squashfs/sqfs_common.py
@@ -146,15 +146,14 @@ def get_mksquashfs_version():
out = subprocess.run(['mksquashfs -version'], shell=True, check=True,
capture_output=True, text=True)
# 'out' is: mksquashfs version X (yyyy/mm/dd) ...
- return float(out.stdout.split()[2].split('-')[0])
+ return out.stdout.split()[2].split('.')[0:2]
def check_mksquashfs_version():
""" Checks if mksquashfs meets the required version. """
- required_version = 4.4
- if get_mksquashfs_version() < required_version:
- print('Error: mksquashfs is too old.')
- print('Required version: {}'.format(required_version))
+ version = get_mksquashfs_version();
+ if int(version[0]) < 4 or int(version[0]) == 4 and int(version[1]) < 4 :
+ print('Error: mksquashfs is too old, required version: 4.4')
raise AssertionError
def make_all_images(build_dir):
diff --git a/test/py/tests/test_part.py b/test/py/tests/test_part.py
index cba98045101..2b5184654db 100644
--- a/test/py/tests/test_part.py
+++ b/test/py/tests/test_part.py
@@ -7,7 +7,7 @@ import pytest
@pytest.mark.buildconfigspec('cmd_part')
@pytest.mark.buildconfigspec('partitions')
@pytest.mark.buildconfigspec('efi_partition')
-def test_dm_compat(u_boot_console):
+def test_part_types(u_boot_console):
"""Test that `part types` prints a result which includes `EFI`."""
output = u_boot_console.run_command('part types')
assert "Supported partition tables:" in output
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index 58ec859b34f..26b6de07f88 100644
--- a/test/py/u_boot_console_base.py
+++ b/test/py/u_boot_console_base.py
@@ -400,6 +400,10 @@ class ConsoleBase(object):
"""
if self.p:
+ # Reset the console timeout value as some tests may change
+ # its default value during the execution
+ if not self.config.gdbserver:
+ self.p.timeout = 30000
return
try:
self.log.start_section('Starting U-Boot')
generated by cgit v1.2.3 (git 2.0.4) at 2025-07-24 15:44:26 +0000