diff options
| -rw-r--r-- | arch/arm/dts/sun50i-h616.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | test/py/tests/test_fs/conftest.py | 78 |
3 files changed, 57 insertions, 35 deletions
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/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) |