diff options
| -rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index c16977c477..8a9b195d6e 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
| @@ -64,6 +64,9 @@ FIT_DESC ?= "Kernel fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" | |||
| 64 | # Sign individual images as well | 64 | # Sign individual images as well |
| 65 | FIT_SIGN_INDIVIDUAL ?= "0" | 65 | FIT_SIGN_INDIVIDUAL ?= "0" |
| 66 | 66 | ||
| 67 | FIT_CONF_PREFIX ?= "conf-" | ||
| 68 | FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name" | ||
| 69 | |||
| 67 | # Keys used to sign individually image nodes. | 70 | # Keys used to sign individually image nodes. |
| 68 | # The keys to sign image nodes must be different from those used to sign | 71 | # The keys to sign image nodes must be different from those used to sign |
| 69 | # configuration nodes, otherwise the "required" property, from | 72 | # configuration nodes, otherwise the "required" property, from |
| @@ -358,7 +361,7 @@ fitimage_emit_section_config() { | |||
| 358 | # Test if we have any DTBs at all | 361 | # Test if we have any DTBs at all |
| 359 | sep="" | 362 | sep="" |
| 360 | conf_desc="" | 363 | conf_desc="" |
| 361 | conf_node="conf-" | 364 | conf_node="${FIT_CONF_PREFIX}" |
| 362 | kernel_line="" | 365 | kernel_line="" |
| 363 | fdt_line="" | 366 | fdt_line="" |
| 364 | ramdisk_line="" | 367 | ramdisk_line="" |
| @@ -407,9 +410,9 @@ fitimage_emit_section_config() { | |||
| 407 | # default node is selected based on dtb ID if it is present, | 410 | # default node is selected based on dtb ID if it is present, |
| 408 | # otherwise its selected based on kernel ID | 411 | # otherwise its selected based on kernel ID |
| 409 | if [ -n "$dtb_image" ]; then | 412 | if [ -n "$dtb_image" ]; then |
| 410 | default_line="default = \"conf-$dtb_image\";" | 413 | default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" |
| 411 | else | 414 | else |
| 412 | default_line="default = \"conf-$kernel_id\";" | 415 | default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";" |
| 413 | fi | 416 | fi |
| 414 | fi | 417 | fi |
| 415 | 418 | ||
