diff options
author | John Crispin <blogic@openwrt.org> | 2014-04-12 21:21:14 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-04-12 21:21:14 +0000 |
commit | 9c2f5aeffa9ad2ac4d7313cda94ac03ccf607c47 (patch) | |
tree | e35db02eb2bdf67a2a6076563158753649f63ad9 /package/boot/uboot-lantiq/patches/0002-sf-handle-CONFIG_MANUAL_RELOC.patch | |
parent | 80894a6f0e1f089bb78ac1457c8a3f0e0ccfc205 (diff) | |
download | upstream-9c2f5aeffa9ad2ac4d7313cda94ac03ccf607c47.tar.gz upstream-9c2f5aeffa9ad2ac4d7313cda94ac03ccf607c47.tar.bz2 upstream-9c2f5aeffa9ad2ac4d7313cda94ac03ccf607c47.zip |
uboot-lantiq: update to v2013.10
Patches created from tree:
git@github.com:danielschwierzeck/u-boot-lantiq.git
v2013.10..u-boot-lantiq-v2013.10-openwrt4
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40482 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-lantiq/patches/0002-sf-handle-CONFIG_MANUAL_RELOC.patch')
-rw-r--r-- | package/boot/uboot-lantiq/patches/0002-sf-handle-CONFIG_MANUAL_RELOC.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/package/boot/uboot-lantiq/patches/0002-sf-handle-CONFIG_MANUAL_RELOC.patch b/package/boot/uboot-lantiq/patches/0002-sf-handle-CONFIG_MANUAL_RELOC.patch deleted file mode 100644 index 63a21af121..0000000000 --- a/package/boot/uboot-lantiq/patches/0002-sf-handle-CONFIG_MANUAL_RELOC.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 60e8a35f0efa5a7e5d797a3f239971c84061ef11 Mon Sep 17 00:00:00 2001 -From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -Date: Tue, 6 Nov 2012 21:39:47 +0100 -Subject: sf: handle CONFIG_MANUAL_RELOC - -Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> - ---- a/drivers/mtd/spi/spi_flash.c -+++ b/drivers/mtd/spi/spi_flash.c -@@ -293,7 +293,7 @@ int spi_flash_cmd_write_status(struct sp - */ - #define IDCODE_CONT_LEN 0 - #define IDCODE_PART_LEN 5 --static const struct { -+static struct { - const u8 shift; - const u8 idcode; - struct spi_flash *(*probe) (struct spi_slave *spi, u8 *idcode); -@@ -335,6 +335,10 @@ static const struct { - }; - #define IDCODE_LEN (IDCODE_CONT_LEN + IDCODE_PART_LEN) - -+#ifdef CONFIG_NEEDS_MANUAL_RELOC -+DECLARE_GLOBAL_DATA_PTR; -+#endif -+ - struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int spi_mode) - { -@@ -342,6 +346,16 @@ struct spi_flash *spi_flash_probe(unsign - struct spi_flash *flash = NULL; - int ret, i, shift; - u8 idcode[IDCODE_LEN], *idp; -+#ifdef CONFIG_NEEDS_MANUAL_RELOC -+ static int relocated; -+ -+ if (!relocated) { -+ for (i = 0; i < ARRAY_SIZE(flashes); i++) -+ flashes[i].probe += gd->reloc_off; -+ -+ relocated = 1; -+ } -+#endif - - spi = spi_setup_slave(bus, cs, max_hz, spi_mode); - if (!spi) { |