Skip to contentSkip to conversation

corvus, dfu: add dfu support

PATCH Superseded Heiko Schocher 2 participants 3 messages Aug 18, 2015 – Aug 21, 2015

lore
Share & tools
lore

Heiko Schocher

author
#0 lore raw

PATCH v2 1/1 corvus, dfu: add dfu support

add support for DFU on the corvus board.

Signed-off-by Heiko Schocher <[email protected]>

---

Changes in v2:
- rebase to 0d339cf9a969f0c249713d3697e735184f1bd955
- fix changes introduced through commit:
01acd6abbdd5: usb: USB download gadget and functions config options coherent naming

 board/siemens/corvus/board.c | 21 +++++++++++++++++++++
 include/configs/corvus.h     | 29 +++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
board/siemens/corvus/board.c +21 -0
index f3f6dae..426d0cd 100644
@@ -29,6 +29,10 @@
 #include <netdev.h>
 #include <spi.h>
 
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+#include <asm/arch/atmel_usba_udc.h>
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static void corvus_nand_hw_init(void)

@@ -210,6 +214,19 @@ int board_early_init_f(void)
 	return 0;
 }
 
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+/* from ./arch/arm/mach-at91/armv7/sama5d3_devices.c */
+void at91_udp_hw_init(void)
+{
+	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
+
+	/* Enable UPLL clock */
+	writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
+	/* Enable UDPHS clock */
+	at91_periph_clk_enable(ATMEL_ID_UDPHS);
+}
+#endif
+
 int board_init(void)
 {
 	/* address of boot parameters */

@@ -230,6 +247,10 @@ int board_init(void)
 #ifdef CONFIG_CMD_USB
 	taurus_usb_hw_init();
 #endif
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+	at91_udp_hw_init();
+	usba_udc_probe(&pdata);
+#endif
 	return 0;
 }
include/configs/corvus.h +27 -2
index 2d2f3c1..2bad20f 100644
@@ -113,7 +113,32 @@
 #define CONFIG_DOS_PARTITION
 #define CONFIG_USB_STORAGE
 
-#define CONFIG_SYS_LOAD_ADDR		0x72000000	/* load address */
+/* USB DFU support */
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_DUALSPEED
+#define CONFIG_USB_GADGET_ATMEL_USBA
+
+/* DFU class support */
+#define CONFIG_CMD_DFU
+#define CONFIG_USB_FUNCTION_DFU
+#define CONFIG_DFU_NAND
+#define CONFIG_USB_GADGET_DOWNLOAD
+#define CONFIG_USB_GADGET_VBUS_DRAW	2
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE	(1 << 20)
+#define DFU_MANIFEST_POLL_TIMEOUT	25000
+
+/* USB DFU IDs */
+#define CONFIG_G_DNL_VENDOR_NUM 0x0908
+#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
+#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
+
+#define CONFIG_SYS_CACHELINE_SIZE	0x2000
+/* fuer was das ? */
+#define CONFIG_SYS_LOAD_ADDR	ATMEL_BASE_CS6
 
 /* bootstrap + u-boot + env in nandflash */
 #define CONFIG_ENV_IS_IN_NAND

@@ -146,7 +171,7 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN	ROUND(3 * CONFIG_ENV_SIZE + \
-				128*1024, 0x1000)
+				4*1024*1024, 0x1000)
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x300000
Signature · 1 line
2.1.0
#1 lore raw

PATCH v2 1/1 corvus, dfu: add dfu support

Hi Heiko,

Just some minor comments:

Quoted 76 lines

add support for DFU on the corvus board.

Signed-off-by Heiko Schocher <[email protected]>

---

Changes in v2:
- rebase to 0d339cf9a969f0c249713d3697e735184f1bd955
- fix changes introduced through commit:
01acd6abbdd5: usb: USB download gadget and functions config options
coherent naming

 board/siemens/corvus/board.c | 21 +++++++++++++++++++++
 include/configs/corvus.h     | 29 +++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/siemens/corvus/board.c index f3f6dae..426d0cd 100644

