diff --git a/packages/tools/atv-bootloader/package.mk b/packages/tools/atv-bootloader/package.mk deleted file mode 100644 index c8d64f2f43..0000000000 --- a/packages/tools/atv-bootloader/package.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -PKG_NAME="atv-bootloader" -PKG_VERSION="r520" -PKG_REV="1" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="GPL" -PKG_SITE="http://code.google.com/p/atv-bootloader/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain atvboot darwin-cross linux" -PKG_PRIORITY="optional" -PKG_SECTION="tools" -PKG_SHORTDESC="atv-bootloader: Tool to create a mach_kernel compaitible kernel image" -PKG_LONGDESC="atv-bootloader which uses principals from mach_linux_boot to boot a compiled-in Linux kernel" - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -PKG_MAKE_OPTS_TARGET="KERN_OBJ=vmlinuz.obj \ - CC=$ROOT/$TOOLCHAIN/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1 \ - LD=$ROOT/$TOOLCHAIN/darwin-cross/bin/i386-apple-darwin8-ld" - -pre_make_target() { - unset LDFLAGS - - rm -rf mach_kernel vmlinuz initrd.gz - cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz - - make clean -} - -makeinstall_target() { - : # nothing todo -} diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch deleted file mode 100644 index b3401e8dd2..0000000000 --- a/packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- atv-bootloader-r518/console.c.orig 2011-05-19 22:48:42.582001582 -0600 -+++ atv-bootloader-r518/console.c 2011-05-19 22:49:31.014001622 -0600 -@@ -600,20 +600,7 @@ - } - - int printk(const char *szFormat, ...) { // printk displays to video -- char szBuffer[512*2]; -- u16 wLength=0; -- va_list argList; -- -- va_start(argList, szFormat); -- wLength=(u16) vsprintf(szBuffer, szFormat, argList); -- va_end(argList); -- -- szBuffer[sizeof(szBuffer)-1]=0; -- if (wLength>(sizeof(szBuffer)-1)) wLength = sizeof(szBuffer)-1; -- szBuffer[wLength]='\0'; -- -- BootVideoChunkedPrint(szBuffer); -- return wLength; -+ return 0; - } - - int console_putchar(int c) diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options index ff0cbc6e81..f752761ad0 100644 --- a/projects/Cuboxi/options +++ b/projects/Cuboxi/options @@ -79,7 +79,7 @@ # GOLD (Google Linker) support GOLD_SUPPORT="yes" -# Bootloader to use (syslinux / u-boot / atv-bootloader / bcm2835-bootloader) +# Bootloader to use (syslinux / u-boot / bcm2835-bootloader) BOOTLOADER="u-boot" # u-boot version to use (default) diff --git a/projects/Generic/options b/projects/Generic/options index 42624edea9..a5f2de4fb8 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -79,7 +79,7 @@ # GOLD (Google Linker) support GOLD_SUPPORT="yes" -# Bootloader to use (syslinux / u-boot / atv-bootloader) +# Bootloader to use (syslinux / u-boot) BOOTLOADER="syslinux" # u-boot version to use (default) diff --git a/projects/RPi/options b/projects/RPi/options index aa20593e66..14e32df350 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -79,7 +79,7 @@ # GOLD (Google Linker) support GOLD_SUPPORT="yes" -# Bootloader to use (syslinux / u-boot / atv-bootloader / bcm2835-bootloader) +# Bootloader to use (syslinux / u-boot / bcm2835-bootloader) BOOTLOADER="bcm2835-bootloader" # u-boot version to use (default) diff --git a/scripts/image b/scripts/image index 98b39544d2..9bd65b7a8b 100755 --- a/scripts/image +++ b/scripts/image @@ -202,13 +202,8 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" KERNEL_ARCH="arm" fi - if [ "$BOOTLOADER" = "atv-bootloader" ]; then - cp -PR $BUILD/atv-bootloader-*/mach_kernel $TARGET_IMG/$IMAGE_NAME.mach_kernel - chmod 0644 $TARGET_IMG/$IMAGE_NAME.mach_kernel - else - cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel - chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel - fi + cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel + chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel # create squashfs file if [ -z "$SQUASHFS_COMPRESSION" ]; then @@ -290,16 +285,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME # create image files if requested - if [ "$1" = "mkimage" -a "$BOOTLOADER" = "atv-bootloader" ]; then - # variables used in image script must be passed - sudo env \ - ROOT="$ROOT" \ - BUILD="$BUILD" \ - RELEASE_DIR="$RELEASE_DIR" \ - TARGET_IMG="$TARGET_IMG" \ - IMAGE_NAME="$IMAGE_NAME" \ - $SCRIPTS/mkimage-atv - elif [ "$1" = "mkimage" -a -n "$BOOTLOADER" ]; then + if [ "$1" = "mkimage" -a -n "$BOOTLOADER" ]; then if [ "$2" == "efi" ] ; then UEFI=yes fi