Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 1 | # SPDX-License-Identifier: GPL-2.0+ |
Tom Rini | 10e4779 | 2018-05-06 17:58:06 -0400 | [diff] [blame] | 2 | # Copyright (c) 2016, Google Inc. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 3 | # |
| 4 | # U-Boot Verified Boot Test |
| 5 | |
| 6 | """ |
| 7 | This tests verified boot in the following ways: |
| 8 | |
| 9 | For image verification: |
| 10 | - Create FIT (unsigned) with mkimage |
| 11 | - Check that verification shows that no keys are verified |
| 12 | - Sign image |
| 13 | - Check that verification shows that a key is now verified |
| 14 | |
| 15 | For configuration verification: |
| 16 | - Corrupt signature and check for failure |
| 17 | - Create FIT (with unsigned configuration) with mkimage |
Simon Glass | d5deca0 | 2016-07-31 17:35:04 -0600 | [diff] [blame] | 18 | - Check that image verification works |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 19 | - Sign the FIT and mark the key as 'required' for verification |
| 20 | - Check that image verification works |
| 21 | - Corrupt the signature |
| 22 | - Check that image verification no-longer works |
| 23 | |
| 24 | Tests run with both SHA1 and SHA256 hashing. |
| 25 | """ |
| 26 | |
| 27 | import pytest |
| 28 | import sys |
Teddy Reed | e6a4783 | 2018-06-09 11:38:05 -0400 | [diff] [blame] | 29 | import struct |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 30 | import u_boot_utils as util |
Simon Glass | c35df8f | 2020-03-18 11:43:59 -0600 | [diff] [blame^] | 31 | import vboot_forge |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 32 | |
Michal Simek | 6e035ab | 2016-07-18 08:49:08 +0200 | [diff] [blame] | 33 | @pytest.mark.boardspec('sandbox') |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 34 | @pytest.mark.buildconfigspec('fit_signature') |
Stephen Warren | 2079db3 | 2017-09-18 11:11:49 -0600 | [diff] [blame] | 35 | @pytest.mark.requiredtool('dtc') |
| 36 | @pytest.mark.requiredtool('fdtget') |
| 37 | @pytest.mark.requiredtool('fdtput') |
| 38 | @pytest.mark.requiredtool('openssl') |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 39 | def test_vboot(u_boot_console): |
| 40 | """Test verified boot signing with mkimage and verification with 'bootm'. |
| 41 | |
| 42 | This works using sandbox only as it needs to update the device tree used |
| 43 | by U-Boot to hold public keys from the signing process. |
| 44 | |
| 45 | The SHA1 and SHA256 tests are combined into a single test since the |
| 46 | key-generation process is quite slow and we want to avoid doing it twice. |
| 47 | """ |
| 48 | def dtc(dts): |
Simon Glass | d5deca0 | 2016-07-31 17:35:04 -0600 | [diff] [blame] | 49 | """Run the device tree compiler to compile a .dts file |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 50 | |
| 51 | The output file will be the same as the input file but with a .dtb |
| 52 | extension. |
| 53 | |
| 54 | Args: |
| 55 | dts: Device tree file to compile. |
| 56 | """ |
| 57 | dtb = dts.replace('.dts', '.dtb') |
Simon Glass | ba8116c | 2016-07-31 17:35:05 -0600 | [diff] [blame] | 58 | util.run_and_log(cons, 'dtc %s %s%s -O dtb ' |
| 59 | '-o %s%s' % (dtc_args, datadir, dts, tmpdir, dtb)) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 60 | |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 61 | def run_bootm(sha_algo, test_type, expect_string, boots): |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 62 | """Run a 'bootm' command U-Boot. |
| 63 | |
| 64 | This always starts a fresh U-Boot instance since the device tree may |
| 65 | contain a new public key. |
| 66 | |
| 67 | Args: |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 68 | test_type: A string identifying the test type. |
| 69 | expect_string: A string which is expected in the output. |
| 70 | sha_algo: Either 'sha1' or 'sha256', to select the algorithm to |
| 71 | use. |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 72 | boots: A boolean that is True if Linux should boot and False if |
| 73 | we are expected to not boot |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 74 | """ |
Simon Glass | 37c2ce1 | 2016-07-31 17:35:08 -0600 | [diff] [blame] | 75 | cons.restart_uboot() |
Simon Glass | 2a40d83 | 2016-07-31 17:35:07 -0600 | [diff] [blame] | 76 | with cons.log.section('Verified boot %s %s' % (sha_algo, test_type)): |
| 77 | output = cons.run_command_list( |
Simon Glass | f250d47 | 2018-11-15 18:44:02 -0700 | [diff] [blame] | 78 | ['host load hostfs - 100 %stest.fit' % tmpdir, |
Simon Glass | 2a40d83 | 2016-07-31 17:35:07 -0600 | [diff] [blame] | 79 | 'fdt addr 100', |
| 80 | 'bootm 100']) |
Simon Glass | 2ca7311 | 2016-07-31 17:35:09 -0600 | [diff] [blame] | 81 | assert(expect_string in ''.join(output)) |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 82 | if boots: |
| 83 | assert('sandbox: continuing, as we cannot run' in ''.join(output)) |
Philippe Reynes | 1d5ef52 | 2019-09-18 16:04:53 +0200 | [diff] [blame] | 84 | else: |
| 85 | assert('sandbox: continuing, as we cannot run' not in ''.join(output)) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 86 | |
| 87 | def make_fit(its): |
Simon Glass | d5deca0 | 2016-07-31 17:35:04 -0600 | [diff] [blame] | 88 | """Make a new FIT from the .its source file. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 89 | |
| 90 | This runs 'mkimage -f' to create a new FIT. |
| 91 | |
| 92 | Args: |
Simon Glass | d5deca0 | 2016-07-31 17:35:04 -0600 | [diff] [blame] | 93 | its: Filename containing .its source. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 94 | """ |
| 95 | util.run_and_log(cons, [mkimage, '-D', dtc_args, '-f', |
| 96 | '%s%s' % (datadir, its), fit]) |
| 97 | |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 98 | def sign_fit(sha_algo): |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 99 | """Sign the FIT |
| 100 | |
| 101 | Signs the FIT and writes the signature into it. It also writes the |
| 102 | public key into the dtb. |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 103 | |
| 104 | Args: |
| 105 | sha_algo: Either 'sha1' or 'sha256', to select the algorithm to |
| 106 | use. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 107 | """ |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 108 | cons.log.action('%s: Sign images' % sha_algo) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 109 | util.run_and_log(cons, [mkimage, '-F', '-k', tmpdir, '-K', dtb, |
| 110 | '-r', fit]) |
| 111 | |
Philippe Reynes | 1d5ef52 | 2019-09-18 16:04:53 +0200 | [diff] [blame] | 112 | def sign_fit_norequire(sha_algo): |
| 113 | """Sign the FIT |
| 114 | |
| 115 | Signs the FIT and writes the signature into it. It also writes the |
| 116 | public key into the dtb. |
| 117 | |
| 118 | Args: |
| 119 | sha_algo: Either 'sha1' or 'sha256', to select the algorithm to |
| 120 | use. |
| 121 | """ |
| 122 | cons.log.action('%s: Sign images' % sha_algo) |
| 123 | util.run_and_log(cons, [mkimage, '-F', '-k', tmpdir, '-K', dtb, |
| 124 | fit]) |
| 125 | |
Teddy Reed | e6a4783 | 2018-06-09 11:38:05 -0400 | [diff] [blame] | 126 | def replace_fit_totalsize(size): |
| 127 | """Replace FIT header's totalsize with something greater. |
| 128 | |
| 129 | The totalsize must be less than or equal to FIT_SIGNATURE_MAX_SIZE. |
| 130 | If the size is greater, the signature verification should return false. |
| 131 | |
| 132 | Args: |
| 133 | size: The new totalsize of the header |
| 134 | |
| 135 | Returns: |
| 136 | prev_size: The previous totalsize read from the header |
| 137 | """ |
| 138 | total_size = 0 |
| 139 | with open(fit, 'r+b') as handle: |
| 140 | handle.seek(4) |
| 141 | total_size = handle.read(4) |
| 142 | handle.seek(4) |
| 143 | handle.write(struct.pack(">I", size)) |
| 144 | return struct.unpack(">I", total_size)[0] |
| 145 | |
Philippe Reynes | afdbcdb | 2018-11-14 13:51:04 +0100 | [diff] [blame] | 146 | def test_with_algo(sha_algo, padding): |
Simon Glass | d5deca0 | 2016-07-31 17:35:04 -0600 | [diff] [blame] | 147 | """Test verified boot with the given hash algorithm. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 148 | |
| 149 | This is the main part of the test code. The same procedure is followed |
| 150 | for both hashing algorithms. |
| 151 | |
| 152 | Args: |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 153 | sha_algo: Either 'sha1' or 'sha256', to select the algorithm to |
| 154 | use. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 155 | """ |
Simon Glass | dc3ab7e | 2016-07-31 17:35:02 -0600 | [diff] [blame] | 156 | # Compile our device tree files for kernel and U-Boot. These are |
| 157 | # regenerated here since mkimage will modify them (by adding a |
| 158 | # public key) below. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 159 | dtc('sandbox-kernel.dts') |
| 160 | dtc('sandbox-u-boot.dts') |
| 161 | |
| 162 | # Build the FIT, but don't sign anything yet |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 163 | cons.log.action('%s: Test FIT with signed images' % sha_algo) |
Philippe Reynes | afdbcdb | 2018-11-14 13:51:04 +0100 | [diff] [blame] | 164 | make_fit('sign-images-%s%s.its' % (sha_algo , padding)) |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 165 | run_bootm(sha_algo, 'unsigned images', 'dev-', True) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 166 | |
| 167 | # Sign images with our dev keys |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 168 | sign_fit(sha_algo) |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 169 | run_bootm(sha_algo, 'signed images', 'dev+', True) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 170 | |
| 171 | # Create a fresh .dtb without the public keys |
| 172 | dtc('sandbox-u-boot.dts') |
| 173 | |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 174 | cons.log.action('%s: Test FIT with signed configuration' % sha_algo) |
Philippe Reynes | afdbcdb | 2018-11-14 13:51:04 +0100 | [diff] [blame] | 175 | make_fit('sign-configs-%s%s.its' % (sha_algo , padding)) |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 176 | run_bootm(sha_algo, 'unsigned config', '%s+ OK' % sha_algo, True) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 177 | |
| 178 | # Sign images with our dev keys |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 179 | sign_fit(sha_algo) |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 180 | run_bootm(sha_algo, 'signed config', 'dev+', True) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 181 | |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 182 | cons.log.action('%s: Check signed config on the host' % sha_algo) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 183 | |
Simon Glass | f411a89 | 2020-03-18 11:43:58 -0600 | [diff] [blame] | 184 | util.run_and_log(cons, [fit_check_sign, '-f', fit, '-k', dtb]) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 185 | |
Simon Glass | c35df8f | 2020-03-18 11:43:59 -0600 | [diff] [blame^] | 186 | # Make sure that U-Boot checks that the config is in the list of hashed |
| 187 | # nodes. If it isn't, a security bypass is possible. |
| 188 | with open(fit, 'rb') as fp: |
| 189 | root, strblock = vboot_forge.read_fdt(fp) |
| 190 | root, strblock = vboot_forge.manipulate(root, strblock) |
| 191 | with open(fit, 'w+b') as fp: |
| 192 | vboot_forge.write_fdt(root, strblock, fp) |
| 193 | util.run_and_log_expect_exception(cons, |
| 194 | [fit_check_sign, '-f', fit, '-k', dtb], |
| 195 | 1, 'Failed to verify required signature') |
| 196 | |
| 197 | run_bootm(sha_algo, 'forged config', 'Bad Data Hash', False) |
| 198 | |
| 199 | # Create a new properly signed fit and replace header bytes |
| 200 | make_fit('sign-configs-%s%s.its' % (sha_algo, padding)) |
| 201 | sign_fit(sha_algo) |
Teddy Reed | e6a4783 | 2018-06-09 11:38:05 -0400 | [diff] [blame] | 202 | bcfg = u_boot_console.config.buildconfig |
| 203 | max_size = int(bcfg.get('config_fit_signature_max_size', 0x10000000), 0) |
| 204 | existing_size = replace_fit_totalsize(max_size + 1) |
| 205 | run_bootm(sha_algo, 'Signed config with bad hash', 'Bad Data Hash', False) |
| 206 | cons.log.action('%s: Check overflowed FIT header totalsize' % sha_algo) |
| 207 | |
| 208 | # Replace with existing header bytes |
| 209 | replace_fit_totalsize(existing_size) |
| 210 | run_bootm(sha_algo, 'signed config', 'dev+', True) |
| 211 | cons.log.action('%s: Check default FIT header totalsize' % sha_algo) |
| 212 | |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 213 | # Increment the first byte of the signature, which should cause failure |
Simon Glass | ba8116c | 2016-07-31 17:35:05 -0600 | [diff] [blame] | 214 | sig = util.run_and_log(cons, 'fdtget -t bx %s %s value' % |
| 215 | (fit, sig_node)) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 216 | byte_list = sig.split() |
| 217 | byte = int(byte_list[0], 16) |
Simon Glass | dc3ab7e | 2016-07-31 17:35:02 -0600 | [diff] [blame] | 218 | byte_list[0] = '%x' % (byte + 1) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 219 | sig = ' '.join(byte_list) |
Simon Glass | ba8116c | 2016-07-31 17:35:05 -0600 | [diff] [blame] | 220 | util.run_and_log(cons, 'fdtput -t bx %s %s value %s' % |
| 221 | (fit, sig_node, sig)) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 222 | |
Tom Rini | b65ce46 | 2016-09-18 09:46:58 -0400 | [diff] [blame] | 223 | run_bootm(sha_algo, 'Signed config with bad hash', 'Bad Data Hash', False) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 224 | |
Simon Glass | f223c73 | 2016-07-31 17:35:06 -0600 | [diff] [blame] | 225 | cons.log.action('%s: Check bad config on the host' % sha_algo) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 226 | util.run_and_log_expect_exception(cons, [fit_check_sign, '-f', fit, |
| 227 | '-k', dtb], 1, 'Failed to verify required signature') |
| 228 | |
Philippe Reynes | 1d5ef52 | 2019-09-18 16:04:53 +0200 | [diff] [blame] | 229 | def test_required_key(sha_algo, padding): |
| 230 | """Test verified boot with the given hash algorithm. |
| 231 | |
| 232 | This function test if u-boot reject an image when a required |
| 233 | key isn't used to sign a FIT. |
| 234 | |
| 235 | Args: |
| 236 | sha_algo: Either 'sha1' or 'sha256', to select the algorithm to |
| 237 | use. |
| 238 | """ |
| 239 | # Compile our device tree files for kernel and U-Boot. These are |
| 240 | # regenerated here since mkimage will modify them (by adding a |
| 241 | # public key) below. |
| 242 | dtc('sandbox-kernel.dts') |
| 243 | dtc('sandbox-u-boot.dts') |
| 244 | |
| 245 | # Build the FIT with prod key (keys required) |
| 246 | # Build the FIT with dev key (keys NOT required) |
| 247 | # The dtb contain the key prod and dev and the key prod are set as required. |
| 248 | # Then try to boot the FIT with dev key |
| 249 | # This FIT should not be accepted by u-boot because the key prod is required |
| 250 | cons.log.action('%s: Test FIT with configs images' % sha_algo) |
| 251 | make_fit('sign-configs-%s%s-prod.its' % (sha_algo , padding)) |
| 252 | sign_fit(sha_algo) |
| 253 | make_fit('sign-configs-%s%s.its' % (sha_algo , padding)) |
| 254 | sign_fit(sha_algo) |
| 255 | |
| 256 | run_bootm(sha_algo, 'signed configs', '', False) |
| 257 | |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 258 | cons = u_boot_console |
| 259 | tmpdir = cons.config.result_dir + '/' |
| 260 | tmp = tmpdir + 'vboot.tmp' |
Stephen Warren | 7047d95 | 2016-07-18 10:07:25 -0600 | [diff] [blame] | 261 | datadir = cons.config.source_dir + '/test/py/tests/vboot/' |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 262 | fit = '%stest.fit' % tmpdir |
| 263 | mkimage = cons.config.build_dir + '/tools/mkimage' |
| 264 | fit_check_sign = cons.config.build_dir + '/tools/fit_check_sign' |
| 265 | dtc_args = '-I dts -O dtb -i %s' % tmpdir |
| 266 | dtb = '%ssandbox-u-boot.dtb' % tmpdir |
Philippe Reynes | a28e922 | 2018-11-14 13:51:05 +0100 | [diff] [blame] | 267 | sig_node = '/configurations/conf-1/signature' |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 268 | |
| 269 | # Create an RSA key pair |
| 270 | public_exponent = 65537 |
Simon Glass | ba8116c | 2016-07-31 17:35:05 -0600 | [diff] [blame] | 271 | util.run_and_log(cons, 'openssl genpkey -algorithm RSA -out %sdev.key ' |
| 272 | '-pkeyopt rsa_keygen_bits:2048 ' |
Paul Burton | 2662c82 | 2017-09-14 14:34:50 -0700 | [diff] [blame] | 273 | '-pkeyopt rsa_keygen_pubexp:%d' % |
| 274 | (tmpdir, public_exponent)) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 275 | |
| 276 | # Create a certificate containing the public key |
Simon Glass | ba8116c | 2016-07-31 17:35:05 -0600 | [diff] [blame] | 277 | util.run_and_log(cons, 'openssl req -batch -new -x509 -key %sdev.key -out ' |
| 278 | '%sdev.crt' % (tmpdir, tmpdir)) |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 279 | |
Philippe Reynes | 1d5ef52 | 2019-09-18 16:04:53 +0200 | [diff] [blame] | 280 | # Create an RSA key pair (prod) |
| 281 | public_exponent = 65537 |
| 282 | util.run_and_log(cons, 'openssl genpkey -algorithm RSA -out %sprod.key ' |
| 283 | '-pkeyopt rsa_keygen_bits:2048 ' |
| 284 | '-pkeyopt rsa_keygen_pubexp:%d' % |
| 285 | (tmpdir, public_exponent)) |
| 286 | |
| 287 | # Create a certificate containing the public key (prod) |
| 288 | util.run_and_log(cons, 'openssl req -batch -new -x509 -key %sprod.key -out ' |
| 289 | '%sprod.crt' % (tmpdir, tmpdir)) |
| 290 | |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 291 | # Create a number kernel image with zeroes |
| 292 | with open('%stest-kernel.bin' % tmpdir, 'w') as fd: |
| 293 | fd.write(5000 * chr(0)) |
| 294 | |
| 295 | try: |
| 296 | # We need to use our own device tree file. Remember to restore it |
| 297 | # afterwards. |
| 298 | old_dtb = cons.config.dtb |
| 299 | cons.config.dtb = dtb |
Philippe Reynes | afdbcdb | 2018-11-14 13:51:04 +0100 | [diff] [blame] | 300 | test_with_algo('sha1','') |
| 301 | test_with_algo('sha1','-pss') |
| 302 | test_with_algo('sha256','') |
| 303 | test_with_algo('sha256','-pss') |
Philippe Reynes | 1d5ef52 | 2019-09-18 16:04:53 +0200 | [diff] [blame] | 304 | test_required_key('sha256','-pss') |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 305 | finally: |
Simon Glass | 37c2ce1 | 2016-07-31 17:35:08 -0600 | [diff] [blame] | 306 | # Go back to the original U-Boot with the correct dtb. |
Simon Glass | d977ecd | 2016-07-03 09:40:46 -0600 | [diff] [blame] | 307 | cons.config.dtb = old_dtb |
Simon Glass | 37c2ce1 | 2016-07-31 17:35:08 -0600 | [diff] [blame] | 308 | cons.restart_uboot() |