aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--arch/arm/dts/sun50i-h616.dtsi12
-rw-r--r--arch/arm/dts/sunxi-u-boot.dtsi2
-rw-r--r--cmd/Kconfig1
-rw-r--r--configs/imx8mn_ddr4_evk_defconfig1
-rw-r--r--doc/sphinx/requirements.txt2
-rw-r--r--include/configs/imx8mn_evk.h4
-rw-r--r--lib/efi_loader/efi_device_path_to_text.c2
-rw-r--r--lib/efi_loader/helloworld.c2
-rw-r--r--test/py/tests/test_fs/conftest.py78
10 files changed, 67 insertions, 41 deletions
diff --git a/Makefile b/Makefile
index 94c31d1bb8..193aa4d1c9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
VERSION = 2021
PATCHLEVEL = 04
SUBLEVEL =
-EXTRAVERSION = -rc5
+EXTRAVERSION =
NAME =
# *DOCUMENTATION*
@@ -1031,7 +1031,7 @@ expect = $(foreach cfg,$(1),y)
# Note: Script avoids bash construct, hence the strange double 'if'
# (patches welcome!)
define deprecated
- if [ -n "$(strip $(4))" ]; then if [ "$(got)" != "$(expect)" ]; then \
+ @if [ -n "$(strip $(4))" ]; then if [ "$(got)" != "$(expect)" ]; then \
echo >&2 "===================== WARNING ======================"; \
echo >&2 "This board does not use $(firstword $(1)) (Driver Model"; \
echo >&2 "for $(2)). Please update the board to use"; \
diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi
index 953e8fac20..dd4d2f3111 100644
--- a/arch/arm/dts/sun50i-h616.dtsi
+++ b/arch/arm/dts/sun50i-h616.dtsi
@@ -51,18 +51,6 @@
};
};
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
-
- /* 512KiB reserved for ARM Trusted Firmware (BL31) */
- secmon_reserved: secmon@40000000 {
- reg = <0x0 0x40000000 0x0 0x80000>;
- no-map;
- };
- };
-
osc24M: osc24M_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index abe629c55e..cd096bf2a0 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -4,7 +4,7 @@
#define BL31_ADDR 0x104000
#define SCP_ADDR 0x114000
#elif defined(CONFIG_MACH_SUN50I_H616)
-#define BL31_ADDR 0x40004000
+#define BL31_ADDR 0x40000000
#else
#define BL31_ADDR 0x44000
#define SCP_ADDR 0x50000
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 8ab34f3798..9bf5e863e4 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1309,6 +1309,7 @@ config CMD_UNIVERSE
config CMD_USB
bool "usb"
+ depends on USB
select HAVE_BLOCK_DEVICE
help
USB support.
diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig
index f7ea65886d..2c12bdabe0 100644
--- a/configs/imx8mn_ddr4_evk_defconfig
+++ b/configs/imx8mn_ddr4_evk_defconfig
@@ -54,6 +54,7 @@ CONFIG_SPL_OF_CONTROL=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK_COMPOSITE_CCF=y
diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt
index 5030d346d2..af79d2c119 100644
--- a/doc/sphinx/requirements.txt
+++ b/doc/sphinx/requirements.txt
@@ -1,4 +1,4 @@
-docutils
+docutils==0.16
Sphinx==2.4.4
sphinx_rtd_theme
six
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 1e2825337e..596e255ca6 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -34,10 +34,10 @@
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
- "image=Image.itb\0" \
+ "image=Image\0" \
"console=ttymxc1,115200\0" \
"fdt_addr=0x43000000\0" \
- "boot_fit=try\0" \
+ "boot_fit=no\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"initrd_addr=0x43800000\0" \
"bootm_size=0x10000000\0" \
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index 43554cd771..675e80bcb8 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -126,8 +126,10 @@ static char *dp_msging(char *s, struct efi_device_path *dp)
switch (uart->stop_bits) {
case 2:
s += sprintf(s, "1.5)");
+ break;
default:
s += sprintf(s, "%d)", uart->stop_bits);
+ break;
}
break;
}
diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c
index 5c8b7a96f9..3f215e2a46 100644
--- a/lib/efi_loader/helloworld.c
+++ b/lib/efi_loader/helloworld.c
@@ -181,7 +181,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,
(void **)&device_path);
if (ret != EFI_SUCCESS) {
con_out->output_string
- (con_out, L"Missing devide path for device handle\r\n");
+ (con_out, L"Missing device path for device handle\r\n");
goto out;
}
con_out->output_string(con_out, L"Boot device: ");
diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py
index ec70e8c4ef..50af9efcf7 100644
--- a/test/py/tests/test_fs/conftest.py
+++ b/test/py/tests/test_fs/conftest.py
@@ -270,9 +270,20 @@ def fs_obj_basic(request, u_boot_config):
# 3GiB volume
fs_img = mk_fs(u_boot_config, fs_type, 0xc0000000, '3GB')
+ except CalledProcessError as err:
+ pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
- # Mount the image so we can populate it.
+ try:
check_call('mkdir -p %s' % mount_dir, shell=True)
+ except CalledProcessError as err:
+ pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
+ finally:
+ call('rm -f %s' % fs_img, shell=True)
+
+ try:
+ # Mount the image so we can populate it.
mount_fs(fs_type, fs_img, mount_dir)
# Create a subdirectory.
@@ -335,18 +346,15 @@ def fs_obj_basic(request, u_boot_config):
% big_file, shell=True).decode()
md5val.append(out.split()[0])
- umount_fs(mount_dir)
except CalledProcessError as err:
- pytest.skip('Setup failed for filesystem: ' + fs_type + \
- '. {}'.format(err))
+ pytest.skip('Setup failed for filesystem: ' + fs_type + '. {}'.format(err))
return
else:
yield [fs_ubtype, fs_img, md5val]
finally:
umount_fs(mount_dir)
call('rmdir %s' % mount_dir, shell=True)
- if fs_img:
- call('rm -f %s' % fs_img, shell=True)
+ call('rm -f %s' % fs_img, shell=True)
#
# Fixture for extended fs test
@@ -378,9 +386,20 @@ def fs_obj_ext(request, u_boot_config):
# 128MiB volume
fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
+ except CalledProcessError as err:
+ pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
- # Mount the image so we can populate it.
+ try:
check_call('mkdir -p %s' % mount_dir, shell=True)
+ except CalledProcessError as err:
+ pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
+ finally:
+ call('rm -f %s' % fs_img, shell=True)
+
+ try:
+ # Mount the image so we can populate it.
mount_fs(fs_type, fs_img, mount_dir)
# Create a test directory
@@ -422,7 +441,6 @@ def fs_obj_ext(request, u_boot_config):
md5val.append(out.split()[0])
check_call('rm %s' % tmp_file, shell=True)
- umount_fs(mount_dir)
except CalledProcessError:
pytest.skip('Setup failed for filesystem: ' + fs_type)
return
@@ -431,8 +449,7 @@ def fs_obj_ext(request, u_boot_config):
finally:
umount_fs(mount_dir)
call('rmdir %s' % mount_dir, shell=True)
- if fs_img:
- call('rm -f %s' % fs_img, shell=True)
+ call('rm -f %s' % fs_img, shell=True)
#
# Fixture for mkdir test
@@ -460,11 +477,10 @@ def fs_obj_mkdir(request, u_boot_config):
fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
except:
pytest.skip('Setup failed for filesystem: ' + fs_type)
+ return
else:
yield [fs_ubtype, fs_img]
- finally:
- if fs_img:
- call('rm -f %s' % fs_img, shell=True)
+ call('rm -f %s' % fs_img, shell=True)
#
# Fixture for unlink test
@@ -493,9 +509,20 @@ def fs_obj_unlink(request, u_boot_config):
# 128MiB volume
fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
+ except CalledProcessError as err:
+ pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
- # Mount the image so we can populate it.
+ try:
check_call('mkdir -p %s' % mount_dir, shell=True)
+ except CalledProcessError as err:
+ pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
+ finally:
+ call('rm -f %s' % fs_img, shell=True)
+
+ try:
+ # Mount the image so we can populate it.
mount_fs(fs_type, fs_img, mount_dir)
# Test Case 1 & 3
@@ -519,7 +546,6 @@ def fs_obj_unlink(request, u_boot_config):
check_call('dd if=/dev/urandom of=%s/dir5/file1 bs=1K count=1'
% mount_dir, shell=True)
- umount_fs(mount_dir)
except CalledProcessError:
pytest.skip('Setup failed for filesystem: ' + fs_type)
return
@@ -528,8 +554,7 @@ def fs_obj_unlink(request, u_boot_config):
finally:
umount_fs(mount_dir)
call('rmdir %s' % mount_dir, shell=True)
- if fs_img:
- call('rm -f %s' % fs_img, shell=True)
+ call('rm -f %s' % fs_img, shell=True)
#
# Fixture for symlink fs test
@@ -559,11 +584,22 @@ def fs_obj_symlink(request, u_boot_config):
try:
- # 3GiB volume
+ # 1GiB volume
fs_img = mk_fs(u_boot_config, fs_type, 0x40000000, '1GB')
+ except CalledProcessError as err:
+ pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
- # Mount the image so we can populate it.
+ try:
check_call('mkdir -p %s' % mount_dir, shell=True)
+ except CalledProcessError as err:
+ pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
+ return
+ finally:
+ call('rm -f %s' % fs_img, shell=True)
+
+ try:
+ # Mount the image so we can populate it.
mount_fs(fs_type, fs_img, mount_dir)
# Create a subdirectory.
@@ -587,7 +623,6 @@ def fs_obj_symlink(request, u_boot_config):
% medium_file, shell=True).decode()
md5val.extend([out.split()[0]])
- umount_fs(mount_dir)
except CalledProcessError:
pytest.skip('Setup failed for filesystem: ' + fs_type)
return
@@ -596,5 +631,4 @@ def fs_obj_symlink(request, u_boot_config):
finally:
umount_fs(mount_dir)
call('rmdir %s' % mount_dir, shell=True)
- if fs_img:
- call('rm -f %s' % fs_img, shell=True)
+ call('rm -f %s' % fs_img, shell=True)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-29 13:04:32 +0000