diff options
| -rw-r--r-- | meta/classes/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/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index b9ad35821a..fe85521877 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass | |||
| @@ -59,10 +59,6 @@ UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" | |||
| 59 | UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" | 59 | UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" |
| 60 | UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" | 60 | UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" |
| 61 | 61 | ||
| 62 | # Default name of u-boot initial env, but enable individual recipes to change | ||
| 63 | # this value. | ||
| 64 | UBOOT_INITIAL_ENV ?= "${PN}-initial-env" | ||
| 65 | |||
| 66 | # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf | 62 | # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf |
| 67 | # to find EXTLINUX conf file. | 63 | # to find EXTLINUX conf file. |
| 68 | UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" | 64 | 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 b2f33e3826..54ea2e9e50 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_compile () { | 33 | do_compile () { |
