From a32f3fbf4534fcbe86d14b6c212139235560ee87 Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 30 Oct 2014 15:20:23 +0100
Subject: apalis/colibri_t30: latest u-boot git migrated to cbootimage/tegrarcm

Use latest U-Boot from git.
Migrate to using cbootimage and tegrarcm.
---
 recipes/images/trdx-image-fstype.inc | 53 ++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 18 deletions(-)

(limited to 'recipes')

diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
index dbafc48..c31b4c2 100644
--- a/recipes/images/trdx-image-fstype.inc
+++ b/recipes/images/trdx-image-fstype.inc
@@ -6,16 +6,45 @@ IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs"
 U_BOOT_EXT = "bin"
 U_BOOT_EXT_vf = "imx"
 U_BOOT_EXT_mx6 = "imx"
+U_BOOT_SYMLINK = "u-boot-${MACHINE}.${U_BOOT_EXT}"
+U_BOOT_SYMLINK_tegra3 = "u-boot-dtb-tegra-${MACHINE}.${U_BOOT_EXT}"
+U_BOOT_BINARY = "u-boot.${U_BOOT_EXT}"
+U_BOOT_BINARY_tegra3 = "u-boot-dtb-tegra.${U_BOOT_EXT}"
 
 #we need some native tools for deployment
-DEPENDS_append_colibri-vf = " mtd-utils-native imx-loader-native"
 DEPENDS_append_mx6 = " imx-loader-native"
+DEPENDS_append_tegra3 = " cbootimage-native tegrarcm-native"
+DEPENDS_append_vf = " mtd-utils-native imx-loader-native"
 
 imagedeploytools() {
     # default to nothing to deploy
     :
 }
-imagedeploytools_colibri-vf() {
+
+imagedeploytools_append_mx6() {
+    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
+    rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
+    mkdir -p ${IMAGE_ROOT}
+
+    # add imx-loader and its configuration files
+    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
+    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb ${IMAGE_ROOT}/imx_usb.m32
+    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
+    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_work.conf ${IMAGE_ROOT}/
+}
+
+imagedeploytools_append_tegra3() {
+    IMAGE_ROOT="${IMAGE_ROOTFS}/../tegra-uboot-flasher/"
+    mkdir -p ${IMAGE_ROOT}
+
+    # add cbootimage and tegrarcm
+    cp ${STAGING_BINDIR_NATIVE}/cbootimage ${IMAGE_ROOT}/
+    cp ${STAGING_BINDIR_NATIVE}/tegrarcm ${IMAGE_ROOT}/
+    ${BUILD_STRIP} ${IMAGE_ROOT}/cbootimage
+    ${BUILD_STRIP} ${IMAGE_ROOT}/tegrarcm
+}
+
+imagedeploytools_append_vf() {
     IMAGE_ROOT="${IMAGE_ROOTFS}/../vf_flash/"
     rm -f ${IMAGE_ROOT}/mkfs.ubifs  ${IMAGE_ROOT}/imx_uart
     mkdir -p ${IMAGE_ROOT}
@@ -30,27 +59,15 @@ imagedeploytools_colibri-vf() {
     cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/vybrid_usb_work.conf ${IMAGE_ROOT}/
 }
 
-imagedeploytools_append_mx6() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
-    rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
-    mkdir -p ${IMAGE_ROOT}
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb ${IMAGE_ROOT}/imx_usb.m32
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_work.conf ${IMAGE_ROOT}/
-}
-
 imagedeploy_kernel() {
     # put u-boot, kernel into the bin directories, remove the kernel/dtb from the rootfs/boot
-    # rm -f ${IMAGE_ROOTFS}/boot/uImage* ${IMAGE_ROOTFS}/boot/*.dtb
+    rm -f ${IMAGE_ROOTFS}/boot/uImage* ${IMAGE_ROOTFS}/boot/*.dtb
     cp -pP ${DEPLOY_DIR_IMAGE}/uImage* ${IMAGE_ROOTFS}/../${MACHINE}_bin/
     ls ${DEPLOY_DIR_IMAGE}/*.dtb 2> /dev/null && cp -pP ${DEPLOY_DIR_IMAGE}/*.dtb ${IMAGE_ROOTFS}/../${MACHINE}_bin/
     mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/uImage
 }
 
-imagedeploy_kernel_colibri-vf() {
+imagedeploy_kernel_vf() {
     # Do nothing, we use the kernel from /boot inside root fs
     :
 }
@@ -64,7 +81,7 @@ fakeroot do_imagedeploy() {
 
     cp -pP ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../${MACHINE}_bin/
     rm -f ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot-hsmmc-${MACHINE}.${U_BOOT_EXT}
-    mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot-${MACHINE}.${U_BOOT_EXT} ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot.${U_BOOT_EXT}
+    mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${U_BOOT_SYMLINK} ${IMAGE_ROOTFS}/../${MACHINE}_bin/${U_BOOT_BINARY}
 
     # add the rootfs version to the welcome banner
     echo "${IMAGE_NAME}${PV}_${DATE}" >> ${IMAGE_ROOTFS}/etc/issue
@@ -81,4 +98,4 @@ fakeroot do_imagedeploy() {
     tar -cjf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${PV}_${DATE}.tar.bz2 ${IMAGE_NAME}${PV}
 }
 
-addtask imagedeploy after do_rootfs before do_rm_work
+addtask imagedeploy after do_rootfs before do_build
-- 
cgit v1.2.3