diff options
-rw-r--r-- | meta/classes-recipe/uboot-config.bbclass | 4 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass index 0c579e8861..e55fc38b7c 100644 --- a/meta/classes-recipe/uboot-config.bbclass +++ b/meta/classes-recipe/uboot-config.bbclass | |||
@@ -65,10 +65,6 @@ UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" | |||
65 | UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" | 65 | UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" |
66 | UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" | 66 | UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" |
67 | 67 | ||
68 | # Default name of u-boot initial env, but enable individual recipes to change | ||
69 | # this value. | ||
70 | UBOOT_INITIAL_ENV ?= "${PN}-initial-env" | ||
71 | |||
72 | # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf | 68 | # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf |
73 | # to find EXTLINUX conf file. | 69 | # to find EXTLINUX conf file. |
74 | UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" | 70 | UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" |
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 79f84b0672..f5b43f6e36 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -24,6 +24,10 @@ PACKAGECONFIG[openssl] = ",,openssl-native" | |||
24 | # file already exists it will not be overwritten. | 24 | # file already exists it will not be overwritten. |
25 | UBOOT_LOCALVERSION ?= "" | 25 | UBOOT_LOCALVERSION ?= "" |
26 | 26 | ||
27 | # Default name of u-boot initial env, but enable individual recipes to change | ||
28 | # this value. | ||
29 | UBOOT_INITIAL_ENV ?= "${PN}-initial-env" | ||
30 | |||
27 | require u-boot-configure.inc | 31 | require u-boot-configure.inc |
28 | 32 | ||
29 | do_savedefconfig() { | 33 | do_savedefconfig() { |