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

packages/3rdparty/driver/sundtek/meta

@@ -19,9 +19,9 @@
 ################################################################################
 
 PKG_NAME="sundtek"
-PKG_VERSION="20120525"
+PKG_VERSION="20120912"
 PKG_REV="0"
-PKG_ARCH="i386 x86_64"
+PKG_ARCH="i386 x86_64 arm"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${ARCH}.tar.gz"

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,6 @@
+2.1.4
+  support for Raspberry Pi
+
 2.1.3
   support for network tuner
   

packages/addons/driver/sundtek-mediatv/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="2.0"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="05bb1ec"
+PKG_VERSION="b616053"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux/patches/linux-3.2.28-601-RPi_support-e33263e.patch

@@ -2642,10 +2642,10 @@ index 0000000..0aa916e
 +#endif
 diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
 new file mode 100644
-index 0000000..6f63532
+index 0000000..b3dbbd1
 --- /dev/null
 +++ b/arch/arm/mach-bcm2708/bcm2708.c
-@@ -0,0 +1,814 @@
+@@ -0,0 +1,825 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708.c
 + *
@@ -3240,6 +3240,14 @@ index 0000000..6f63532
 +	.resource = bcm2708_bsc1_resources,
 +};
 +
++static struct platform_device bcm2835_hwmon_device = {
++	.name = "bcm2835_hwmon",
++};
++
++static struct platform_device bcm2835_thermal_device = {
++	.name = "bcm2835_thermal",
++};
++
 +int __init bcm_register_device(struct platform_device *pdev)
 +{
 +	int ret;
@@ -3304,6 +3312,9 @@ index 0000000..6f63532
 +	bcm_register_device(&bcm2708_bsc0_device);
 +	bcm_register_device(&bcm2708_bsc1_device);
 +
++	bcm_register_device(&bcm2835_hwmon_device);
++	bcm_register_device(&bcm2835_thermal_device);
++
 +#ifdef CONFIG_BCM2708_VCMEM
 +	{
 +		extern void vc_mem_connected_init(void);
@@ -7503,6 +7514,255 @@ index 0000000..aa6fc66
 +module_init(bcm2835_cpufreq_module_init);
 +module_exit(bcm2835_cpufreq_module_exit);
 +
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 83e3e9d..761b528 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -1361,6 +1361,15 @@ config SENSORS_MC13783_ADC
+         help
+           Support for the A/D converter on MC13783 PMIC.
+ 
++config SENSORS_BCM2835
++	tristate "Broadcom BCM2835 HWMON Driver"
++	help
++	  If you say yes here you get support for the hardware
++	  monitoring features of the BCM2835 Chip
++
++	  This driver can also be built as a module.  If so, the module
++	  will be called bcm2835-hwmon.
++
+ if ACPI
+ 
+ comment "ACPI drivers"
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 8251ce8..8f2743b 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -125,6 +125,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l785ts.o
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_BCM2835)	+= bcm2835-hwmon.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+diff --git a/drivers/hwmon/bcm2835-hwmon.c b/drivers/hwmon/bcm2835-hwmon.c
+new file mode 100644
+index 0000000..4976387
+--- /dev/null
++++ b/drivers/hwmon/bcm2835-hwmon.c
+@@ -0,0 +1,211 @@
++//bcm2835-hwmon.c
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/platform_device.h>
++#include <linux/sysfs.h>
++#include <mach/vcio.h>
++#include <linux/slab.h>
++#include <linux/err.h>
++
++#define MODULE_NAME "bcm2835_hwmon"
++
++/*#define HWMON_DEBUG_ENABLE*/
++
++#ifdef HWMON_DEBUG_ENABLE
++#define print_debug(fmt,...) printk(KERN_INFO "%s:%s:%d: "fmt"\n", MODULE_NAME, __func__, __LINE__, ##__VA_ARGS__)
++#else
++#define print_debug(fmt,...)
++#endif
++#define print_err(fmt,...) printk(KERN_ERR "%s:%s:%d: "fmt"\n", MODULE_NAME, __func__,__LINE__, ##__VA_ARGS__)
++#define print_info(fmt,...) printk(KERN_INFO "%s: "fmt"\n", MODULE_NAME, ##__VA_ARGS__)
++
++#define VC_TAG_GET_TEMP 0x00030006
++#define VC_TAG_GET_MAX_TEMP 0x0003000A
++struct bcm2835_hwmon_data {
++	struct device *hwmon_dev;
++};
++
++/* --- STRUCTS --- */
++
++/* tag part of the message */
++struct vc_msg_tag {
++	uint32_t tag_id;		/* the tag ID for the temperature */
++	uint32_t buffer_size;	/* size of the buffer (should be 8) */
++	uint32_t request_code;	/* identifies message as a request (should be 0) */
++	uint32_t id;			/* extra ID field (should be 0) */
++	uint32_t val;			/* returned value of the temperature */
++};
++
++/* message structure to be sent to videocore */
++struct vc_msg {
++	uint32_t msg_size;		/* simply, sizeof(struct vc_msg) */
++	uint32_t request_code;		/* holds various information like the success and number of bytes returned (refer to mailboxes wiki) */
++	struct vc_msg_tag tag;		/* the tag structure above to make */
++	uint32_t end_tag;		/* an end identifier, should be set to NULL */
++};
++
++typedef enum {
++	TEMP,
++	MAX_TEMP,
++} temp_type;
++
++/* --- PROTOTYPES --- */
++static ssize_t bcm2835_get_temp(struct device *dev, struct device_attribute *attr, char *buf);
++static ssize_t bcm2835_get_name(struct device *dev, struct device_attribute *attr, char *buf);
++
++/* --- GLOBALS --- */
++
++static struct bcm2835_hwmon_data *bcm2835_data;
++static struct platform_driver bcm2835_hwmon_driver;
++
++static SENSOR_DEVICE_ATTR(name, S_IRUGO,bcm2835_get_name,NULL,0);
++static SENSOR_DEVICE_ATTR(temp1_input,S_IRUGO,bcm2835_get_temp,NULL,TEMP);
++static SENSOR_DEVICE_ATTR(temp,S_IRUGO,bcm2835_get_temp,NULL,TEMP);
++static SENSOR_DEVICE_ATTR(temp1_max,S_IRUGO,bcm2835_get_temp,NULL,MAX_TEMP);
++static SENSOR_DEVICE_ATTR(trip_point_0_temp,S_IRUGO,bcm2835_get_temp,NULL,MAX_TEMP);
++
++static struct attribute* bcm2835_attributes[] = {
++	&sensor_dev_attr_name.dev_attr.attr,
++	&sensor_dev_attr_temp1_input.dev_attr.attr,
++	&sensor_dev_attr_temp1_max.dev_attr.attr,
++	&sensor_dev_attr_temp.dev_attr.attr,
++	&sensor_dev_attr_trip_point_0_temp.dev_attr.attr,
++	NULL,
++};
++
++static struct attribute_group bcm2835_attr_group = {
++	.attrs = bcm2835_attributes,
++};
++
++/* --- FUNCTIONS --- */
++
++static ssize_t bcm2835_get_name(struct device *dev, struct device_attribute *attr, char *buf)
++{
++	return sprintf(buf,"bcm2835_hwmon\n");
++}
++
++static ssize_t bcm2835_get_temp(struct device *dev, struct device_attribute *attr, char *buf)
++{
++	struct vc_msg msg;
++	int result;
++	uint temp = 0;
++	int index = ((struct sensor_device_attribute*)to_sensor_dev_attr(attr))->index;
++
++	print_debug("IN");
++
++	/* wipe all previous message data */
++	memset(&msg, 0, sizeof msg);
++
++	/* determine the message type */
++	if(index == TEMP)
++		msg.tag.tag_id = VC_TAG_GET_TEMP;
++	else if (index == MAX_TEMP)
++		msg.tag.tag_id = VC_TAG_GET_MAX_TEMP;
++	else
++	{
++		print_debug("Unknown temperature message!");
++		return -EINVAL;
++	}
++
++	msg.msg_size = sizeof msg;
++	msg.tag.buffer_size = 8;
++
++	/* send the message */
++	result = bcm_mailbox_property(&msg, sizeof msg);
++
++	/* check if it was all ok and return the rate in milli degrees C */
++	if (result == 0 && (msg.request_code & 0x80000000))
++		temp = (uint)msg.tag.val;
++	#ifdef HWMON_DEBUG_ENABLE
++	else
++		print_debug("Failed to get temperature!");
++	#endif
++	print_debug("Got temperature as %u",temp);
++	print_debug("OUT");
++	return sprintf(buf, "%u\n", temp);
++}
++
++
++static int bcm2835_hwmon_probe(struct platform_device *pdev)
++{
++	int err;
++
++	print_debug("IN");
++	print_debug("HWMON Driver has been probed!");
++
++	/* check that the device isn't null!*/
++	if(pdev == NULL)
++	{
++		print_debug("Platform device is empty!");
++		return -ENODEV;
++	}
++
++	/* allocate memory for neccessary data */
++	bcm2835_data = kzalloc(sizeof(struct bcm2835_hwmon_data),GFP_KERNEL);
++	if(!bcm2835_data)
++	{
++		print_debug("Unable to allocate memory for hwmon data!");
++		err = -ENOMEM;
++		goto kzalloc_error;
++	}
++
++	/* create the sysfs files */
++	if(sysfs_create_group(&pdev->dev.kobj, &bcm2835_attr_group))
++	{
++		print_debug("Unable to create sysfs files!");
++		err = -EFAULT;
++		goto sysfs_error;
++	}
++
++	/* register the hwmon device */
++	bcm2835_data->hwmon_dev = hwmon_device_register(&pdev->dev);
++	if (IS_ERR(bcm2835_data->hwmon_dev))
++	{
++		err = PTR_ERR(bcm2835_data->hwmon_dev);
++		goto hwmon_error;
++	}
++	print_debug("OUT");
++	return 0;
++
++	/* error goto's */
++	hwmon_error:
++	sysfs_remove_group(&pdev->dev.kobj, &bcm2835_attr_group);
++
++	sysfs_error:
++	kfree(bcm2835_data);
++
++	kzalloc_error:
++
++	return err;
++
++}
++
++static int bcm2835_hwmon_remove(struct platform_device *pdev)
++{
++	print_debug("IN");
++	hwmon_device_unregister(bcm2835_data->hwmon_dev);
++
++	sysfs_remove_group(&pdev->dev.kobj, &bcm2835_attr_group);
++	print_debug("OUT");
++	return 0;
++}
++
++/* Hwmon Driver */
++static struct platform_driver bcm2835_hwmon_driver = {
++	.probe = bcm2835_hwmon_probe,
++	.remove = bcm2835_hwmon_remove,
++	.driver = {
++				.name = "bcm2835_hwmon",
++				.owner = THIS_MODULE,
++			},
++};
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Dorian Peake");
++MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip");
++
++module_platform_driver(bcm2835_hwmon_driver);
 diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
 index a3afac4..cbc62ff 100644
 --- a/drivers/i2c/busses/Kconfig
@@ -32058,6 +32318,234 @@ index 0000000..ef8fef0
 +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:" DRV_NAME);
+diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
+index f7f71b2..a5017b4 100644
+--- a/drivers/thermal/Kconfig
++++ b/drivers/thermal/Kconfig
+@@ -18,3 +18,13 @@ config THERMAL_HWMON
+ 	depends on THERMAL
+ 	depends on HWMON=y || HWMON=THERMAL
+ 	default y
++
++if THERMAL
++
++config THERMAL_BCM2835
++	tristate "BCM2835 Thermal Driver"
++	help
++	  This will enable temperature monitoring for the Broadcom BCM2835
++	  chip. If built as a module, it will be called 'bcm2835-thermal'.
++
++endif # THERMAL_BCM2835
+diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
+index 31108a0..48081d1 100644
+--- a/drivers/thermal/Makefile
++++ b/drivers/thermal/Makefile
+@@ -3,3 +3,4 @@
+ #
+ 
+ obj-$(CONFIG_THERMAL)		+= thermal_sys.o
++obj-$(CONFIG_THERMAL_BCM2835)	+= bcm2835-thermal.o
+diff --git a/drivers/thermal/bcm2835-thermal.c b/drivers/thermal/bcm2835-thermal.c
+new file mode 100644
+index 0000000..c6420de
+--- /dev/null
++++ b/drivers/thermal/bcm2835-thermal.c
+@@ -0,0 +1,195 @@
++//bcm2835-thermal.c
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++#include <linux/sysfs.h>
++#include <mach/vcio.h>
++#include <linux/thermal.h>
++
++
++/* --- DEFINITIONS --- */
++#define MODULE_NAME "bcm2835_thermal"
++
++/*#define THERMAL_DEBUG_ENABLE*/
++
++#ifdef THERMAL_DEBUG_ENABLE
++#define print_debug(fmt,...) printk(KERN_INFO "%s:%s:%d: "fmt"\n", MODULE_NAME, __func__, __LINE__, ##__VA_ARGS__)
++#else
++#define print_debug(fmt,...)
++#endif
++#define print_err(fmt,...) printk(KERN_ERR "%s:%s:%d: "fmt"\n", MODULE_NAME, __func__,__LINE__, ##__VA_ARGS__)
++#define print_info(fmt,...) printk(KERN_INFO "%s: "fmt"\n", MODULE_NAME, ##__VA_ARGS__)
++
++#define VC_TAG_GET_TEMP 0x00030006
++#define VC_TAG_GET_MAX_TEMP 0x0003000A
++
++typedef enum {
++	TEMP,
++	MAX_TEMP,
++} temp_type;
++
++/* --- STRUCTS --- */
++/* tag part of the message */
++struct vc_msg_tag {
++	uint32_t tag_id;		/* the tag ID for the temperature */
++	uint32_t buffer_size;	/* size of the buffer (should be 8) */
++	uint32_t request_code;	/* identifies message as a request (should be 0) */
++	uint32_t id;			/* extra ID field (should be 0) */
++	uint32_t val;			/* returned value of the temperature */
++};
++
++/* message structure to be sent to videocore */
++struct vc_msg {
++	uint32_t msg_size;		/* simply, sizeof(struct vc_msg) */
++	uint32_t request_code;		/* holds various information like the success and number of bytes returned (refer to mailboxes wiki) */
++	struct vc_msg_tag tag;		/* the tag structure above to make */
++	uint32_t end_tag;		/* an end identifier, should be set to NULL */
++};
++
++struct bcm2835_thermal_data {
++	struct thermal_zone_device *thermal_dev;
++	struct vc_msg msg;
++};
++
++/* --- PROTOTYPES --- */
++static int bcm2835_get_temp(struct thermal_zone_device *thermal_dev, unsigned long *);
++static int bcm2835_get_max_temp(struct thermal_zone_device *thermal_dev, int, unsigned long *);
++static int bcm2835_get_trip_type(struct thermal_zone_device *thermal_dev, int trip_num, enum thermal_trip_type *trip_type);
++static int bcm2835_get_mode(struct thermal_zone_device *thermal_dev, enum thermal_device_mode *dev_mode);
++
++/* --- GLOBALS --- */
++static struct bcm2835_thermal_data bcm2835_data;
++
++/* Thermal Device Operations */
++static struct thermal_zone_device_ops ops;
++
++/* --- FUNCTIONS --- */
++static int bcm2835_get_max_temp(struct thermal_zone_device *thermal_dev, int trip_num, unsigned long *temp)
++{
++	int result;
++
++	print_debug("IN");
++
++	/* wipe all previous message data */
++	memset(&bcm2835_data.msg, 0, sizeof bcm2835_data.msg);
++
++	/* prepare message */
++	bcm2835_data.msg.msg_size = sizeof bcm2835_data.msg;
++	bcm2835_data.msg.tag.buffer_size = 8;
++	bcm2835_data.msg.tag.tag_id = VC_TAG_GET_MAX_TEMP;
++
++	/* send the message */
++	result = bcm_mailbox_property(&bcm2835_data.msg, sizeof bcm2835_data.msg);
++
++	/* check if it was all ok and return the rate in milli degrees C */
++	if (result == 0 && (bcm2835_data.msg.request_code & 0x80000000))
++		*temp = (uint)bcm2835_data.msg.tag.val;
++	#ifdef THERMAL_DEBUG_ENABLE
++	else
++		print_debug("Failed to get temperature!");
++	#endif
++	print_debug("Got temperature as %u",(uint)*temp);
++	print_debug("OUT");
++	return 0;
++}
++
++static int bcm2835_get_temp(struct thermal_zone_device *thermal_dev, unsigned long *temp)
++{
++	int result;
++
++	print_debug("IN");
++
++	/* wipe all previous message data */
++	memset(&bcm2835_data.msg, 0, sizeof bcm2835_data.msg);
++
++	/* prepare message */
++	bcm2835_data.msg.msg_size = sizeof bcm2835_data.msg;
++	bcm2835_data.msg.tag.buffer_size = 8;
++	bcm2835_data.msg.tag.tag_id = VC_TAG_GET_TEMP;
++
++	/* send the message */
++	result = bcm_mailbox_property(&bcm2835_data.msg, sizeof bcm2835_data.msg);
++
++	/* check if it was all ok and return the rate in milli degrees C */
++	if (result == 0 && (bcm2835_data.msg.request_code & 0x80000000))
++		*temp = (uint)bcm2835_data.msg.tag.val;
++	#ifdef THERMAL_DEBUG_ENABLE
++	else
++		print_debug("Failed to get temperature!");
++	#endif
++	print_debug("Got temperature as %u",(uint)*temp);
++	print_debug("OUT");
++	return 0;
++}
++
++
++static int bcm2835_get_trip_type(struct thermal_zone_device * thermal_dev, int trip_num, enum thermal_trip_type *trip_type)
++{
++	*trip_type = THERMAL_TRIP_HOT;
++	return 0;
++}
++
++
++static int bcm2835_get_mode(struct thermal_zone_device *thermal_dev, enum thermal_device_mode *dev_mode)
++{
++	*dev_mode = THERMAL_DEVICE_ENABLED;
++	return 0;
++}
++
++
++static int bcm2835_thermal_probe(struct platform_device *pdev)
++{
++	print_debug("IN");
++	print_debug("THERMAL Driver has been probed!");
++
++	/* check that the device isn't null!*/
++	if(pdev == NULL)
++	{
++		print_debug("Platform device is empty!");
++		return -ENODEV;
++	}
++
++	if(!(bcm2835_data.thermal_dev = thermal_zone_device_register("bcm2835_thermal",	1, NULL, &ops,1,1,1000,1000)))
++	{
++		print_debug("Unable to register the thermal device!");
++		return -EFAULT;
++	}
++	return 0;
++}
++
++
++static int bcm2835_thermal_remove(struct platform_device *pdev)
++{
++	print_debug("IN");
++
++	thermal_zone_device_unregister(bcm2835_data.thermal_dev);
++
++	print_debug("OUT");
++
++	return 0;
++}
++
++static struct thermal_zone_device_ops ops  = {
++	.get_temp = bcm2835_get_temp,
++	.get_trip_temp = bcm2835_get_max_temp,
++	.get_trip_type = bcm2835_get_trip_type,
++	.get_mode = bcm2835_get_mode,
++};
++
++/* Thermal Driver */
++static struct platform_driver bcm2835_thermal_driver = {
++	.probe = bcm2835_thermal_probe,
++	.remove = bcm2835_thermal_remove,
++	.driver = {
++				.name = "bcm2835_thermal",
++				.owner = THIS_MODULE,
++			},
++};
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Dorian Peake");
++MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
++
++module_platform_driver(bcm2835_thermal_driver);
 diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
 index 75eca76..a6b7e41 100644
 --- a/drivers/usb/Makefile
@@ -60702,10 +61190,10 @@ index 0000000..2ff1532
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
 new file mode 100644
-index 0000000..b618f4b
+index 0000000..d5d8c4b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
-@@ -0,0 +1,1727 @@
+@@ -0,0 +1,1732 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
 + * $Revision: #92 $
@@ -60949,7 +61437,10 @@ index 0000000..b618f4b
 +};
 +
 +//Global variable to switch the fiq fix on or off
