diff options
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot.inc')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 2d5e46f4ef..f022aed732 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -3,7 +3,6 @@ PROVIDES = "virtual/bootloader" | |||
3 | 3 | ||
4 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 4 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
5 | 5 | ||
6 | DEPENDS += "kern-tools-native" | ||
7 | DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" | 6 | DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" |
8 | 7 | ||
9 | inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch | 8 | inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch |
@@ -25,35 +24,7 @@ PACKAGECONFIG[openssl] = ",,openssl-native" | |||
25 | # file already exists it will not be overwritten. | 24 | # file already exists it will not be overwritten. |
26 | UBOOT_LOCALVERSION ?= "" | 25 | UBOOT_LOCALVERSION ?= "" |
27 | 26 | ||
28 | do_configure () { | 27 | require u-boot-configure.inc |
29 | if [ -n "${UBOOT_CONFIG}" ]; then | ||
30 | unset i j | ||
31 | for config in ${UBOOT_MACHINE}; do | ||
32 | i=$(expr $i + 1); | ||
33 | for type in ${UBOOT_CONFIG}; do | ||
34 | j=$(expr $j + 1); | ||
35 | if [ $j -eq $i ]; then | ||
36 | oe_runmake -C ${S} O=${B}/${config} ${config} | ||
37 | if [ -n "${@' '.join(find_cfgs(d))}" ]; then | ||
38 | merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} | ||
39 | oe_runmake -C ${S} O=${B}/${config} oldconfig | ||
40 | fi | ||
41 | fi | ||
42 | done | ||
43 | unset j | ||
44 | done | ||
45 | unset i | ||
46 | DEVTOOL_DISABLE_MENUCONFIG=true | ||
47 | else | ||
48 | if [ -n "${UBOOT_MACHINE}" ]; then | ||
49 | oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} | ||
50 | else | ||
51 | oe_runmake -C ${S} O=${B} oldconfig | ||
52 | fi | ||
53 | merge_config.sh -m .config ${@" ".join(find_cfgs(d))} | ||
54 | cml1_do_configure | ||
55 | fi | ||
56 | } | ||
57 | 28 | ||
58 | do_compile () { | 29 | do_compile () { |
59 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then | 30 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then |