diff options
Diffstat (limited to 'meta/classes/uboot-config.bbclass')
-rw-r--r-- | meta/classes/uboot-config.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index 3f760f2fbe..10013b7d49 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass | |||
@@ -14,19 +14,19 @@ | |||
14 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" | 14 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" |
15 | 15 | ||
16 | python () { | 16 | python () { |
17 | ubootmachine = d.getVar("UBOOT_MACHINE", True) | 17 | ubootmachine = d.getVar("UBOOT_MACHINE") |
18 | ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') | 18 | ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') |
19 | ubootbinary = d.getVar('UBOOT_BINARY', True) | 19 | ubootbinary = d.getVar('UBOOT_BINARY') |
20 | ubootbinaries = d.getVar('UBOOT_BINARIES', True) | 20 | ubootbinaries = d.getVar('UBOOT_BINARIES') |
21 | # The "doc" varflag is special, we don't want to see it here | 21 | # The "doc" varflag is special, we don't want to see it here |
22 | ubootconfigflags.pop('doc', None) | 22 | ubootconfigflags.pop('doc', None) |
23 | 23 | ||
24 | if not ubootmachine and not ubootconfigflags: | 24 | if not ubootmachine and not ubootconfigflags: |
25 | PN = d.getVar("PN", True) | 25 | PN = d.getVar("PN") |
26 | FILE = os.path.basename(d.getVar("FILE", True)) | 26 | FILE = os.path.basename(d.getVar("FILE")) |
27 | bb.debug(1, "To build %s, see %s for instructions on \ | 27 | bb.debug(1, "To build %s, see %s for instructions on \ |
28 | setting up your machine config" % (PN, FILE)) | 28 | setting up your machine config" % (PN, FILE)) |
29 | raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE", True)) | 29 | raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) |
30 | 30 | ||
31 | if ubootmachine and ubootconfigflags: | 31 | if ubootmachine and ubootconfigflags: |
32 | raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.") | 32 | raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.") |
@@ -37,7 +37,7 @@ python () { | |||
37 | if not ubootconfigflags: | 37 | if not ubootconfigflags: |
38 | return | 38 | return |
39 | 39 | ||
40 | ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split() | 40 | ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split() |
41 | if len(ubootconfig) > 0: | 41 | if len(ubootconfig) > 0: |
42 | for config in ubootconfig: | 42 | for config in ubootconfig: |
43 | for f, v in ubootconfigflags.items(): | 43 | for f, v in ubootconfigflags.items(): |