-+bool fiq_fix_enable = false;
++bool fiq_fix_enable = true;
++
++//Global variable to switch the nak holdoff on or off
++bool nak_holdoff_enable = true;
 +
 +
 +/**
@@ -61794,6 +62285,7 @@ index 0000000..b618f4b
 +		return retval;
 +	}
 +	printk(KERN_DEBUG "dwc_otg: FIQ %s\n", fiq_fix_enable ? "enabled":"disabled");
++	printk(KERN_DEBUG "dwc_otg: NAK holdoff %s\n", nak_holdoff_enable ? "enabled":"disabled");
 +
 +	error = driver_create_file(drv, &driver_attr_version);
 +#ifdef DEBUG
@@ -62074,9 +62566,10 @@ index 0000000..b618f4b
 +module_param(microframe_schedule, bool, 0444);
 +MODULE_PARM_DESC(microframe_schedule, "Enable the microframe scheduler");
 +
-+
 +module_param(fiq_fix_enable, bool, 0444);
 +MODULE_PARM_DESC(fiq_fix_enable, "Enable the fiq fix");
++module_param(nak_holdoff_enable, bool, 0444);
++MODULE_PARM_DESC(nak_holdoff_enable, "Enable the NAK holdoff");
 +
 +/** @page "Module Parameters"
 + *
@@ -62527,10 +63020,10 @@ index 0000000..8a0e41b
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 new file mode 100644
-index 0000000..0ce7e46
+index 0000000..2b7945a
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-@@ -0,0 +1,3478 @@
+@@ -0,0 +1,3498 @@
 +
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.c $
@@ -63060,6 +63553,8 @@ index 0000000..0ce7e46
 +{
 +	dwc_otg_qh_t *qh;
 +	dwc_otg_qtd_t *urb_qtd;
++	BUG_ON(!hcd);
++	BUG_ON(!dwc_otg_urb);
 +
 +#ifdef DEBUG /* integrity checks (Broadcom) */
 +
