From: Matthew McClintock <msm@freescale.com>
Date: Wed, 30 Nov 2011 03:45:07 +0000 (-0600)
Subject: u-boot_git.bb: Make u-boot build for 64-bit parts
X-Git-Tag: 2.1~534^2~554
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=313fc4e298d5d3bb7c5a1ba35ecfdd3d6b3c2eeb;p=meta-freescale.git

u-boot_git.bb: Make u-boot build for 64-bit parts

u-boot is always built 32-bit even for 64-bit parts, this is an
issue for 64-bit machines. This is a first attempt at getting this
working. However, this method is less than ideal as it uses multilib
to build a 32-bit toolchain to build u-boot

Signed-off-by: Matthew McClintock <msm@freescale.com>
---

diff --git a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
index 30294ff9..3105f9cd 100644
--- a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
+++ b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/bootloader"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-PR = "r7"
+PR = "r8"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc"
 
@@ -14,9 +14,13 @@ inherit deploy
 SRCREV = "348d8fceba39e5622d315ffda7d72ff6bbcf05ec"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git \
 		"
+DEPENDS_append_e5500-64b = " lib32-gcc-cross"
+PATH_append_e5500-64b = ":${STAGING_BINDIR_NATIVE}/powerpc-${DISTRO}mllib32-${HOST_OS}/"
+TOOLCHAIN_OPTIONS_append_e5500-64b = "/../lib32-${MACHINE}"
+WRAP_TARGET_PREFIX_e5500-64b = "powerpc-${DISTRO}mllib32-${HOST_OS}-"
 
-EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
-EXTRA_OEMAKE_e5500-64b = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} -m32" LD="${LD} -melf32ppc"'
+WRAP_TARGET_PREFIX = "${TARGET_PREFIX}"
+EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"