From ffe77cdad7ef4493b7f535e13ffe9d713d94c6fa Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 10 Dec 2015 11:50:26 -0800
Subject: [PATCH] Also remove uboot from live arm.tmpl

---
 share/live/arm.tmpl | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/share/live/arm.tmpl b/share/live/arm.tmpl
index 4b0cd82c..2a0b126b 100644
--- a/share/live/arm.tmpl
+++ b/share/live/arm.tmpl
@@ -6,12 +6,6 @@ BOOTDIR="boot"
 KERNELDIR=PXEBOOTDIR
 LIVEDIR="LiveOS"
 LORAXDIR="usr/share/lorax/"
-
-# different platforms use different kernel load addresses.
-# include a 'baseline' kernel for no 'flavor'.
-kernelAddress = { 'baseline' : '0x00008000',
-                  'lpae'     : '0x00008000',
-                }
 %>
 
 mkdir ${LIVEDIR}
@@ -25,22 +19,6 @@ mkdir ${KERNELDIR}
         installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
         installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
 
-        # create U-Boot wrapped images
-
-        runcmd mkimage \
-             -A arm -O linux -T ramdisk -C none \
-             -a 0 -e 0 \
-             -n "${product.name} ${product.version} ${kernel.flavor} ${kernel.arch}" \
-             -d ${outroot}/${KERNELDIR}/initrd-${kernel.flavor}.img \
-                ${outroot}/${KERNELDIR}/uInitrd-${kernel.flavor}
-
-        runcmd mkimage \
-             -A arm -O linux -T kernel -C none \
-             -a ${kernelAddress[kernel.flavor]} -e ${kernelAddress[kernel.flavor]} \
-             -n "${product.name} ${product.version} ${kernel.flavor} ${kernel.arch}" \
-             -d ${outroot}/${KERNELDIR}/vmlinuz-${kernel.flavor} \
-                ${outroot}/${KERNELDIR}/uImage-${kernel.flavor}
-
         treeinfo images-${kernel.flavor}-${basearch} uimage ${KERNELDIR}/uImage-${kernel.flavor}
         treeinfo images-${kernel.flavor}-${basearch} uinitrd ${KERNELDIR}/uInitrd-${kernel.flavor}
 
@@ -48,22 +26,6 @@ mkdir ${KERNELDIR}
         installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
         installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
 
-        # create U-Boot wrapped images
-
-        runcmd mkimage \
-             -A arm -O linux -T ramdisk -C none \
-             -a 0 -e 0 \
-             -n "${product.name} ${product.version} ${kernel.arch}" \
-             -d ${outroot}/${KERNELDIR}/initrd.img \
-                ${outroot}/${KERNELDIR}/uInitrd
-
-        runcmd mkimage \
-             -A arm -O linux -T kernel -C none \
-             -a ${kernelAddress['baseline']} -e ${kernelAddress['baseline']} \
-             -n "${product.name} ${product.version} ${kernel.arch}" \
-             -d ${outroot}/${KERNELDIR}/vmlinuz \
-                ${outroot}/${KERNELDIR}/uImage
-
         treeinfo images-${basearch} uimage ${KERNELDIR}/uImage
         treeinfo images-${basearch} uinitrd ${KERNELDIR}/uInitrd