From d5cda8d424279cdb36360299fc3ccb553d21dd28 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 14 Oct 2013 13:31:10 +0300
Subject: [PATCH] u-boot: clean up

---
 packages/tools/u-boot/build   |  6 -----
 packages/tools/u-boot/install |  6 +----
 packages/tools/u-boot/meta    | 10 +-------
 projects/ARCTIC_MC/options    |  2 +-
 projects/ATV/options          |  2 +-
 projects/Generic/options      |  2 +-
 projects/RPi/options          |  2 +-
 projects/Virtual/options      |  2 +-
 tools/mkpkg/mkpkg_u-boot-aml  | 43 -----------------------------------
 9 files changed, 7 insertions(+), 68 deletions(-)
 delete mode 100755 tools/mkpkg/mkpkg_u-boot-aml

diff --git a/packages/tools/u-boot/build b/packages/tools/u-boot/build
index 041a8847f5..de80e5c88c 100755
--- a/packages/tools/u-boot/build
+++ b/packages/tools/u-boot/build
@@ -41,12 +41,6 @@ fi
 
 cd $PKG_BUILD
 
-if [ "$UBOOT_VERSION" = "aml" ]; then
-  rm -f tools/ucl/libucl_linux.lib
-  make -C tools/ucl/ucl_cygwin_prj/
-  cp -f tools/ucl/ucl_cygwin_prj/objs/libucl.a tools/ucl/libucl_linux.lib
-fi
-
 make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" $UBOOT_CONFIG
 make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" HOSTCC="$HOST_CC" HOSTSTRIP="true"
 
diff --git a/packages/tools/u-boot/install b/packages/tools/u-boot/install
index b9d41859f7..cdaf9f4b8f 100755
--- a/packages/tools/u-boot/install
+++ b/packages/tools/u-boot/install
@@ -27,11 +27,7 @@ if [ -z "$UBOOT_CONFIGFILE" ]; then
 fi
 
 mkdir -p $INSTALL/usr/share/u-boot
-  if [ "$UBOOT_VERSION" = "aml" ]; then
-    cp $PKG_BUILD/build/u-boot-aml-ucl.bin $INSTALL/usr/share/u-boot/spi_M3_512.bin
-  else
-    cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot
-  fi
+  cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot
 
 if [ -f "$PKG_BUILD/MLO" ]; then
   cp $PKG_BUILD/MLO $INSTALL/usr/share/u-boot
diff --git a/packages/tools/u-boot/meta b/packages/tools/u-boot/meta
index 9a9b70c132..9e6a3868a1 100644
--- a/packages/tools/u-boot/meta
+++ b/packages/tools/u-boot/meta
@@ -19,15 +19,7 @@
 ################################################################################
 
 PKG_NAME="u-boot"
-if [ "$UBOOT_VERSION" = "aml" ]; then
-  PKG_VERSION="aml-50dba31"
-  PKG_SITE="https://github.com/Pivosgroup/buildroot-uboot"
-  PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-elif [ "$UBOOT_VERSION" = "cubox" ]; then
-  PKG_VERSION="cubox-f826edd"
-  PKG_SITE="https://github.com/rabeeh/u-boot/tree/"
-  PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-else
+if [ "$UBOOT_VERSION" = "default" ]; then
   PKG_VERSION="2011.03-rc1"
   PKG_SITE="http://www.denx.de/wiki/U-Boot/WebHome"
   PKG_URL="ftp://ftp.denx.de/pub/u-boot/$PKG_NAME-$PKG_VERSION.tar.bz2"
diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options
index 43ed41ce4e..e54893383a 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -97,7 +97,7 @@
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
-# u-boot version to use (default / aml / cubox)
+# u-boot version to use (default)
   UBOOT_VERSION="default"
 
 # Configuration for u-boot
diff --git a/projects/ATV/options b/projects/ATV/options
index 7f5a5d852d..caeba70cf7 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -97,7 +97,7 @@
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="atv-bootloader"
 
-# u-boot version to use (default / aml / cubox)
+# u-boot version to use (default)
   UBOOT_VERSION="default"
 
 # Configuration for u-boot
diff --git a/projects/Generic/options b/projects/Generic/options
index bb487a9ce6..e65b11de2d 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -97,7 +97,7 @@
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
-# u-boot version to use (default / aml / cubox)
+# u-boot version to use (default)
   UBOOT_VERSION="default"
 
 # Configuration for u-boot
diff --git a/projects/RPi/options b/projects/RPi/options
index 5997f8bb57..36229bfd0e 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -97,7 +97,7 @@
 # Bootloader to use (syslinux / u-boot / atv-bootloader / bcm2835-bootloader)
   BOOTLOADER="bcm2835-bootloader"
 
-# u-boot version to use (default / aml / cubox)
+# u-boot version to use (default)
   UBOOT_VERSION="default"
 
 # Configuration for u-boot
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 370f3e41fe..f7680e2797 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -92,7 +92,7 @@
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
-# u-boot version to use (default / aml / cubox)
+# u-boot version to use (default)
   UBOOT_VERSION="default"
 
 # Configuration for u-boot
diff --git a/tools/mkpkg/mkpkg_u-boot-aml b/tools/mkpkg/mkpkg_u-boot-aml
deleted file mode 100755
index 561d6e2798..0000000000
--- a/tools/mkpkg/mkpkg_u-boot-aml
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d u-boot-aml.git ]; then
-    git clone git://github.com/Pivosgroup/buildroot-uboot.git u-boot-aml.git
-  fi
-
-  cd u-boot-aml.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf u-boot-aml-$GIT_REV
-  cp -R u-boot-aml.git u-boot-aml-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf u-boot-aml-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf u-boot-aml-$GIT_REV.tar.xz u-boot-aml-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf u-boot-aml-$GIT_REV