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/0017-sf-add-init-function.patch | |
parent | 80894a6f0e1f089bb78ac1457c8a3f0e0ccfc205 (diff) | |
download | master-187ad058-9c2f5aeffa9ad2ac4d7313cda94ac03ccf607c47.tar.gz master-187ad058-9c2f5aeffa9ad2ac4d7313cda94ac03ccf607c47.tar.bz2 master-187ad058-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/0017-sf-add-init-function.patch')
-rw-r--r-- | package/boot/uboot-lantiq/patches/0017-sf-add-init-function.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/package/boot/uboot-lantiq/patches/0017-sf-add-init-function.patch b/package/boot/uboot-lantiq/patches/0017-sf-add-init-function.patch deleted file mode 100644 index 2d290513b1..0000000000 --- a/package/boot/uboot-lantiq/patches/0017-sf-add-init-function.patch +++ /dev/null @@ -1,57 +0,0 @@ -From aa9d5d64ca6441cb24e22dc3c1f707da62da2887 Mon Sep 17 00:00:00 2001 -From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -Date: Tue, 6 Nov 2012 19:35:17 +0100 -Subject: sf: add init function - -Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> - ---- a/drivers/mtd/spi/spi_flash.c -+++ b/drivers/mtd/spi/spi_flash.c -@@ -482,3 +482,36 @@ void spi_flash_free(struct spi_flash *fl - spi_flash_free_spl(flash); - free(flash); - } -+ -+#ifdef CONFIG_SPI_FLASH_MTD -+static int spi_flash_mtd_register(void) -+{ -+ struct spi_flash *flash; -+ int err; -+ -+ flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, -+ CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); -+ if (!flash) -+ return -1; -+ -+ err = spi_flash_mtd_init(flash); -+ if (err) -+ spi_flash_free(flash); -+ -+ return err; -+} -+#else -+static int spi_flash_mtd_register(void) -+{ -+ return 0; -+} -+#endif -+ -+int spi_flash_init(void) -+{ -+ int err; -+ -+ err = spi_flash_mtd_register(); -+ -+ return err; -+} ---- a/include/spi_flash.h -+++ b/include/spi_flash.h -@@ -51,6 +51,8 @@ struct spi_flash { - #endif - }; - -+int spi_flash_init(void); -+ - struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int spi_mode); - void spi_flash_free(struct spi_flash *flash); |