@@ -63076,14 +63571,17 @@ index 0000000..0ce7e46
 +		return -DWC_E_INVALID;
 +	}
 +	urb_qtd = dwc_otg_urb->qtd;
++	BUG_ON(!urb_qtd);
 +	if (urb_qtd->qh == NULL) { 
 +		DWC_ERROR("**** DWC OTG HCD URB Dequeue with QTD with NULL Q handler\n");
 +		return -DWC_E_INVALID;
 +	}
 +#else
 +	urb_qtd = dwc_otg_urb->qtd;
++	BUG_ON(!urb_qtd);
 +#endif
 +	qh = urb_qtd->qh;
++	BUG_ON(!qh);
 +	if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
 +		if (urb_qtd->in_process) {
 +			dump_channel_info(hcd, qh);
@@ -63842,6 +64340,22 @@ index 0000000..0ce7e46
 +		num_channels - hcd->periodic_channels) &&
 +	       !DWC_CIRCLEQ_EMPTY(&hcd->free_hc_list)) {
 +
++		qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
++
++		/*
++		 * Check to see if this is a NAK'd retransmit, in which case ignore for retransmission
++		 * we hold off on bulk retransmissions to reduce NAK interrupt overhead for
++		 * cheeky devices that just hold off using NAKs
++		 */
++		if (dwc_full_frame_num(qh->nak_frame) == dwc_full_frame_num(dwc_otg_hcd_get_frame_number(hcd))) {
++			// Make fiq interrupt run on next frame (i.e. 8 uframes)
++			g_next_sched_frame = ((qh->nak_frame + 8) & ~7) & DWC_HFNUM_MAX_FRNUM;
++			qh_ptr = DWC_LIST_NEXT(qh_ptr);
++			continue;
++		}
++		else
++			qh->nak_frame = 0xffff;
++
 +		if (microframe_schedule) {
 +				DWC_SPINLOCK_IRQSAVE(channel_lock, &flags);
 +				if (hcd->available_host_channels < 1) {
@@ -63854,7 +64368,6 @@ index 0000000..0ce7e46
 +				last_sel_trans_num_nonper_scheduled++;
 +#endif /* DEBUG_HOST_CHANNELS */
 +		}
-+		qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
 +
 +		assign_and_init_hc(hcd, qh);
 +
@@ -66011,10 +66524,10 @@ index 0000000..0ce7e46
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
 new file mode 100644
-index 0000000..6d82127
+index 0000000..45e44ea
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
-@@ -0,0 +1,824 @@
+@@ -0,0 +1,829 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
 + * $Revision: #58 $
@@ -66338,6 +66851,11 @@ index 0000000..6d82127
 +	 */
 +	uint16_t sched_frame;
 +
++	/*
++	** Frame a NAK was received on this queue head, used to minimise NAK retransmission
++	*/
++	uint16_t nak_frame;
++
 +	/** (micro)frame at which last start split was initialized. */
 +	uint16_t start_split_frame;
 +
@@ -68402,10 +68920,10 @@ index 0000000..04ca4c2
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 new file mode 100644
-index 0000000..21e8f09
+index 0000000..3e762e2
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-@@ -0,0 +1,2229 @@
+@@ -0,0 +1,2246 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
 + * $Revision: #89 $
@@ -68464,7 +68982,12 @@ index 0000000..21e8f09
 +int g_next_sched_frame, g_np_count, g_np_sent, g_work_expected;
 +static int mphi_int_count = 0 ;
 +
-+extern bool fiq_fix_enable;
++extern bool fiq_fix_enable, nak_holdoff_enable;
++
++hcchar_data_t nak_hcchar;
++hctsiz_data_t nak_hctsiz;
++hcsplt_data_t nak_hcsplt;
++int nak_count;
 +
 +void __attribute__ ((naked)) dwc_otg_hcd_handle_fiq(void)
 +{
@@ -68638,7 +69161,7 @@ index 0000000..21e8f09
 +			DWC_WRITE_REG32(c_mphi_regs.ctrl, (1<<31));
 +			mphi_int_count = 0;
 +		}
-+			int_done++;
++		int_done++;
 +		if((jiffies / HZ) > last_time)
 +		{
 +			/* Once a second output the fiq and irq numbers, useful for debug */
@@ -69827,6 +70350,18 @@ index 0000000..21e8f09
 +		    "NAK Received--\n", hc->hc_num);
 +
 +	/*
++	 * When we get bulk NAKs then remember this so we holdoff on this qh until
++	 * the beginning of the next frame
++	 */
++	switch(dwc_otg_hcd_get_pipe_type(&qtd->urb->pipe_info)) {
++		case UE_BULK:
++		//case UE_INTERRUPT:
++		//case UE_CONTROL:
++		if (nak_holdoff_enable)
++			hc->qh->nak_frame = dwc_otg_hcd_get_frame_number(hcd);
++	}
++
++	/*
 +	 * Handle NAK for IN/OUT SSPLIT/CSPLIT transfers, bulk, control, and
 +	 * interrupt.  Re-start the SSPLIT transfer.
 +	 */
@@ -71581,10 +72116,10 @@ index 0000000..f91c4b1
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 new file mode 100644
-index 0000000..ac10323
+index 0000000..e6b2a7b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-@@ -0,0 +1,938 @@
+@@ -0,0 +1,957 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
 + * $Revision: #44 $
@@ -71768,6 +72303,7 @@ index 0000000..ac10323
 +	if (microframe_schedule)
 +		qh->speed = dev_speed;
 +
++	qh->nak_frame = 0xffff;
 +
 +	if (((dev_speed == USB_SPEED_LOW) ||
 +	     (dev_speed == USB_SPEED_FULL)) &&
@@ -72351,6 +72887,24 @@ index 0000000..ac10323
 +			       int sched_next_periodic_split)
 +{	
 +	if (dwc_qh_is_non_per(qh)) {
++
++	dwc_otg_qh_t *qh_tmp;
++	dwc_list_link_t *qh_list;
++	DWC_LIST_FOREACH(qh_list, &hcd->non_periodic_sched_inactive)
++	{
++		qh_tmp = DWC_LIST_ENTRY(qh_list, struct dwc_otg_qh, qh_list_entry);
++		if(qh_tmp == qh)
++		{
++			/*
++			 *  FIQ is being disabled because this one nevers gets a np_count increment
++			 *  This is still not absolutely correct, but it should fix itself with
++			 *  just an unnecessary extra interrupt
++			 */
++			g_np_sent = g_np_count;
++		}
++	}
++
++
 +		dwc_otg_hcd_qh_remove(hcd, qh);
 +		if (!DWC_CIRCLEQ_EMPTY(&qh->qtd_list)) {
 +			/* Add back to inactive non-periodic schedule. */

packages/mediacenter/xbmc-frodo-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
-PKG_VERSION="63ca86a"
+PKG_VERSION="f196cd1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/init.d/93_xbmc

@@ -36,16 +36,6 @@ fi
 # hack: make addon-bins executable
   chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
 
-# hack to support user installed fonts
-  SUBFONTS="/storage/.xbmc/userdata/fonts"
-  if [ -d "$SUBFONTS" ]; then
-    files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
-    if [ "$files" = "0" ]; then
-      cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/
-    fi
-      mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
-  fi
-
 # starting autostart script (will be removed later again, dont use it!!!)
   AUTOSTART="/storage/.config/autostart.sh"
   if [ -f $AUTOSTART ]; then

packages/mediacenter/xbmc-frodo/install

@@ -46,7 +46,7 @@ cd $PKG_BUILD
 
   find addons language media sounds userdata system \
     -regextype posix-extended -type f \
-    -not -iregex ".*-linux.*|.*-arm.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \
+    -not -iregex ".*-linux.*|.*-arm.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python|.*\.zlib|.*\.conf" \
     -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
 cd -
 

packages/mediacenter/xbmc-frodo/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-PKG_VERSION="63ca86a"
+PKG_VERSION="f196cd1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63ca86a-601-PR1414.patch

@@ -1,274 +0,0 @@
-From f1a8e4d64edb0d432deb8191f07d63d40515d44b Mon Sep 17 00:00:00 2001
-From: gimli <ebsi4711@gmail.com>
-Date: Wed, 12 Sep 2012 20:59:51 +0200
-Subject: [PATCH] [linux/arm] fixed 'System Info -> Hardware' for arm devices
- and give GetXBVerInfo the name it deserves.
-
----
- xbmc/utils/CPUInfo.cpp               |   55 ++++++++++++++++++++++++++++++++++
- xbmc/utils/CPUInfo.h                 |   12 ++++++++
- xbmc/utils/SystemInfo.cpp            |   22 +++++++++++++-
- xbmc/utils/SystemInfo.h              |    6 +++-
- xbmc/utils/test/TestCPUInfo.cpp      |   24 +++++++++++++++
- xbmc/utils/test/TestSystemInfo.cpp   |   24 +++++++++++++--
- xbmc/windows/GUIWindowSystemInfo.cpp |   12 +++++++-
- 7 files changed, 150 insertions(+), 5 deletions(-)
-
-diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
-index b43d5fc..854b7b1 100644
---- a/xbmc/utils/CPUInfo.cpp
-+++ b/xbmc/utils/CPUInfo.cpp
-@@ -198,6 +198,61 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
-           m_cores[nCurrId].m_strVendor.Trim();
-         }
-       }
-+      else if (strncmp(buffer, "Processor", strlen("Processor"))==0)
-+      {
-+        char *needle = strstr(buffer, ":");
-+        if (needle && strlen(needle)>3)
-+        {
-+          needle+=2;
-+          m_cpuModel = needle;
-+          m_cores[nCurrId].m_strModel = m_cpuModel;
-+          m_cores[nCurrId].m_strModel.Trim();
-+        }
-+      }
-+      else if (strncmp(buffer, "BogoMIPS", strlen("BogoMIPS"))==0)
-+      {
-+        char *needle = strstr(buffer, ":");
-+        if (needle && strlen(needle)>3)
-+        {
-+          needle+=2;
-+          m_cpuBogoMips = needle;
-+          m_cores[nCurrId].m_strBogoMips = m_cpuBogoMips;
-+          m_cores[nCurrId].m_strBogoMips.Trim();
-+        }
-+      }
-+      else if (strncmp(buffer, "Hardware", strlen("Hardware"))==0)
-+      {
-+        char *needle = strstr(buffer, ":");
-+        if (needle && strlen(needle)>3)
-+        {
-+          needle+=2;
-+          m_cpuHardware = needle;
-+          m_cores[nCurrId].m_strHardware = m_cpuHardware;
-+          m_cores[nCurrId].m_strHardware.Trim();
-+        }
-+      }
-+      else if (strncmp(buffer, "Revision", strlen("Revision"))==0)
-+      {
-+        char *needle = strstr(buffer, ":");
-+        if (needle && strlen(needle)>3)
-+        {
-+          needle+=2;
-+          m_cpuRevision = needle;
-+          m_cores[nCurrId].m_strRevision = m_cpuRevision;
-+          m_cores[nCurrId].m_strRevision.Trim();
-+        }
-+      }
-+      else if (strncmp(buffer, "Serial", strlen("Serial"))==0)
-+      {
-+        char *needle = strstr(buffer, ":");
-+        if (needle && strlen(needle)>3)
-+        {
-+          needle+=2;
-+          m_cpuSerial = needle;
-+          m_cores[nCurrId].m_strSerial = m_cpuSerial;
-+          m_cores[nCurrId].m_strSerial.Trim();
-+        }
-+      }
-       else if (strncmp(buffer, "model name", strlen("model name"))==0)
-       {
-         char *needle = strstr(buffer, ":");
-diff --git a/xbmc/utils/CPUInfo.h b/xbmc/utils/CPUInfo.h
-index e8bcf3c..82cd1bd 100644
---- a/xbmc/utils/CPUInfo.h
-+++ b/xbmc/utils/CPUInfo.h
-@@ -55,6 +55,10 @@ struct CoreInfo
-   unsigned long long m_io;
-   CStdString m_strVendor;
-   CStdString m_strModel;
-+  CStdString m_strBogoMips;
-+  CStdString m_strHardware;
-+  CStdString m_strRevision;
-+  CStdString m_strSerial;
-   CoreInfo() : m_id(0), m_fSpeed(.0), m_fPct(.0), m_user(0LL), m_nice(0LL), m_system(0LL), m_idle(0LL), m_io(0LL) {}
- };
- 
-@@ -69,6 +73,10 @@ class CCPUInfo
-   float getCPUFrequency();
-   bool getTemperature(CTemperature& temperature);
-   std::string& getCPUModel() { return m_cpuModel; }
-+  std::string& getCPUBogoMips() { return m_cpuBogoMips; }
-+  std::string& getCPUHardware() { return m_cpuHardware; }
-+  std::string& getCPURevision() { return m_cpuRevision; }
-+  std::string& getCPUSerial() { return m_cpuSerial; }
- 
-   const CoreInfo &GetCoreInfo(int nCoreId);
-   bool HasCoreId(int nCoreId) const;
-@@ -96,6 +104,10 @@ class CCPUInfo
-   int          m_lastUsedPercentage;
-   XbmcThreads::EndTime m_nextUsedReadTime; 
-   std::string  m_cpuModel;
-+  std::string  m_cpuBogoMips;
-+  std::string  m_cpuHardware;
-+  std::string  m_cpuRevision;
-+  std::string  m_cpuSerial;
-   int          m_cpuCount;
-   unsigned int m_cpuFeatures;
- 
-diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
-index 34e4a61..e5a31e8 100644
---- a/xbmc/utils/SystemInfo.cpp
-+++ b/xbmc/utils/SystemInfo.cpp
-@@ -294,11 +294,31 @@ bool CSysInfo::GetDiskSpace(const CStdString drive,int& iTotal, int& iTotalFree,
-   return bRet;
- }
- 
--CStdString CSysInfo::GetXBVerInfo()
-+CStdString CSysInfo::GetCPUModel()
- {
-   return "CPU: " + g_cpuInfo.getCPUModel();
- }
- 
-+CStdString CSysInfo::GetCPUBogoMips()
-+{
-+  return "BogoMips: " + g_cpuInfo.getCPUBogoMips();
-+}
-+
-+CStdString CSysInfo::GetCPUHardware()
-+{
-+  return "Hardware: " + g_cpuInfo.getCPUHardware();
-+}
-+
-+CStdString CSysInfo::GetCPURevision()
-+{
-+  return "Revision: " + g_cpuInfo.getCPURevision();
-+}
-+
-+CStdString CSysInfo::GetCPUSerial()
-+{
-+  return "Serial: " + g_cpuInfo.getCPUSerial();
-+}
-+
- bool CSysInfo::IsAeroDisabled()
- {
- #ifdef _WIN32
-diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h
-index 8bc3462..0ecf910 100644
---- a/xbmc/utils/SystemInfo.h
-+++ b/xbmc/utils/SystemInfo.h
-@@ -105,7 +105,11 @@ class CSysInfo : public CInfoLoader
-   bool IsAeroDisabled();
-   bool IsVistaOrHigher();
-   static CStdString GetKernelVersion();
--  CStdString GetXBVerInfo();
-+  CStdString GetCPUModel();
-+  CStdString GetCPUBogoMips();
-+  CStdString GetCPUHardware();
-+  CStdString GetCPURevision();
-+  CStdString GetCPUSerial();
-   bool GetDiskSpace(const CStdString drive,int& iTotal, int& iTotalFree, int& iTotalUsed, int& iPercentFree, int& iPercentUsed);
-   CStdString GetHddSpaceInfo(int& percent, int drive, bool shortText=false);
-   CStdString GetHddSpaceInfo(int drive, bool shortText=false);
-diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp
-index 3c14d1f..dfd1fd2 100644
---- a/xbmc/utils/test/TestCPUInfo.cpp
-+++ b/xbmc/utils/test/TestCPUInfo.cpp
-@@ -51,6 +51,30 @@
-   EXPECT_STRNE("", s.c_str());
- }
- 
-+TEST(TestCPUInfo, getCPUBogoMips)
-+{
-+  std::string s = g_cpuInfo.getCPUBogoMips();
-+  EXPECT_STRNE("", s.c_str());
-+}
-+
-+TEST(TestCPUInfo, getCPUHardware)
-+{
-+  std::string s = g_cpuInfo.getCPUHardware();
-+  EXPECT_STRNE("", s.c_str());
-+}
-+
-+TEST(TestCPUInfo, getCPURevision)
-+{
-+  std::string s = g_cpuInfo.getCPURevision();
-+  EXPECT_STRNE("", s.c_str());
-+}
-+
-+TEST(TestCPUInfo, getCPUSerial)
-+{
-+  std::string s = g_cpuInfo.getCPUSerial();
-+  EXPECT_STRNE("", s.c_str());
-+}
-+
- TEST(TestCPUInfo, CoreInfo)
- {
-   ASSERT_TRUE(g_cpuInfo.HasCoreId(0));
-diff --git a/xbmc/utils/test/TestSystemInfo.cpp b/xbmc/utils/test/TestSystemInfo.cpp
-index 958e881..73bc3f3 100644
---- a/xbmc/utils/test/TestSystemInfo.cpp
-+++ b/xbmc/utils/test/TestSystemInfo.cpp
-@@ -108,9 +108,29 @@ class TestSystemInfo : public testing::Test
-   std::cout << "GetKernelVersion(): " << CSysInfo::GetKernelVersion() << "\n";
- }
- 
--TEST_F(TestSystemInfo, GetXBVerInfo)
-+TEST_F(TestSystemInfo, GetCPUModel)
- {
--  std::cout << "GetXBVerInfo(): " << g_sysinfo.GetXBVerInfo() << "\n";
-+  std::cout << "GetCPUModel(): " << g_sysinfo.GetCPUModel() << "\n";
-+}
-+
-+TEST_F(TestSystemInfo, GetCPUBogoMips)
-+{
-+  std::cout << "GetCPUBogoMips(): " << g_sysinfo.GetCPUBogoMips() << "\n";
-+}
-+
-+TEST_F(TestSystemInfo, GetCPUHardware)
-+{
-+  std::cout << "GetCPUHardware(): " << g_sysinfo.GetCPUHardware() << "\n";
-+}
-+
-+TEST_F(TestSystemInfo, GetCPURevision)
-+{
-+  std::cout << "GetCPURevision(): " << g_sysinfo.GetCPURevision() << "\n";
-+}
-+
-+TEST_F(TestSystemInfo, GetCPUSerial)
-+{
-+  std::cout << "GetCPUSerial(): " << g_sysinfo.GetCPUSerial() << "\n";
- }
- 
- TEST_F(TestSystemInfo, GetDiskSpace)
-diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
-index c88700a..4c78d3d 100644
---- a/xbmc/windows/GUIWindowSystemInfo.cpp
-+++ b/xbmc/windows/GUIWindowSystemInfo.cpp
-@@ -144,11 +144,21 @@ void CGUIWindowSystemInfo::FrameMove()
-   {
-     SET_CONTROL_LABEL(40,g_localizeStrings.Get(20160));
- #ifdef HAS_SYSINFO
--    SET_CONTROL_LABEL(i++, g_sysinfo.GetXBVerInfo());
-+    SET_CONTROL_LABEL(i++, g_sysinfo.GetCPUModel());
-+#if defined(__arm__) && defined(TARGET_LINUX)
-+    SET_CONTROL_LABEL(i++, g_sysinfo.GetCPUBogoMips());
-+    SET_CONTROL_LABEL(i++, g_sysinfo.GetCPUHardware());
-+    SET_CONTROL_LABEL(i++, g_sysinfo.GetCPURevision());
-+    SET_CONTROL_LABEL(i++, g_sysinfo.GetCPUSerial());
-+#endif
-     SetControlLabel(i++, "%s %s", 22011, SYSTEM_CPU_TEMPERATURE);
-+#if !defined(__arm__)
-     SetControlLabel(i++, "%s %s", 13284, SYSTEM_CPUFREQUENCY);
- #endif
-+#endif
-+#if !(defined(__arm__) && defined(TARGET_LINUX))
-     SetControlLabel(i++, "%s %s", 13271, SYSTEM_CPU_USAGE);
-+#endif
-     i++; // empty line
-     SetControlLabel(i++, "%s: %s", 22012, SYSTEM_TOTAL_MEMORY);
-     SetControlLabel(i++, "%s: %s", 158, SYSTEM_FREE_MEMORY);
--- 
-1.7.10
-

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63ca86a-999.01-fix-CEC.patch

@@ -1,43 +0,0 @@
-From b62503c578604bef65a7e00da4f48a7876bc260c Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Thu, 13 Sep 2012 14:00:54 +0200
-Subject: [PATCH] [rpi/cec] and now correct, use CEC_RPI_VIRTUAL_COM from
- cectypes.h (which also uses the correct value instead of
- 'CEC')
-
----
- xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp b/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp
-index 08e4190..8a436e4 100644
---- a/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp
-+++ b/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp
-@@ -19,6 +19,7 @@
-  */
- 
- #include "PeripheralBusRPi.h"
-+#include <libcec/cectypes.h>
- 
- extern "C" {
- #include <interface/vmcs_host/vc_cecservice.h>
-@@ -29,7 +30,6 @@
- 
- #define RPI_PERIPHERAL_BUS_VID 0x2708
- #define RPI_PERIPHERAL_CEC_PID 0x1001
--#define RPI_PERIPHERAL_CEC_LOC "CEC"
- 
- CPeripheralBusRPi::CPeripheralBusRPi(CPeripherals *manager) :
-     CPeripheralBus(manager, PERIPHERAL_BUS_RPI)
-@@ -45,7 +45,7 @@ bool CPeripheralBusRPi::PerformDeviceScan(PeripheralScanResults &results)
-     result.m_iVendorId   = RPI_PERIPHERAL_BUS_VID;
-     result.m_iProductId  = RPI_PERIPHERAL_CEC_PID;
-     result.m_type        = PERIPHERAL_CEC;
--    result.m_strLocation = RPI_PERIPHERAL_CEC_LOC;
-+    result.m_strLocation = CEC_RPI_VIRTUAL_COM;
- 
-     if (!results.ContainsResult(result))
-       results.m_results.push_back(result);
--- 
-1.7.10
-

packages/mediacenter/xbmc-frodo/scripts/cputemp

@@ -46,9 +46,9 @@ elif [ -f /sys/class/hwmon/hwmon0/device/temp1_input ]; then
 elif [ -f /sys/class/hwmon/hwmon0/device/temp2_input ]; then
   # used on ION systems
   TEMP=`cat /sys/class/hwmon/hwmon0/device/temp2_input`
-elif [ -x /usr/bin/vcgencmd ]; then
+elif [ -f /sys/class/thermal/thermal_zone0/temp ]; then
-  # for RaspberryPi only
+  # used on RaspberryPi
-  TEMP=`echo "$(/usr/bin/vcgencmd measure_temp | sed -e "s,temp=,,g" -e "s,'C,,g" | cut -d . -f 1 ) * 1000" | bc`
+  TEMP=`cat /sys/class/thermal/thermal_zone0/temp`
 fi
 
 echo "$(( $TEMP / 1000 )) C"

packages/mediacenter/xbmc-pvr-addons/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-addons"
-PKG_VERSION="3d83728"
+PKG_VERSION="fcdf846"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/init.d/93_xbmc

@@ -36,16 +36,6 @@ fi
 # hack: make addon-bins executable
   chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
 
-# hack to support user installed fonts
-  SUBFONTS="/storage/.xbmc/userdata/fonts"
-  if [ -d "$SUBFONTS" ]; then
-    files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
-    if [ "$files" = "0" ]; then
-      cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/
-    fi
-      mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
-  fi
-
 # starting autostart script (will be removed later again, dont use it!!!)
   AUTOSTART="/storage/.config/autostart.sh"
   if [ -f $AUTOSTART ]; then

packages/mediacenter/xbmc/install

@@ -46,7 +46,7 @@ cd $PKG_BUILD
 
   find addons language media sounds userdata system \
     -regextype posix-extended -type f \
-    -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \
+    -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python|.*\.zlib|.*\.conf" \
     -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
 cd -
 

packages/network/connman/init.d/21_network

@@ -123,9 +123,9 @@ set_ip_address() {
   [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER" >> $CONNMAN_PROFILE
 
   (
-    local log_file="/tmp/${PROFILE_NAME}.log"
+    local log_file="/var/log/${PROFILE_NAME}.log"
 
-    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40; do
+    for i in $(seq 1 60); do
       echo "--- $i $PROFILE_NAME ------------" >>$log_file 2>&1
       dbus-send --system --dest=net.connman --print-reply /net/connman/service/${PROFILE_NAME} net.connman.Service.Connect >>$log_file 2>&1
       usleep 500000
@@ -146,7 +146,7 @@ set_ip_address() {
 set_wired_interface() {
   local NET_MAC=""
 
-  for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
+  for i in $(seq 1 30); do
     if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
       logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
       usleep 500000
@@ -183,7 +183,7 @@ set_wireless_interface() {
   local NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
   local NET_MAC=""
 	
-  for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
+  for i in $(seq 1 120); do
     if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
       logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
       usleep 500000

packages/sysutils/busybox/config/busybox.conf

@@ -259,7 +259,7 @@ CONFIG_REALPATH=y
 CONFIG_RM=y
 CONFIG_RMDIR=y
 CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-# CONFIG_SEQ is not set
+CONFIG_SEQ=y
 # CONFIG_SHA1SUM is not set
 # CONFIG_SHA256SUM is not set
 # CONFIG_SHA512SUM is not set

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="05bb1ec"
+PKG_VERSION="b616053"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/x11/other/fontconfig/init.d/35_fontconfig

@@ -0,0 +1,43 @@
+################################################################################
+#      Copyright (C) 2009-2010 OpenELEC.tv
+#      http://www.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
+################################################################################
+
+# start Avahi Daemon
+#
+# runlevels: openelec, textmode
+
+
+FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/"
+
+# hack to support user installed fonts
+  SUBFONTS="/storage/.xbmc/userdata/fonts"
+  if [ -d "$SUBFONTS" ]; then
+    files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
+    if [ "$files" = "0" ]; then
+      cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/
+    fi
+      mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
+  fi
+
+
+(
+  progress "Creating fontconfig cache"
+    fc-cache $FC_CACHE_DIRS
+)&
+

projects/RPi/linux/linux.arm.conf

@@ -390,10 +390,10 @@ CONFIG_CMDLINE_EXTEND=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -1014,8 +1014,102 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_GPIO is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
-# CONFIG_THERMAL is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_BCM2835=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_BCM2835=y
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

tools/mkpkg/mkpkg_sundtek

@@ -45,3 +45,15 @@ chmod 755 $sundtek_base/opt/bin/*
 echo "packing..."
 tar czf $sundtek_base-x86_64.tar.gz $sundtek_base
 rm -fr $sundtek_base
+
+echo "getting armsysvhf driver..."
+wget --passive-ftp --no-check-certificate -O installer.tar.gz http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz
+echo "unpacking..."
+mkdir -p $sundtek_base
+tar xzf installer.tar.gz -C $sundtek_base
+rm -f installer.tar.gz
+chmod 755 $sundtek_base/opt/bin/*
+echo "packing..."
+tar czf $sundtek_base-arm.tar.gz $sundtek_base
+rm -fr $sundtek_base
+