Some last minute fixes for master branch

Some last minute fixes for master branch

[Sascha Hauer]

The following patches fix several compiler warnings which disturb my
sense of beauty when compiling all defconfigs before a release. Also
a missing _text is added to the x86 linker script to make it compile
again.

Sascha

----------------------------------------------------------------
Sascha Hauer (5):
      string: remove unused bcopy function
      mtd: fix compiler warning
      USB gadget pxa: Fix compiler warning
      mips: Fix compiler warnings
      x86 linker script: Add missing _text

 arch/mips/lib/libgcc.h          |    4 ++++
 arch/x86/lib/barebox.lds.S      |    1 +
 drivers/mtd/core.c              |    2 ++
 drivers/usb/gadget/pxa27x_udc.c |    2 +-
 lib/string.c                    |   24 ------------------------
 5 files changed, 8 insertions(+), 25 deletions(-)

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/5] string: remove unused bcopy function

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 lib/string.c |   24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/lib/string.c b/lib/string.c
index 77435aa..2865088 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -420,30 +420,6 @@ void * memset(void * s,int c,size_t count)
 #endif
 EXPORT_SYMBOL(memset);
 
-#ifndef __HAVE_ARCH_BCOPY
-/**
- * bcopy - Copy one area of memory to another
- * @src: Where to copy from
- * @dest: Where to copy to
- * @count: The size of the area.
- *
- * Note that this is the same as memcpy(), with the arguments reversed.
- * memcpy() is the standard, bcopy() is a legacy BSD function.
- *
- * You should not use this function to access IO space, use memcpy_toio()
- * or memcpy_fromio() instead.
- */
-char * bcopy(const char * src, char * dest, int count)
-{
-	char *tmp = dest;
-
-	while (count--)
-		*tmp++ = *src++;
-
-	return dest;
-}
-#endif
-
 #ifndef __HAVE_ARCH_MEMCPY
 /**
  * memcpy - Copy one area of memory to another
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/5] mtd: fix compiler warning

[Sascha Hauer]

Fixes:

drivers/mtd/core.c: In function 'mtd_ioctl':
drivers/mtd/core.c:122:24: warning: unused variable 'ecc' [-Wunused-variable]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/core.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index ccc5c26..7bc0a0f 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -119,7 +119,9 @@ int mtd_ioctl(struct cdev *cdev, int request, void *buf)
 	int ret = 0;
 	struct mtd_info *mtd = cdev->priv;
 	struct mtd_info_user *user = buf;
+#if (defined(CONFIG_NAND_ECC_HW) || defined(CONFIG_NAND_ECC_SOFT))
 	struct mtd_ecc_stats *ecc = buf;
+#endif
 	struct region_info_user *reg = buf;
 
 	switch (request) {
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/5] USB gadget pxa: Fix compiler warning

[Sascha Hauer]

Fixes:

drivers/usb/gadget/pxa27x_udc.c:1263:13: warning: 'pxa27x_change_interface' defined but not used [-Wunused-function]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/usb/gadget/pxa27x_udc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 26be29d..87dcfac 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1260,7 +1260,7 @@ static void pxa27x_change_configuration(struct pxa_udc *udc, int config)
 	udc->driver->setup(&udc->gadget, &req);
 }
 
-static void pxa27x_change_interface(struct pxa_udc *udc, int iface, int alt)
+static void __maybe_unused pxa27x_change_interface(struct pxa_udc *udc, int iface, int alt)
 {
 	struct usb_ctrlrequest  req;
 
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/5] mips: Fix compiler warnings

[Sascha Hauer]

Fixes:

arch/mips/lib/lshrdi3.c:6: warning: no previous prototype for '__lshrdi3'
arch/mips/lib/ashrdi3.c:6: warning: no previous prototype for '__ashrdi3'
arch/mips/lib/ashldi3.c:6: warning: no previous prototype for '__ashldi3'

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/mips/lib/libgcc.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/mips/lib/libgcc.h b/arch/mips/lib/libgcc.h
index 05909d5..593e598 100644
--- a/arch/mips/lib/libgcc.h
+++ b/arch/mips/lib/libgcc.h
@@ -22,4 +22,8 @@ typedef union {
 	long long ll;
 } DWunion;
 
+long long __lshrdi3(long long u, word_type b);
+long long __ashldi3(long long u, word_type b);
+long long __ashrdi3(long long u, word_type b);
+
 #endif /* __ASM_LIBGCC_H */
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/5] x86 linker script: Add missing _text

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/x86/lib/barebox.lds.S |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S
index 9798ed5..3315be2 100644
--- a/arch/x86/lib/barebox.lds.S
+++ b/arch/x86/lib/barebox.lds.S
@@ -144,6 +144,7 @@ SECTIONS
 	.text : AT ( LOADADDR(.bootstrapping) + SIZEOF(.bootstrapping) ) {
 		/* do not align here! It may fails with the LOADADDR! */
 		_stext = .;
+		_text = .;
 		*(.text_entry*)
 		__bare_init_start = .;
 		*(.text_bare_init*)
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox