From: Jason Kridner <j...@ti.com> There is a v2011.09 tag on the mainline, but I haven't seen a release notice go out. It didn't make sense to me to try to carry-forward those all patches since the release tag, so I simply picked the latest tag in the maineline.
Patched and tested on BeagleBoard-xM revision C. USB Ethernet was tested with: setenv usbethaddr de:ad:be:ef:00:01 usb start dhcp^C setenv ipaddr 10.0.1.2 ping 10.0.1.1 USB Storage was tested with: <above> usb part fatls usb 0 led command was tested with: led all off led all on led 1 on led 1 off gpio command tested with: gpio input 4 <hold USER button> gpio input 4 <release USER button> Also performed boot test. Signed-off-by: Jason Kridner <j...@ti.com> Signed-off-by: Joel A Fernandes <joelag...@ti.com> --- v2 changes: * Dropped PV * Leave L2 cache enabled ...-beagleboard-config-disable-cache-for-USB.patch | 33 +++++++++++++++++ ...02-beagleboard-config-enable-gpio-command.patch | 25 +++++++++++++ ...d-some-timeout-durations-for-MMC-and-EHCI.patch | 39 ++++++++++++++++++++ recipes-bsp/u-boot/u-boot_2011.09.bb | 21 +++++++++++ 4 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 recipes-bsp/u-boot/u-boot/2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch create mode 100644 recipes-bsp/u-boot/u-boot/2011.09/0002-beagleboard-config-enable-gpio-command.patch create mode 100644 recipes-bsp/u-boot/u-boot/2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch create mode 100644 recipes-bsp/u-boot/u-boot_2011.09.bb diff --git a/recipes-bsp/u-boot/u-boot/2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch b/recipes-bsp/u-boot/u-boot/2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch new file mode 100644 index 0000000..a2776e9 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch @@ -0,0 +1,33 @@ +From 03b9bca863257cb24d8f11bb773ad2b8dff820c6 Mon Sep 17 00:00:00 2001 +From: Jason Kridner <j...@ti.com> +Date: Sun, 18 Sep 2011 12:16:31 -0400 +Subject: [PATCH 1/3] HACK: beagleboard: config: disable cache for USB + +There is currently a bug in the USB code for the BeagleBoard that is +worked-around by disabling the cache. + +See http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/108224 + +Signed-off-by: Jason Kridner <j...@ti.com> +--- + include/configs/omap3_beagle.h | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 1369c89..8a84d7a 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -36,6 +36,10 @@ + #define CONFIG_OMAP3430 1 /* which is in a 3430 */ + #define CONFIG_OMAP3_BEAGLE 1 /* working with BEAGLE */ + ++/* TODO: WORK-AROUND for bug in BeagleBoard-specific USB */ ++#define CONFIG_SYS_ICACHE_OFF ++#define CONFIG_SYS_DCACHE_OFF ++ + #define CONFIG_SDRC /* The chip has SDRC controller */ + + #include <asm/arch/cpu.h> /* get chip and board defs */ +-- +1.7.4.1 + diff --git a/recipes-bsp/u-boot/u-boot/2011.09/0002-beagleboard-config-enable-gpio-command.patch b/recipes-bsp/u-boot/u-boot/2011.09/0002-beagleboard-config-enable-gpio-command.patch new file mode 100644 index 0000000..096a1ce --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.09/0002-beagleboard-config-enable-gpio-command.patch @@ -0,0 +1,25 @@ +From 79e8280783d445f7630b8a9830f8db73f2e04828 Mon Sep 17 00:00:00 2001 +From: Jason Kridner <j...@ti.com> +Date: Tue, 6 Sep 2011 18:56:11 -0400 +Subject: [PATCH 2/3] beagleboard: config: enable gpio command + +Now that we are using the generic GPIO framework, enable the command. +--- + include/configs/omap3_beagle.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 8a84d7a..43dc94a 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -169,6 +169,7 @@ + #define CONFIG_CMD_PING + #define CONFIG_CMD_DHCP + #define CONFIG_CMD_SETEXPR /* Evaluate expressions */ ++#define CONFIG_CMD_GPIO + + #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ + #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ +-- +1.7.4.1 + diff --git a/recipes-bsp/u-boot/u-boot/2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch b/recipes-bsp/u-boot/u-boot/2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch new file mode 100644 index 0000000..c3ebf1b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch @@ -0,0 +1,39 @@ +From 316e3a4573bdbbbc395baeca4f7b2208707e30fa Mon Sep 17 00:00:00 2001 +From: Jason Kridner <j...@ti.com> +Date: Wed, 7 Sep 2011 08:56:48 -0400 +Subject: [PATCH 3/3] Increased some timeout durations for MMC and EHCI + +--- + drivers/mmc/omap_hsmmc.c | 2 +- + include/usb.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c +index ef12ecd..7e35372 100644 +--- a/drivers/mmc/omap_hsmmc.c ++++ b/drivers/mmc/omap_hsmmc.c +@@ -33,7 +33,7 @@ + #include <asm/arch/sys_proto.h> + + /* If we fail after 1 second wait, something is really bad */ +-#define MAX_RETRY_MS 1000 ++#define MAX_RETRY_MS 5000 + + static int mmc_read_data(hsmmc_t *mmc_base, char *buf, unsigned int size); + static int mmc_write_data(hsmmc_t *mmc_base, const char *buf, unsigned int siz); +diff --git a/include/usb.h b/include/usb.h +index 06170cd..0d99b92 100644 +--- a/include/usb.h ++++ b/include/usb.h +@@ -46,7 +46,7 @@ + * This is the timeout to allow for submitting an urb in ms. We allow more + * time for a BULK device to react - some are slow. + */ +-#define USB_TIMEOUT_MS(pipe) (usb_pipebulk(pipe) ? 5000 : 1000) ++#define USB_TIMEOUT_MS(pipe) (usb_pipebulk(pipe) ? 5000 : 5000) + + /* device request (setup) */ + struct devrequest { +-- +1.7.4.1 + diff --git a/recipes-bsp/u-boot/u-boot_2011.09.bb b/recipes-bsp/u-boot/u-boot_2011.09.bb new file mode 100644 index 0000000..d441bed --- /dev/null +++ b/recipes-bsp/u-boot/u-boot_2011.09.bb @@ -0,0 +1,21 @@ +require u-boot.inc + +# No patches for other machines yet +COMPATIBLE_MACHINE = "(beagleboard)" + +SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \ + file://2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch \ + file://2011.09/0002-beagleboard-config-enable-gpio-command.patch \ + file://2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch \ + file://fw_env.config \ + " +# v2011.09 tag -> 6ceb0135f96d73063ffbaab5be7ce23933367388 +# The tag below is from the master tree, but 21 patches after. +# $ git log 6ceb0135f..56fa45d58 | grep commit | wc -l +# 21 +SRCREV = "56fa45d58116f86f343a9c45ce6d1110f50b8d70" +PR = "r0" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" + +S = "${WORKDIR}/git" -- 1.7.0.4 _______________________________________________ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
