From 1bbe2ffe3b2083408eecfc16e357623a220b8609 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 18 Jun 2015 21:20:51 +0100 Subject: [PATCH] Enable i.MX6 marsboard and warp, Use upstream build fix, Add patch to fix Raspberry Pi timer speed --- ...lt-env-includes-to-fix-sandbox-build.patch | 45 +++++++++++++++++++ 0002-raspberry-pi-fix-timer.patch | 30 +++++++++++++ armv7-boards | 2 + uboot-tools.spec | 8 +++- 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-default-env-includes-to-fix-sandbox-build.patch create mode 100644 0002-raspberry-pi-fix-timer.patch diff --git a/0001-Fix-default-env-includes-to-fix-sandbox-build.patch b/0001-Fix-default-env-includes-to-fix-sandbox-build.patch new file mode 100644 index 0000000..176a88e --- /dev/null +++ b/0001-Fix-default-env-includes-to-fix-sandbox-build.patch @@ -0,0 +1,45 @@ +From e87d8250dad301122a43e697cf44627c98f5dc57 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Wed, 17 Jun 2015 16:30:28 +0100 +Subject: [PATCH 1/2] Fix default env includes to fix sandbox build + +defconfig and sandbox fails to build due to a with with the following error: + +error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX' + CONFIG_EXTRA_ENV_SETTINGS + +Based on the responaes below to the thread add linux/kconfig.h higher in th includes +and drop the now unneeded autoconf.h lower down to ensure the default environment is +included correctly + +http://lists.denx.de/pipermail/u-boot/2015-June/216849.html + +Signed-off-by: Peter Robinson +--- + tools/env/fw_env.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h +index d6faf34..60c0517 100644 +--- a/tools/env/fw_env.h ++++ b/tools/env/fw_env.h +@@ -6,6 +6,8 @@ + */ + + /* Pull in the current config to define the default environment */ ++#include ++ + #ifndef __ASSEMBLY__ + #define __ASSEMBLY__ /* get only #defines from config.h */ + #include +@@ -13,7 +15,6 @@ + #else + #include + #endif +-#include + + /* + * To build the utility with the static configuration +-- +2.4.3 + diff --git a/0002-raspberry-pi-fix-timer.patch b/0002-raspberry-pi-fix-timer.patch new file mode 100644 index 0000000..80b319e --- /dev/null +++ b/0002-raspberry-pi-fix-timer.patch @@ -0,0 +1,30 @@ +From f5f57faaf4049dedb70a027544dec15b320dd29f Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Thu, 18 Jun 2015 21:00:03 +0100 +Subject: [PATCH 2/2] raspberry pi fix timer + +--- + drivers/mmc/bcm2835_sdhci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c +index 078ef05..74b497e 100644 +--- a/drivers/mmc/bcm2835_sdhci.c ++++ b/drivers/mmc/bcm2835_sdhci.c +@@ -69,11 +69,11 @@ static inline void bcm2835_sdhci_raw_writel(struct sdhci_host *host, u32 val, + * (Which is just as well - otherwise we'd have to nobble the DMA engine + * too) + */ +- while (get_timer(bcm_host->last_write) < bcm_host->twoticks_delay) ++ while (timer_get_us() < bcm_host->last_write + bcm_host->twoticks_delay) + ; + + writel(val, host->ioaddr + reg); +- bcm_host->last_write = get_timer(0); ++ bcm_host->last_write = timer_get_us(); + } + + static inline u32 bcm2835_sdhci_raw_readl(struct sdhci_host *host, int reg) +-- +2.4.3 + diff --git a/armv7-boards b/armv7-boards index 85253a3..a577e31 100644 --- a/armv7-boards +++ b/armv7-boards @@ -33,6 +33,7 @@ jetson-tk1 Linksprite_pcDuino Linksprite_pcDuino3 Linksprite_pcDuino3_Nano +marsboard Marsboard_A10 Mele_A1000 Mele_A1000G_quad @@ -73,6 +74,7 @@ UTOO_P66 vexpress_ca15_tc2 vexpress_ca9x4 wandboard +warp Wexler_TAB7200 Wits_Pro_A20_DKT zynq_microzed diff --git a/uboot-tools.spec b/uboot-tools.spec index d6ed3eb..12e12ba 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -11,7 +11,8 @@ URL: http://www.denx.de/wiki/U-Boot Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 Source1: armv7-boards -Patch0: 0001-If-CONFIG_SANDBOX-isn-t-defined-the-build-fails-in-f.patch +Patch0: 0001-Fix-default-env-includes-to-fix-sandbox-build.patch +Patch1: 0002-raspberry-pi-fix-timer.patch #Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch #Patch2: 0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch #Patch3: 0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch @@ -191,6 +192,11 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %endif %changelog +* Tue Jun 16 2015 Peter Robinson 2015.07-0.2rc2 +- Enable i.MX6 marsboard and warp +- Use upstream build fix +- Add patch to fix Raspberry Pi timer speed + * Tue Jun 9 2015 Peter Robinson 2015.07-0.1rc2 - Initial rebase to 2015.07rc2 - Enable mx6cuboxi, 32 bit vexpress