Add u-boot to default images

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

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index bd97d295945681953d49fef9f031ef9651bb6868..6ff89627b629c417ffd7a51cae976b5ec36f56c9 100644 (file)
--- 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 72b24099145c903244197094a84a5c1235f5edd7..04b941b136a4ce99fa5282f7edcef0832c664c06 100644 (file)
--- 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 22eb7f48e9efe57118cd6ef91d35f99a1559a56b..bb743b49e4e02c2cb61a1a649a2134ecd15d079a 100644 (file)
--- 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 743e121b5959209622cb4bfa8f8beb55b98c2977..74bce63fa604ae8840132664a91556cfbde9606a 100644 (file)
--- 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 83425c701e854054ef9c36c346bab2eb29343f67..ffc42fd355ea5c97049390f893dbc646b99930ff 100644 (file)
--- 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 \