projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refresh patches
[openwrt/openwrt.git]
/
package
/
boot
/
uboot-lantiq
/
patches
/
0004-sf-add-slim-probe-funtions-for-SPL.patch
diff --git
a/package/boot/uboot-lantiq/patches/0004-sf-add-slim-probe-funtions-for-SPL.patch
b/package/boot/uboot-lantiq/patches/0004-sf-add-slim-probe-funtions-for-SPL.patch
index d1768afec856e11e3a38e1d93d4389a4fb735990..960085c16bfc3ba4dff1ec500020d40df14d2075 100644
(file)
--- a/
package/boot/uboot-lantiq/patches/0004-sf-add-slim-probe-funtions-for-SPL.patch
+++ b/
package/boot/uboot-lantiq/patches/0004-sf-add-slim-probe-funtions-for-SPL.patch
@@
-5,11
+5,9
@@
Subject: sf: add slim probe funtions for SPL
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
-diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
-index 2bba10c..380aa09 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
-@@ -365,3 +365,58 @@ void spi_flash_free(struct spi_flash *fl
ash)
+@@ -365,3 +365,58 @@ void spi_flash_free(struct spi_flash *fl
spi_free_slave(flash->spi);
free(flash);
}
spi_free_slave(flash->spi);
free(flash);
}
@@
-68,11
+66,9
@@
index 2bba10c..380aa09 100644
+ spi_free_slave(flash->spi);
+}
+#endif
+ spi_free_slave(flash->spi);
+}
+#endif
-diff --git a/include/spi_flash.h b/include/spi_flash.h
-index 25ca8f1..411dd1b 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
-@@ -69,6 +69,9 @@ struct spi_flash *spi_flash_probe(unsign
ed int bus, unsigned int cs,
+@@ -69,6 +69,9 @@ struct spi_flash *spi_flash_probe(unsign
unsigned int max_hz, unsigned int spi_mode);
void spi_flash_free(struct spi_flash *flash);
unsigned int max_hz, unsigned int spi_mode);
void spi_flash_free(struct spi_flash *flash);
@@
-82,6
+78,3
@@
index 25ca8f1..411dd1b 100644
static inline int spi_flash_read(struct spi_flash *flash, u32 offset,
size_t len, void *buf)
{
static inline int spi_flash_read(struct spi_flash *flash, u32 offset,
size_t len, void *buf)
{
---
-1.8.3.2
-