board/siemens/corvus/board.c +21 -0
@@ -29,6 +29,10 @@
 #include <netdev.h>
 #include <spi.h>
 
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+#include <asm/arch/atmel_usba_udc.h>
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static void corvus_nand_hw_init(void)

@@ -210,6 +214,19 @@ int board_early_init_f(void)
 	return 0;
 }
 
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+/* from ./arch/arm/mach-at91/armv7/sama5d3_devices.c */
+void at91_udp_hw_init(void)
+{
+	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
+
+	/* Enable UPLL clock */
+	writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
+	/* Enable UDPHS clock */
+	at91_periph_clk_enable(ATMEL_ID_UDPHS);
+}
+#endif
+
 int board_init(void)
 {
 	/* address of boot parameters */

@@ -230,6 +247,10 @@ int board_init(void)
 #ifdef CONFIG_CMD_USB
 	taurus_usb_hw_init();
 #endif
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+	at91_udp_hw_init();
+	usba_udc_probe(&pdata);
+#endif
 	return 0;
 }
include/configs/corvus.h +0 -1
index 2d2f3c1..2bad20f 100644
@@ -113,7 +113,32 @@
 #define CONFIG_DOS_PARTITION
 #define CONFIG_USB_STORAGE
 
-#define CONFIG_SYS_LOAD_ADDR		0x72000000	/*

load address */ +/* USB DFU support */

include/configs/corvus.h +5 -0
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+
+#define CONFIG_USB_GADGET

include/configs/corvus.h line 131

Quoted 10 lines
include/configs/corvus.h +10 -0
+#define CONFIG_USB_GADGET_DUALSPEED
+#define CONFIG_USB_GADGET_ATMEL_USBA
+
+/* DFU class support */
+#define CONFIG_CMD_DFU
+#define CONFIG_USB_FUNCTION_DFU
+#define CONFIG_DFU_NAND
+#define CONFIG_USB_GADGET_DOWNLOAD
+#define CONFIG_USB_GADGET_VBUS_DRAW	2
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE	(1 << 20)

Please use SZ_1M instead

include/configs/corvus.h line 140

Quoted 9 lines
include/configs/corvus.h +9 -0
+#define DFU_MANIFEST_POLL_TIMEOUT	25000
+
+/* USB DFU IDs */
+#define CONFIG_G_DNL_VENDOR_NUM 0x0908
+#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
+#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
+
+#define CONFIG_SYS_CACHELINE_SIZE	0x2000
+/* fuer was das ? */

Was is das? :-)

include/configs/corvus.h line 174

Quoted 10 lines
include/configs/corvus.h +2 -1
+#define CONFIG_SYS_LOAD_ADDR	ATMEL_BASE_CS6
 
 /* bootstrap + u-boot + env in nandflash */
 #define CONFIG_ENV_IS_IN_NAND

@@ -146,7 +171,7 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN	ROUND(3 * CONFIG_ENV_SIZE + \
-				128*1024, 0x1000)
+				4*1024*1024, 0x1000)

				^^^^^^^^^^^ This also can be rewritten
				to use SZ_1M
Quoted 3 lines
include/configs/corvus.h +0 -0
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x300000
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
author
#2 lore raw

PATCH v2 1/1 corvus, dfu: add dfu support

Hello Lukasz,

Am 21.08.2015 um 10:25 schrieb Lukasz Majewski:

Quoted 84 lines

Hi Heiko,

Just some minor comments:

Quoted 80 lines

add support for DFU on the corvus board.

Signed-off-by Heiko Schocher <[email protected]>

---

