Merge remote-tracking branch 'upstream/master' into framebuffer-rework

xorg-configure@ should be allowed. so pick the first card

this is still an issue in master branch. depends on  ALL
kernel drm drivers compiled as modules. DO NOT cherry pick

packages/graphics/bcm2835-driver/package.mk

@@ -78,6 +78,6 @@ makeinstall_target() {
 }
 
 post_install() {
-  enable_service fbset.service
+  enable_service fbset.timer
   enable_service unbind-console.service
 }

packages/graphics/bcm2835-driver/system.d/fbset.timer

@@ -0,0 +1,8 @@
+[Unit]
+Description=Framebuffer setup
+
+[Timer]
+OnBootSec=20sec
+
+[Install]
+WantedBy=graphical.target

packages/initramfs/compress/zlib-initramfs/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  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
-################################################################################
-
-PKG_NAME="zlib-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.zlib.net"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain zlib"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/compress"
-PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
-PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/initramfs/linux-initramfs/install

@@ -39,8 +39,3 @@ if [ -n "$INITRAMFS_MODULES" ]; then
   done
 fi
 
-if [ "$UVESAFB_SUPPORT" = yes ]; then
-  mkdir -p $INSTALL/lib/modules
-    uvesafb=`find $LINUX_MODULES_DIR -name uvesafb.ko`
-    cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb`
-fi

packages/initramfs/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="eglibc-initramfs busybox-initramfs linux-initramfs plymouth-lite diskdev_cmds-initramfs"
+PKG_DEPENDS="eglibc-initramfs busybox-initramfs linux-initramfs diskdev_cmds-initramfs"
 PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs"
 PKG_PRIORITY="optional"
 PKG_SECTION="initramfs"

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -100,9 +100,6 @@
         PROGRESS=yes
         INIT_ARGS="$INIT_ARGS --show-status=1"
         ;;
-      nosplash)
-        SPLASH=no
-        ;;
       noram)
         SYSTEM_TORAM=no
         ;;
@@ -361,38 +358,6 @@
     done
   }
 
-  load_splash() {
-    progress "Loading bootsplash"
-
-    if [ ! "$SPLASH" = "no" ]; then
-      SPLASHIMAGE="/splash/splash-full.png"
-
-      # load uvesafb module if needed
-      if [ -f "$MODULE_DIR/uvesafb.ko" -a ! -e /dev/fb0 ]; then
-        progress "Loading kernel module uvesafb.ko"
-          insmod "$MODULE_DIR/uvesafb.ko" || \
-            progress "... Failed to load kernel module uvesafb, skipping"
-
-        # set framebuffer to a default resolution (1024x768-32)
-        if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then
-          fbset -g 1024 768 1024 768 32
-          SPLASHIMAGE="/splash/splash-1024.png"
-        fi
-      fi
-
-      if [ -e /dev/fb0 ]; then
-        # load splash
-        if [ -f /flash/oemsplash.png ]; then
-          SPLASHIMAGE="/flash/oemsplash.png"
-        elif [ -f /splash/splash.conf ]; then
-          . /splash/splash.conf
-        fi
-
-        ply-image $SPLASHIMAGE > /dev/null 2>&1
-      fi
-    fi
-  }
-
   check_disks() {
     progress "Checking disks"
 
@@ -596,7 +561,6 @@
       load_modules \
       check_disks \
       mount_flash \
-      load_splash \
       mount_storage \
       check_update \
       prepare_sysroot; do

packages/initramfs/sysutils/v86d/build

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  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
-
-$SCRIPTS/unpack linux
-
-cd $PKG_BUILD
-./configure --with-x86emu
-
-make

packages/initramfs/sysutils/v86d/install

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  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
-
-mkdir -p $INSTALL/sbin
-  cp -P $PKG_BUILD/v86d $INSTALL/sbin

packages/initramfs/sysutils/v86d/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  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
-################################################################################
-
-PKG_NAME="v86d"
-PKG_VERSION="0.1.10"
-PKG_REV="1"
-PKG_ARCH="i386 x86_64"
-PKG_LICENSE="GPL"
-PKG_SITE="http://dev.gentoo.org/~spock/projects/uvesafb/"
-PKG_URL="http://dev.gentoo.org/~spock/projects/uvesafb/archive/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="v86d: A userspace helper that runs x86 code in an emulated environment."
-PKG_LONGDESC="v86d is the userspace helper that runs x86 code in an emulated environment. uvesafb will not work without v86d. v86d currently supports the x86 and amd64 (x86-64) architectures."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch

@@ -1,12 +0,0 @@
-diff -Naur v86d-0.1.10/libs/x86emu/Makefile v86d-0.1.10.patch/libs/x86emu/Makefile
---- v86d-0.1.10/libs/x86emu/Makefile	2011-02-25 22:27:39.000000000 +0100
-+++ v86d-0.1.10.patch/libs/x86emu/Makefile	2012-06-28 20:15:36.486234182 +0200
-@@ -1,7 +1,7 @@
- OBJS = decode.o fpu.o ops.o ops2.o prim_ops.o sys.o
- 
- libx86emu.a: $(OBJS)
--	ar rv $@ $+
-+	$(AR) rv $@ $+
- 
- %.o: %.c
- 	$(CC) -c $(CFLAGS) -o $@ $<

packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch

@@ -1,18 +0,0 @@
-diff -Naur v86d-0.1.10/Makefile v86d-0.1.10.patch/Makefile
---- v86d-0.1.10/Makefile	2011-02-25 22:27:39.000000000 +0100
-+++ v86d-0.1.10.patch/Makefile	2013-01-14 19:20:13.385465794 +0100
-@@ -3,14 +3,12 @@
- .PHONY: clean install install_testvbe x86emu lrmi
- 
- INSTALL = install
--KDIR   ?= /lib/modules/$(shell uname -r)/source
- 
- ifeq ($(call config_opt,CONFIG_KLIBC),true)
- 	export CC = klcc
- endif
- 
- CFLAGS ?= -Wall -g -O2
--CFLAGS += -I$(KDIR)/include
- 
- ifeq ($(call config_opt,CONFIG_X86EMU),true)
- 	CFLAGS += -Ilibs/x86emu

packages/linux-firmware/misc-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="misc-firmware"
-PKG_VERSION="0.0.6"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/firmware/radeon/LICENSE.radeon

@@ -1,51 +0,0 @@
-Copyright (C) 2009-2013  Advanced Micro Devices, Inc. All rights reserved.
-
-REDISTRIBUTION: Permission is hereby granted, free of any license fees,
-to any person obtaining a copy of this microcode (the "Software"), to
-install, reproduce, copy and distribute copies, in binary form only, of
-the Software and to permit persons to whom the Software is provided to
-do the same, provided that the following conditions are met:
-
-No reverse engineering, decompilation, or disassembly of this Software
-is permitted.
-
-Redistributions must reproduce the above copyright notice, this
-permission notice, and the following disclaimers and notices in the
-Software documentation and/or other materials provided with the
-Software.
-
-DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK.  THE SOFTWARE
-IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
-HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
-MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
-UNINTERRUPTED OR ERROR-FREE.  THE ENTIRE RISK ASSOCIATED WITH THE USE OF
-THE SOFTWARE IS ASSUMED BY YOU.  FURTHERMORE, COPYRIGHT HOLDER AND ITS
-LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
-OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
-ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
-
-DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
-HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
-("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
-PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
-LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
-BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
-INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
-PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
-REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  IN
-NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
-LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
-CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
-US$10.
-
-Notice:  The Software is subject to United States export laws and
-regulations.  You agree to comply with all domestic and international
-export laws and regulations that apply to the Software, including but
-not limited to the Export Administration Regulations administered by the
-U.S. Department of Commerce and International Traffic in Arm Regulations
-administered by the U.S. Department of State.  These laws include
-restrictions on destinations, end users and end use.