Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="99a37d1"
+PKG_VERSION="afc05b9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/mediacenter/xbmc-addon-xvdr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-xvdr"
-PKG_VERSION="e490332"
+PKG_VERSION="10980dc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-pvr-addons/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-addons"
-PKG_VERSION="e3c185b"
+PKG_VERSION="2eaf9a2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="f14f5a5"
+PKG_VERSION="0a59a1f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="f14f5a5"
+PKG_VERSION="0a59a1f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="99a37d1"
+PKG_VERSION="afc05b9"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/tools/syslinux/files/create_virtualimage

@@ -20,46 +20,56 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-# usage:   sudo ./create_virtualmachine <path> <size(MB)> [<type>] 
-# example: sudo ./create_virtualmachine /home/test/VM 512 [vdi]
+# usage:   sudo ./create_virtualmachine <path> <size(MB)> [<type>] [system partition size(MB)]
+# example: sudo ./create_virtualmachine /home/test/VM 512 [vdi] [128]
 
 if [ "$(id -u)" != "0" ]; then
   clear
-  echo "###########################################################"
-  echo "# please execute with 'sudo' or -DANGEROUS!!!- as root    #"
-  echo "# example:                                                #"
-  echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
-  echo "###########################################################"
+  echo "##############################################################"
+  echo "# please execute with 'sudo' or -DANGEROUS!!!- as root       #"
+  echo "# example:                                                   #"
+  echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>]    #"
+  echo "##############################################################"
   exit 1
 fi
 
 if [ -z "$1" -o -z "$2" ]; then
   clear
-  echo "###########################################################"
-  echo "# please execute as follows                               #"
-  echo "# example:                                                #"
-  echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
-  echo "###########################################################"
+  echo "##############################################################"
+  echo "# please execute as follows                                  #"
+  echo "# example:                                                   #"
+  echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>]    #"
+  echo "##############################################################"
+  exit 1
+fi
+
+if [ ! -d "$1" ]; then
+  clear
+  echo "##############################################################"
+  echo "# please create target directory                             #"
+  echo "# example:                                                   #"
+  echo "# mkdir <path>                                               #"
+  echo "##############################################################"
   exit 1
 fi
 
 if [ "$2" -lt "200" -o "$2" -gt "2048" ]; then
   clear
-  echo "#########################################################"
-  echo "# use a value between 200MB and 2048MB (2GB)            #"
-  echo "# example:                                              #"
-  echo "# sudo ./create_virtualmachine /home/test/VM 512        #"
-  echo "#########################################################"
+  echo "##############################################################"
+  echo "# use a value between 200MB and 2048MB (2GB)                 #"
+  echo "# example:                                                   #"
+  echo "# sudo ./create_virtualmachine /home/test/VM 512             #"
+  echo "##############################################################"
   exit 1
 fi
 
 if [ ! -z "$3" -a "$3" != "vdi" -a "$3" != "vmdk" ]; then
   clear
-  echo "#########################################################"
-  echo "# only vdi or vmdk types are supported                  #"
-  echo "# example:                                              #"
-  echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi]  #"
-  echo "#########################################################"
+  echo "##############################################################"
+  echo "# only vdi or vmdk types are supported                       #"
+  echo "# example:                                                   #"
+  echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi]       #"
+  echo "##############################################################"
   exit 1
 elif [ "$3" = "vdi" ]; then
   TYPE="vdi"
@@ -67,9 +77,21 @@ elif [ -z "$3" -o "$3" = "vmdk" ]; then
   TYPE="vmdk"
 fi
 
+if [ "$4" -lt "128" -o "$4" -gt "1024" -o "$4" -gt "$2" ]; then
+  clear
+  echo "##############################################################"
+  echo "# use a value between 128MB and 1024MB                       #"
+  echo "# example:                                                   #"
+  echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi] [256] #"
+  echo "##############################################################"
+  exit 1
+fi
+
+
 DISK="$1/OpenELEC.img"
 IMAGE="$1/OpenELEC.$TYPE"
 LOOP=$(losetup -f)
+SYSTEM_PART_SIZE=$(( $4 / 8 ))
 
 clear
 echo "#########################################################"
@@ -101,6 +123,22 @@ echo "#########################################################"
     exit 1
   fi
 
+  # this is needed to create a bootloader
+  which extlinux > /dev/null
+  if [ "$?" = "1" ]; then
+    clear
+    echo "#########################################################"
+    echo "#                                                       #"
+    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "#                                                       #"
+    echo "#      We can't find the required tool \"extlinux\"     #"
+    echo "#      on your system.                                  #"
+    echo "#      Please install it via your package manager.      #"
+    echo "#                                                       #"
+    echo "#########################################################"
+    exit 1
+  fi
+
   # this is needed by syslinux
   which mcopy > /dev/null
     if [ "$?" = "1" ]; then
@@ -185,7 +223,7 @@ echo "#########################################################"
 
 # create an image
   echo "creating new empty harddisk image: $DISK..."
-  dd if=/dev/zero of="$DISK" bs=1M count=1024
+  dd if=/dev/zero of="$DISK" bs=1M count="$2"
 
 # write a disklabel
   echo "creating new partition table: $DISK..."
@@ -194,11 +232,11 @@ echo "#########################################################"
 
 # create partition1
   echo "creating partition1 on $DISK..."
-  parted -s "$LOOP" unit cyl mkpart primary ext2 -- 0 16
+  parted -s "$LOOP" unit cyl mkpart primary ext2 -- 0 "$SYSTEM_PART_SIZE"
 
 # create partition2
   echo "creating partition2 on $DISK..."
-  parted -s "$LOOP" unit cyl mkpart primary ext2 -- 16 -2
+  parted -s "$LOOP" unit cyl mkpart primary ext2 -- "$(( $SYSTEM_PART_SIZE + 1 ))" -2
   
 # make partition1 active (bootable)
   echo "marking partition1 active..."

projects/RPi/linux/linux.arm.conf

@@ -312,6 +312,7 @@ CONFIG_MACH_BCM2708=y
 CONFIG_BCM2708_GPIO=y
 CONFIG_BCM2708_VCMEM=y
 # CONFIG_BCM2708_NOL2CACHE is not set
+CONFIG_BCM2708_DMAER=y
 
 #
 # Processor Type
@@ -378,9 +379,11 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_COMPACTION is not set
+CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
@@ -687,7 +690,19 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_CMA is not set
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@@ -1039,6 +1054,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_BRCM_CHAR_DRIVERS=y
+CONFIG_BCM_VC_CMA=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_COMPAT is not set