Patchwork [U-Boot,v2,2/4] arm:goni:dfu Add support for DFU at GONI target

login
register
mail settings
Submitter Łukasz Majewski
Date June 26, 2013, 10:23 a.m.
Message ID <1372242206-27701-1-git-send-email-l.majewski@samsung.com>
Download mbox | patch
Permalink /patch/254687/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Łukasz Majewski - June 26, 2013, 10:23 a.m.
From: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>

Proper adjustment for supporting DFU at GONI target has been made.
The s5p_goni.h file has been updated. Moreover the code for low level
USB initialization has been added to GONI board code.

Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>

---
Changes for v2:
- Remove blank line
---
 board/samsung/goni/goni.c  |    7 +++++++
 include/configs/s5p_goni.h |   20 +++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

 #define CONFIG_USB_GADGET
 #define CONFIG_USB_GADGET_S3C_UDC_OTG
 #define CONFIG_USB_GADGET_DUALSPEED
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
 
 #endif	/* __CONFIG_H */
Minkyu Kang - July 2, 2013, 8:59 a.m.
On 26/06/13 19:23, Lukasz Majewski wrote:
> From: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
> 
> Proper adjustment for supporting DFU at GONI target has been made.
> The s5p_goni.h file has been updated. Moreover the code for low level
> USB initialization has been added to GONI board code.
> 
> Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> 
> ---
> Changes for v2:
> - Remove blank line
> ---
>  board/samsung/goni/goni.c  |    7 +++++++
>  include/configs/s5p_goni.h |   20 +++++++++++++++++++-
>  2 files changed, 26 insertions(+), 1 deletion(-)
> 
> diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
> index ff76963..3c53106 100644
> --- a/board/samsung/goni/goni.c
> +++ b/board/samsung/goni/goni.c
> @@ -155,4 +155,11 @@ struct s3c_plat_otg_data s5pc110_otg_data = {
>  	.regs_otg = S5PC110_OTG_BASE,
>  	.usb_phy_ctrl = S5PC110_USB_PHY_CONTROL,
>  };
> +
> +void board_usb_init(void)
> +{
> +	debug("USB_udc_probe\n");
> +	s3c_udc_probe(&s5pc110_otg_data);
> +}
> +
>  #endif
> diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
> index ec43652..8a824c7 100644
> --- a/include/configs/s5p_goni.h
> +++ b/include/configs/s5p_goni.h
> @@ -86,6 +86,17 @@
>  #define CONFIG_CMD_ONENAND
>  #define CONFIG_CMD_MTDPARTS
>  #define CONFIG_CMD_MMC
> +#define CONFIG_CMD_DFU
> +
> +/* USB Composite download gadget - g_dnl */
> +#define CONFIG_USBDOWNLOAD_GADGET
> +#define CONFIG_DFU_FUNCTION
> +#define CONFIG_DFU_MMC
> +
> +/* USB Samsung's IDs */
> +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8
> +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601
> +#define CONFIG_G_DNL_MANUFACTURER "Samsung"
>  
>  #define CONFIG_BOOTDELAY		1
>  #define CONFIG_ZERO_BOOTDELAY_CHECK
> @@ -105,6 +116,10 @@
>  				",60m(qboot)"\
>  				",-(UBI)\0"
>  
> +#define CONFIG_DFU_ALT \
> +	"u-boot mmc 80 400;" \
> +	"uImage fat 0 2\0" \
> +
>  #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
>  
>  #define CONFIG_BOOTCOMMAND	"run mmcboot"
> @@ -175,7 +190,9 @@
>  	"bootblock=9\0" \
>  	"ubiblock=8\0" \
>  	"ubi=enabled\0" \
> -	"opts=always_resume=1"
> +	"opts=always_resume=1\0" \
> +	"dfu_alt_info=" CONFIG_DFU_ALT
>  
>  /* Miscellaneous configurable options */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
> @@ -242,5 +259,6 @@
>  #define CONFIG_USB_GADGET
>  #define CONFIG_USB_GADGET_S3C_UDC_OTG
>  #define CONFIG_USB_GADGET_DUALSPEED
> +#define CONFIG_USB_GADGET_VBUS_DRAW 2
>  
>  #endif	/* __CONFIG_H */
> 

failed to apply your patch.

$ git am -s U-Boot-2-4-arm-goni-dfu-Add-support-for-DFU-at-GONI-target.patch
Applying: arm:goni:dfu Add support for DFU at GONI target
fatal: corrupt patch at line 75
Patch failed at 0001 arm:goni:dfu Add support for DFU at GONI target


$ patch --dry-run -p1 < U-Boot-2-4-arm-goni-dfu-Add-support-for-DFU-at-GONI-target.patch 
patching file board/samsung/goni/goni.c
patching file include/configs/s5p_goni.h
patch: **** malformed patch at line 99: @@ -242,5 +259,6 @@


please check.

Thanks,
Minkyu Kang.

Patch

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index ff76963..3c53106 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -155,4 +155,11 @@  struct s3c_plat_otg_data s5pc110_otg_data = {
 	.regs_otg = S5PC110_OTG_BASE,
 	.usb_phy_ctrl = S5PC110_USB_PHY_CONTROL,
 };
+
+void board_usb_init(void)
+{
+	debug("USB_udc_probe\n");
+	s3c_udc_probe(&s5pc110_otg_data);
+}
+
 #endif
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index ec43652..8a824c7 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -86,6 +86,17 @@ 
 #define CONFIG_CMD_ONENAND
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_MMC
+#define CONFIG_CMD_DFU
+
+/* USB Composite download gadget - g_dnl */
+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_MMC
+
+/* USB Samsung's IDs */
+#define CONFIG_G_DNL_VENDOR_NUM 0x04E8
+#define CONFIG_G_DNL_PRODUCT_NUM 0x6601
+#define CONFIG_G_DNL_MANUFACTURER "Samsung"
 
 #define CONFIG_BOOTDELAY		1
 #define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -105,6 +116,10 @@ 
 				",60m(qboot)"\
 				",-(UBI)\0"
 
+#define CONFIG_DFU_ALT \
+	"u-boot mmc 80 400;" \
+	"uImage fat 0 2\0" \
+
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
 
 #define CONFIG_BOOTCOMMAND	"run mmcboot"
@@ -175,7 +190,9 @@ 
 	"bootblock=9\0" \
 	"ubiblock=8\0" \
 	"ubi=enabled\0" \
-	"opts=always_resume=1"
+	"opts=always_resume=1\0" \
+	"dfu_alt_info=" CONFIG_DFU_ALT
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
@@ -242,5 +259,6 @@