leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v2021.07-rc5' into next

Browse Source 
Prepare v2021.07-rc5

# gpg: Signature made Mon 28 Jun 2021 03:39:36 PM EDT
# gpg:                using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]

# Conflicts:
#	configs/am64x_evm_r5_defconfig
This commit is contained in:
Tom Rini
2021-06-28 16:22:13 -04:00
parent 67edf2553f 3ef4572110
commit 6d0453d889
1245 changed files with 10274 additions and 2859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/dm/ofnode.c
View File

@@ -213,7 +213,7 @@ static int dm_test_ofnode_read_aliases(struct unit_test_state *uts)
ofnode node;
int size;
node = ofnode_get_aliases_node("eth3");
node = ofnode_get_aliases_node("ethernet3");
ut_assert(ofnode_valid(node));
ut_asserteq_str("sbe5", ofnode_get_name(node));

2
test/dm/test-fdt.c
View File

@@ -183,7 +183,7 @@ static int dm_test_alias_highest_id(struct unit_test_state *uts)
{
int ret;
ret = dev_read_alias_highest_id("eth");
ret = dev_read_alias_highest_id("ethernet");
ut_asserteq(5, ret);
ret = dev_read_alias_highest_id("gpio");

4
test/py/tests/test_fs/conftest.py
View File

@@ -159,6 +159,10 @@ def mk_fs(config, fs_type, size, id):
count = (size + 1048576 - 1) / 1048576
# Some distributions do not add /sbin to the default PATH, where mkfs lives
if '/sbin' not in os.environ["PATH"].split(os.pathsep):
os.environ["PATH"] += os.pathsep + '/sbin'
try:
check_call('rm -f %s' % fs_img, shell=True)
check_call('dd if=/dev/zero of=%s bs=1M count=%d'