From 92bfd35d75f12cd3e3e34fb340b3bdd89780ae35 Mon Sep 17 00:00:00 2001
From: Matthew McClintock <msm@freescale.com>
Date: Mon, 21 Nov 2011 12:37:57 -0600
Subject: [PATCH] Add u-boot to default images

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta-fsl-ppc/conf/machine/p5020ds-64b.conf | 2 +-
 meta-fsl-ppc/images/fsl-image-lsb-sdk.bb   | 1 +
 meta-fsl-ppc/images/fsl-image-lsb.bb       | 1 +
 meta-fsl-ppc/images/fsl-image-minimal.bb   | 3 +--
 meta-fsl-ppc/images/fsl-toolchain.bb       | 5 +++++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index bd97d295..6ff89627 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -4,6 +4,6 @@
 require e5500-64b.inc
 
 # TODO: fix 32bit build of u-boot for p5020ds-64b
-UBOOT_MACHINES = ""
+UBOOT_MACHINES = "P5020DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
diff --git a/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb b/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb
index 72b24099..04b941b1 100644
--- a/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb
+++ b/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb
@@ -10,6 +10,7 @@ IMAGE_INSTALL = "\
     flex \
     bison \
     ccache \
+    u-boot \
     "
 
 inherit core-image
diff --git a/meta-fsl-ppc/images/fsl-image-lsb.bb b/meta-fsl-ppc/images/fsl-image-lsb.bb
index 22eb7f48..bb743b49 100644
--- a/meta-fsl-ppc/images/fsl-image-lsb.bb
+++ b/meta-fsl-ppc/images/fsl-image-lsb.bb
@@ -4,6 +4,7 @@ IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
     task-core-basic \
     task-core-lsb \
+    u-boot \
     "
 
 inherit core-image
diff --git a/meta-fsl-ppc/images/fsl-image-minimal.bb b/meta-fsl-ppc/images/fsl-image-minimal.bb
index 743e121b..74bce63f 100644
--- a/meta-fsl-ppc/images/fsl-image-minimal.bb
+++ b/meta-fsl-ppc/images/fsl-image-minimal.bb
@@ -1,8 +1,7 @@
 #
 # Copyright (C) 2007 OpenedHand Ltd.
 #
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}"
-
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} u-boot"
 IMAGE_LINGUAS = " "
 
 LICENSE = "MIT"
diff --git a/meta-fsl-ppc/images/fsl-toolchain.bb b/meta-fsl-ppc/images/fsl-toolchain.bb
index 83425c70..ffc42fd3 100644
--- a/meta-fsl-ppc/images/fsl-toolchain.bb
+++ b/meta-fsl-ppc/images/fsl-toolchain.bb
@@ -4,7 +4,12 @@ require fsl-toolchain-bare.bb
 
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
 TOOLCHAIN_TARGET_TASK += " \
+	gtk+-dev \
+	dtc \
 	"
+
+TOOLCHAIN_TARGET_TASK_append_e500mc = " usdpaa"
+
 TOOLCHAIN_HOST_TASK += " \
 	dtc-nativesdk \
 	qemu-nativesdk \
-- 
2.40.1