fsl_udc: fix warning
Subsystems (4)
PATCH 1/3 fsl_udc: fix warning
this patch fix the following warning :drivers/usb/gadget/fsl_udc.c: In function 'done':drivers/usb/gadget/fsl_udc.c:566: warning: passing argument 1 of 'dma_inv_range' makes integer from pointer without a cast arch/arm/include/asm/mmu.h:24: note: expected 'long unsigned int' but argument is of type 'void *' drivers/usb/gadget/fsl_udc.c:566: warning: passing argument 2 of 'dma_inv_range' makes integer from pointer without a cast arch/arm/include/asm/mmu.h:24: note: expected 'long unsigned int' but argument is of type 'void *'
--- drivers/usb/gadget/fsl_udc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/usb/gadget/fsl_udc.c +2 -1
@@ -563,7 +563,8 @@ static void done(struct fsl_ep *ep, struct fsl_req *req, int status)dma_free_coherent (curr_td); } -dma_inv_range (req->req.buf, req->req.buf + req->req.length); +dma_inv_range ((unsigned long )req->req.buf, + (unsigned long )(req->req.buf + req->req.length));if (status && (status != -ESHUTDOWN )) VDBG("complete %s req %p stat %d len %u/%u",
Signature · 7 lines
1.7.0.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/3 cpuimx35: fix warning
this patch fix the following warning :arch/arm/boards/eukrea_cpuimx35/flash_header.c:30: warning: "DEST_BASE" redefined arch/arm/mach-imx/include/mach/imx-flash-header.h:29: note: this is the location of the previous definition
--- arch/arm/boards/eukrea_cpuimx35/flash_header.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/boards/eukrea_cpuimx35/flash_header.c +1 -0
@@ -27,6 +27,7 @@ struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, }, }; +#undef DEST_BASE#define DEST_BASE 0x80000000 struct imx_flash_header __flash_header_section flash_header = { .app_code_jump_vector =DEST_BASE +0x1000 ,
Signature · 7 lines
1.7.0.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
maintainerRe: [PATCH 2/3] cpuimx35: fix warning
Hi Eric,
Quoted 14 lines · Eric Bénard
this patch fix the following warning :
arch/arm/boards/eukrea_cpuimx35/flash_header.c:30: warning: "DEST_BASE" redefinedarch/arm/mach-imx/include/mach/imx-flash-header.h:29: note: this is the location of the previous definitionSigned-off-by Eric Bénard <[email protected]>--- arch/arm/boards/eukrea_cpuimx35/flash_header.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/boards/eukrea_cpuimx35/flash_header.c +0
-0
arch/arm/boards/eukrea_cpuimx35/flash_header.c struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { · line 33
Quoted 7 lines
arch/arm/boards/eukrea_cpuimx35/flash_header.c +1
-0@@ -27,6 +27,7 @@ struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, }, }; +#undef DEST_BASE#define DEST_BASE 0x80000000 struct imx_flash_header __flash_header_section flash_header = { .app_code_jump_vector =DEST_BASE +0x1000 ,
Why don't you just use another define instead of redefining DEST_BASE?
Grepping through the other boards there seems to be something wrong here. The original idea was to let the rom code copy the image to the address it is linked at to not have to relocate it later. This seems to be not the case for most boards
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 2/3] cpuimx35: fix warning
Hi Sascha,
Quoted 7 lines · Sascha Hauer
Quoted 4 lines
+#undef
DEST_BASE
#defineDEST_BASE0x80000000
structimx_flash_header__flash_header_sectionflash_header= {
.app_code_jump_vector =DEST_BASE+0x1000,Why don't you just use another define instead of redefining
DEST_BASE?
because I fixed this with my fingers and not with my brain :-D
Eric
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/1 cpuimx35: fix warning
In reply to Sascha Hauerthis patch fix the following warning :arch/arm/boards/eukrea_cpuimx35/flash_header.c:30: warning: "DEST_BASE" redefined arch/arm/mach-imx/include/mach/imx-flash-header.h:29: note: this is the location of the previous definition
--- arch/arm/boards/eukrea_cpuimx35/flash_header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boards/eukrea_cpuimx35/flash_header.c +3 -3
@@ -27,15 +27,15 @@ struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, }, }; -#define DEST_BASE 0x80000000 +#define CPUIMX35_DEST_BASE 0x80000000 struct imx_flash_header __flash_header_section flash_header = { - .app_code_jump_vector =DEST_BASE +0x1000 , + .app_code_jump_vector =CPUIMX35_DEST_BASE +0x1000 , .app_code_barker =APP_CODE_BARKER , .app_code_csf =0 , .dcd_ptr_ptr =FLASH_HEADER_BASE + offsetof(struct imx_flash_header , dcd), .super_root_key =0 , .dcd =FLASH_HEADER_BASE + offsetof(struct imx_flash_header , dcd_barker), - .app_dest =DEST_BASE , + .app_dest =CPUIMX35_DEST_BASE , .dcd_barker =DCD_BARKER , .dcd_block_len =sizeof (dcd_entry), };
Signature · 7 lines
1.7.0.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/3 i.MX25 & 35 usb config bits : create mach/usb.h
In reply to Eric Bénardas suggested by Baruch Siach
--- arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c | 11 +---------- arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c | 11 +---------- arch/arm/mach-imx/include/mach/usb.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-imx/include/mach/usb.h
arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +1 -10
@@ -42,6 +42,7 @@#include <mach/iomux-mx25.h> #include <i2c/i2c.h> #include <usb/fsl_usb2.h> +#include <mach/usb.h> extern unsigned long _stext;extern void exception_vectors (void );
@@ -165,16 +166,6 @@ static struct device_d esdhc_dev = { };#ifdef CONFIG_USB - -#define MX35_H1_SIC_SHIFT 21 -#define MX35_H1_SIC_MASK (0x3 << MX35_H1_SIC_SHIFT) -#define MX35_H1_PM_BIT (1 << 8) -#define MX35_H1_IPPUE_UP_BIT (1 << 7) -#define MX35_H1_IPPUE_DOWN_BIT (1 << 6) -#define MX35_H1_TLL_BIT (1 << 5) -#define MX35_H1_USBTE_BIT (1 << 4) -#define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) -static void imx25_usb_init (void ) {unsigned int tmp;
arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +1 -10
@@ -53,6 +53,7 @@#include <mach/imx-pll.h> #include <i2c/i2c.h> #include <usb/fsl_usb2.h> +#include <mach/usb.h> static struct fec_platform_data fec_info = { .xcv_type =MII100 ,
@@ -140,16 +141,6 @@ static struct device_d esdhc_dev = { };#ifdef CONFIG_USB - -#define MX35_H1_SIC_SHIFT 21 -#define MX35_H1_SIC_MASK (0x3 << MX35_H1_SIC_SHIFT) -#define MX35_H1_PM_BIT (1 << 8) -#define MX35_H1_IPPUE_UP_BIT (1 << 7) -#define MX35_H1_IPPUE_DOWN_BIT (1 << 6) -#define MX35_H1_TLL_BIT (1 << 5) -#define MX35_H1_USBTE_BIT (1 << 4) -#define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) -static void imx35_usb_init (void ) {unsigned int tmp;
arch/arm/mach-imx/include/mach/usb.h new file +14 -0
@@ -0,0 +1,14 @@ +#ifndef __MACH_USB_H_ +#define __MACH_USB_H_ + +/* configuration bits for i.MX25 and i.MX35 */ +#define MX35_H1_SIC_SHIFT 21 +#define MX35_H1_SIC_MASK (0x3 << MX35_H1_SIC_SHIFT) +#define MX35_H1_PM_BIT (1 << 8) +#define MX35_H1_IPPUE_UP_BIT (1 << 7) +#define MX35_H1_IPPUE_DOWN_BIT (1 << 6) +#define MX35_H1_TLL_BIT (1 << 5) +#define MX35_H1_USBTE_BIT (1 << 4) +#define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) + +#endif /* __MACH_USB_H_*/
Signature · 7 lines
1.7.0.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox