Merge remote-tracking branch 'upstream/master' into openelec-settings

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="ce9dbf9"
+PKG_VERSION="73d99ed"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux-drivers/RTL8192CU/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="RTL8192CU"
-PKG_VERSION="v3.4.3_4369.20120622"
+PKG_VERSION="v3.4.4_4749.20121105"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt

@@ -30,7 +30,7 @@
   gpu_mem=128
 
 # SDRAM size based GPU memory split, uncomment and setup to override 'gpu_mem'
-# gpu_mem_256=128
+# gpu_mem_256=100
 # gpu_mem_512=128
 
 ################################################################################

packages/tools/bcm2835-bootloader/install

@@ -26,7 +26,9 @@ mkdir -p $INSTALL/usr/share/bootloader
   cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader
   cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader
   cp $PKG_BUILD/fixup.dat $INSTALL/usr/share/bootloader
+  cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader
   cp $PKG_BUILD/start.elf $INSTALL/usr/share/bootloader
+  cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader
 
   cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
   cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="ce9dbf9"
+PKG_VERSION="73d99ed"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/tools/bcm2835-bootloader/scripts/update.sh

@@ -30,7 +30,9 @@
   cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
   cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
   cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
+  cp $SYSTEM_ROOT/usr/share/bootloader/fixup_x.dat $BOOT_ROOT
   cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
+  cp $SYSTEM_ROOT/usr/share/bootloader/start_x.elf $BOOT_ROOT
 
 # cleanup not more needed files
   rm -rf $BOOT_ROOT/loader.bin
@@ -42,6 +44,9 @@
     mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk
     cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \
         $BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt
+  else
+    sed -e "s,# gpu_mem_256=128,gpu_mem_256=100,g" -i $BOOT_ROOT/config.txt
+    sed -e "s,# gpu_mem_512=128,gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
   fi
 
 # mount $BOOT_ROOT r/o

projects/RPi/linux/linux.arm.conf

@@ -930,6 +930,7 @@ CONFIG_ATH9K_HTC=m
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_SDIO is not set
 CONFIG_ATH6KL_USB=m
@@ -942,6 +943,7 @@ CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
 # CONFIG_B43_PHY_HT is not set
 CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
 # CONFIG_B43_DEBUG is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_BRCMFMAC is not set
@@ -1064,7 +1066,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+CONFIG_HW_RANDOM_BCM2708=y
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set