Changes in v2:
- rebase to 0d339cf9a969f0c249713d3697e735184f1bd955
- fix changes introduced through commit:
01acd6abbdd5: usb: USB download gadget and functions config options
coherent naming

  board/siemens/corvus/board.c | 21 +++++++++++++++++++++
  include/configs/corvus.h     | 29 +++++++++++++++++++++++++++--
  2 files changed, 48 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/siemens/corvus/board.c index f3f6dae..426d0cd 100644

board/siemens/corvus/board.c +21 -0
@@ -29,6 +29,10 @@
  #include <netdev.h>
  #include <spi.h>
 
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+#include <asm/arch/atmel_usba_udc.h>
+#endif
+
  DECLARE_GLOBAL_DATA_PTR;
 
  static void corvus_nand_hw_init(void)

@@ -210,6 +214,19 @@ int board_early_init_f(void)
  	return 0;
  }
 
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+/* from ./arch/arm/mach-at91/armv7/sama5d3_devices.c */
+void at91_udp_hw_init(void)
+{
+	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
+
+	/* Enable UPLL clock */
+	writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
+	/* Enable UDPHS clock */
+	at91_periph_clk_enable(ATMEL_ID_UDPHS);
+}
+#endif
+
  int board_init(void)
  {
  	/* address of boot parameters */

@@ -230,6 +247,10 @@ int board_init(void)
  #ifdef CONFIG_CMD_USB
  	taurus_usb_hw_init();
  #endif
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+	at91_udp_hw_init();
+	usba_udc_probe(&pdata);
+#endif
  	return 0;
  }
include/configs/corvus.h +0 -1
index 2d2f3c1..2bad20f 100644
@@ -113,7 +113,32 @@
  #define CONFIG_DOS_PARTITION
  #define CONFIG_USB_STORAGE
 
-#define CONFIG_SYS_LOAD_ADDR		0x72000000	/*

load address */ +/* USB DFU support */

include/configs/corvus.h +9 -0
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_DUALSPEED
+#define CONFIG_USB_GADGET_ATMEL_USBA
+
+/* DFU class support */
Quoted 8 lines

include/configs/corvus.h line 131

Quoted 6 lines
include/configs/corvus.h +6 -0
+#define CONFIG_CMD_DFU
+#define CONFIG_USB_FUNCTION_DFU
+#define CONFIG_DFU_NAND
+#define CONFIG_USB_GADGET_DOWNLOAD
+#define CONFIG_USB_GADGET_VBUS_DRAW	2
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE	(1 << 20)

Please use SZ_1M instead

This is done in the follwoing patch ... maybe I should permute them.

Quoted 11 lines

include/configs/corvus.h line 140

Quoted 9 lines
include/configs/corvus.h +9 -0
+#define DFU_MANIFEST_POLL_TIMEOUT	25000
+
+/* USB DFU IDs */
+#define CONFIG_G_DNL_VENDOR_NUM 0x0908
+#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
+#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
+
+#define CONFIG_SYS_CACHELINE_SIZE	0x2000
+/* fuer was das ? */

Was is das? :-)

Hups... remove this.

Quoted 15 lines

include/configs/corvus.h line 174

Quoted 10 lines
include/configs/corvus.h +2 -1
+#define CONFIG_SYS_LOAD_ADDR	ATMEL_BASE_CS6
 
  /* bootstrap + u-boot + env in nandflash */
  #define CONFIG_ENV_IS_IN_NAND

@@ -146,7 +171,7 @@
   * Size of malloc() pool
   */
  #define CONFIG_SYS_MALLOC_LEN	ROUND(3 * CONFIG_ENV_SIZE + \
-				128*1024, 0x1000)
+				4*1024*1024, 0x1000)

				^^^^^^^^^^^ This also can be rewritten
				to use SZ_1M
Quoted 3 lines
include/configs/corvus.h +0 -0
  /* Defines for SPL */
  #define CONFIG_SPL_FRAMEWORK
  #define CONFIG_SPL_TEXT_BASE		0x300000

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany