diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/fitimage.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/fitimage.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py b/meta/lib/oeqa/selftest/cases/fitimage.py index 14267dbaaa..1570d54dfb 100644 --- a/meta/lib/oeqa/selftest/cases/fitimage.py +++ b/meta/lib/oeqa/selftest/cases/fitimage.py | |||
@@ -277,8 +277,8 @@ FIT_SIGN_INDIVIDUAL = "1" | |||
277 | """ | 277 | """ |
278 | self.write_config(config) | 278 | self.write_config(config) |
279 | 279 | ||
280 | # The U-Boot fitImage is created as part of linux recipe | 280 | # The U-Boot fitImage is created as part of the U-Boot recipe |
281 | bitbake("virtual/kernel") | 281 | bitbake("virtual/bootloader") |
282 | 282 | ||
283 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') | 283 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') |
284 | machine = get_bb_var('MACHINE') | 284 | machine = get_bb_var('MACHINE') |
@@ -350,7 +350,8 @@ UBOOT_LOADADDRESS = "0x80080000" | |||
350 | UBOOT_ENTRYPOINT = "0x80080000" | 350 | UBOOT_ENTRYPOINT = "0x80080000" |
351 | UBOOT_FIT_DESC = "A model description" | 351 | UBOOT_FIT_DESC = "A model description" |
352 | KERNEL_IMAGETYPES += " fitImage " | 352 | KERNEL_IMAGETYPES += " fitImage " |
353 | KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper " | 353 | KERNEL_CLASSES = " kernel-fitimage " |
354 | INHERIT += "test-mkimage-wrapper" | ||
354 | UBOOT_SIGN_ENABLE = "1" | 355 | UBOOT_SIGN_ENABLE = "1" |
355 | FIT_GENERATE_KEYS = "1" | 356 | FIT_GENERATE_KEYS = "1" |
356 | UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" | 357 | UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" |
@@ -361,8 +362,8 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart U-Boot comment'" | |||
361 | """ | 362 | """ |
362 | self.write_config(config) | 363 | self.write_config(config) |
363 | 364 | ||
364 | # The U-Boot fitImage is created as part of linux recipe | 365 | # The U-Boot fitImage is created as part of the U-Boot recipe |
365 | bitbake("virtual/kernel") | 366 | bitbake("virtual/bootloader") |
366 | 367 | ||
367 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') | 368 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') |
368 | machine = get_bb_var('MACHINE') | 369 | machine = get_bb_var('MACHINE') |
@@ -432,7 +433,8 @@ UBOOT_MACHINE = "am57xx_evm_defconfig" | |||
432 | SPL_BINARY = "MLO" | 433 | SPL_BINARY = "MLO" |
433 | # The kernel-fitimage class is a dependency even if we're only | 434 | # The kernel-fitimage class is a dependency even if we're only |
434 | # creating/signing the U-Boot fitImage | 435 | # creating/signing the U-Boot fitImage |
435 | KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper " | 436 | KERNEL_CLASSES = " kernel-fitimage" |
437 | INHERIT += "test-mkimage-wrapper" | ||
436 | # Enable creation and signing of the U-Boot fitImage | 438 | # Enable creation and signing of the U-Boot fitImage |
437 | UBOOT_FITIMAGE_ENABLE = "1" | 439 | UBOOT_FITIMAGE_ENABLE = "1" |
438 | SPL_SIGN_ENABLE = "1" | 440 | SPL_SIGN_ENABLE = "1" |
@@ -451,8 +453,8 @@ UBOOT_FIT_HASH_ALG = "sha256" | |||
451 | """ | 453 | """ |
452 | self.write_config(config) | 454 | self.write_config(config) |
453 | 455 | ||
454 | # The U-Boot fitImage is created as part of linux recipe | 456 | # The U-Boot fitImage is created as part of the U-Boot recipe |
455 | bitbake("virtual/kernel") | 457 | bitbake("virtual/bootloader") |
456 | 458 | ||
457 | image_type = "core-image-minimal" | 459 | image_type = "core-image-minimal" |
458 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') | 460 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') |
@@ -540,7 +542,7 @@ UBOOT_FIT_HASH_ALG = "sha256" | |||
540 | self.assertEqual(len(value), 512, 'Signature value for section %s not expected length' % signed_section) | 542 | self.assertEqual(len(value), 512, 'Signature value for section %s not expected length' % signed_section) |
541 | 543 | ||
542 | # Check for SPL_MKIMAGE_SIGN_ARGS | 544 | # Check for SPL_MKIMAGE_SIGN_ARGS |
543 | result = runCmd('bitbake -e virtual/kernel | grep ^T=') | 545 | result = runCmd('bitbake -e virtual/bootloader | grep ^T=') |
544 | tempdir = result.output.split('=', 1)[1].strip().strip('') | 546 | tempdir = result.output.split('=', 1)[1].strip().strip('') |
545 | result = runCmd('grep "a smart U-Boot comment" %s/run.do_uboot_assemble_fitimage' % tempdir, ignore_status=True) | 547 | result = runCmd('grep "a smart U-Boot comment" %s/run.do_uboot_assemble_fitimage' % tempdir, ignore_status=True) |
546 | self.assertEqual(result.status, 0, 'SPL_MKIMAGE_SIGN_ARGS value did not get used') | 548 | self.assertEqual(result.status, 0, 'SPL_MKIMAGE_SIGN_ARGS value did not get used') |
@@ -595,7 +597,8 @@ UBOOT_EXTLINUX = "0" | |||
595 | UBOOT_FIT_GENERATE_KEYS = "1" | 597 | UBOOT_FIT_GENERATE_KEYS = "1" |
596 | UBOOT_FIT_HASH_ALG = "sha256" | 598 | UBOOT_FIT_HASH_ALG = "sha256" |
597 | KERNEL_IMAGETYPES += " fitImage " | 599 | KERNEL_IMAGETYPES += " fitImage " |
598 | KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper " | 600 | KERNEL_CLASSES = " kernel-fitimage " |
601 | INHERIT += "test-mkimage-wrapper" | ||
599 | UBOOT_SIGN_ENABLE = "1" | 602 | UBOOT_SIGN_ENABLE = "1" |
600 | FIT_GENERATE_KEYS = "1" | 603 | FIT_GENERATE_KEYS = "1" |
601 | UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" | 604 | UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" |
@@ -605,8 +608,8 @@ FIT_SIGN_INDIVIDUAL = "1" | |||
605 | """ | 608 | """ |
606 | self.write_config(config) | 609 | self.write_config(config) |
607 | 610 | ||
608 | # The U-Boot fitImage is created as part of linux recipe | 611 | # The U-Boot fitImage is created as part of the U-Boot recipe |
609 | bitbake("virtual/kernel") | 612 | bitbake("virtual/bootloader") |
610 | 613 | ||
611 | image_type = "core-image-minimal" | 614 | image_type = "core-image-minimal" |
612 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') | 615 | deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') |
@@ -694,7 +697,7 @@ FIT_SIGN_INDIVIDUAL = "1" | |||
694 | self.assertEqual(len(value), 512, 'Signature value for section %s not expected length' % signed_section) | 697 | self.assertEqual(len(value), 512, 'Signature value for section %s not expected length' % signed_section) |
695 | 698 | ||
696 | # Check for SPL_MKIMAGE_SIGN_ARGS | 699 | # Check for SPL_MKIMAGE_SIGN_ARGS |
697 | result = runCmd('bitbake -e virtual/kernel | grep ^T=') | 700 | result = runCmd('bitbake -e virtual/bootloader | grep ^T=') |
698 | tempdir = result.output.split('=', 1)[1].strip().strip('') | 701 | tempdir = result.output.split('=', 1)[1].strip().strip('') |
699 | result = runCmd('grep "a smart cascaded U-Boot comment" %s/run.do_uboot_assemble_fitimage' % tempdir, ignore_status=True) | 702 | result = runCmd('grep "a smart cascaded U-Boot comment" %s/run.do_uboot_assemble_fitimage' % tempdir, ignore_status=True) |
700 | self.assertEqual(result.status, 0, 'SPL_MKIMAGE_SIGN_ARGS value did not get used') | 703 | self.assertEqual(result.status, 0, 'SPL_MKIMAGE_SIGN_ARGS value did not get used') |