add CuBox support, update package with last bootloader support changes

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/functions

@@ -335,7 +335,10 @@ show_config() {
   config_message="$config_message\n - Default Hostname:\t\t\t $HOSTNAME"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
+if [ "$BOOTLOADER" = "u-boot" ]; then
   config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
+  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
+fi
   config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
   config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
   config_message="$config_message\n - Update support:\t\t\t $UPDATE_SUPPORT"

packages/tools/u-boot/build

@@ -35,9 +35,13 @@ if [ -z "$UBOOT_CONFIG" ]; then
   exit 1
 fi
 
+if [ -z "$UBOOT_CONFIGFILE" ]; then
+  UBOOT_CONFIGFILE="boot.scr"
+fi
+
 cd $PKG_BUILD
 
-make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" "$UBOOT_CONFIG"
+make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" $UBOOT_CONFIG
 make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" HOSTCC="$HOST_CC" HOSTSTRIP="true"
 
 mkdir -p $ROOT/$TOOLCHAIN/bin
@@ -51,5 +55,5 @@ if [ -r "$BOOT_CFG" ]; then
           -C none \
           -n "$DISTRONAME Boot" \
           -d boot.cfg \
-          boot.ini
+          $UBOOT_CONFIGFILE
 fi

packages/tools/u-boot/install

@@ -22,6 +22,10 @@
 
 . config/options $1
 
+if [ -z "$UBOOT_CONFIGFILE" ]; then
+  UBOOT_CONFIGFILE="boot.scr"
+fi
+
 mkdir -p $INSTALL/usr/share/u-boot
   cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot
 
@@ -33,8 +37,6 @@ if [ -f "$PKG_BUILD/boot.cfg" ]; then
   cp $PKG_BUILD/boot.cfg $INSTALL/usr/share/u-boot
 fi
 
-if [ -f "$PKG_BUILD/boot.ini" ]; then
-  cp $PKG_BUILD/boot.ini $INSTALL/usr/share/u-boot
-  # some boards read boot.scr by default
-  cp $PKG_BUILD/boot.ini $INSTALL/usr/share/u-boot/boot.scr
+if [ -f "$PKG_BUILD/$UBOOT_CONFIGFILE" ]; then
+  cp $PKG_BUILD/$UBOOT_CONFIGFILE $INSTALL/usr/share/u-boot
 fi

packages/tools/u-boot/meta

@@ -34,3 +34,9 @@ PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems, us
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+if [ "$PROJECT" = "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"
+fi

packages/tools/u-boot/release

@@ -0,0 +1,30 @@
+#!/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
+################################################################################
+
+. config/options $1
+
+if [ -z "$UBOOT_CONFIGFILE" ]; then
+  UBOOT_CONFIGFILE="boot.scr"
+fi
+
+mkdir -p $RELEASE_DIR/3rdparty/bootloader
+  cp -PR $BUILD/u-boot-*/$UBOOT_CONFIGFILE $RELEASE_DIR/3rdparty/bootloader

projects/ATV/options

@@ -92,6 +92,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/Fusion/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/Generic/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/Generic_OSS/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/ION/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/Intel/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/RPi/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/Ultra/options

@@ -91,6 +91,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel

projects/Virtual/options

@@ -86,6 +86,9 @@
 # Configuration for u-boot
   UBOOT_CONFIG=""
 
+# Target Configfile for u-boot
+  UBOOT_CONFIGFILE=""
+
 # Kernel to use. values can be:
 # default:  default mainline kernel
 # ti-omap4: Ti's OMAP4 kernel