ARM: DRA7XX: Add config file for Android with fastboot support

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c +0 -0

index 346ab80..d7b8f6d 100644
@@ -10,11 +10,13 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>

-----Original Message-----
From: Dileep Katta [mailto:dileep.katta at linaro.org]
Sent: Tuesday, March 03, 2015 5:11 AM
To: u-boot at lists.denx.de; robherring2 at gmail.com; Rini, Tom; rob.herring at linaro.org; srae at broadcom.com; l.majewski at samsung.com; Stegmaier, Angela
Cc: Dileep Katta
Subject: [U-Boot][PATCH v2 2/4] fastboot: call board_usb_init() to enable usb

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c index renamed from common/cmd_fastboot.c +0 -0

346ab80..d7b8f6d 100644

common/cmd_fastboot.c +0 -1

 	g_dnl_clear_detach();
 	ret = g_dnl_register("usb_dnl_fastboot");
 	if (ret)
--

1.8.3.2

Hi Dileep,

Quoted 30 lines

-----Original Message-----
From: Dileep Katta [mailto:dileep.katta at linaro.org]
Sent: Tuesday, March 03, 2015 5:11 AM
To: u-boot at lists.denx.de; robherring2 at gmail.com; Rini, Tom; rob.herring at linaro.org; srae at broadcom.com; l.majewski at samsung.com; Stegmaier, Angela
Cc: Dileep Katta
Subject: [U-Boot][PATCH v2 2/4] fastboot: call board_usb_init() to enable usb

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c index renamed from common/cmd_fastboot.c +0 -0

346ab80..d7b8f6d 100644

common/cmd_fastboot.c +1 -0

@@ -10,11 +10,13 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 

common/cmd_fastboot.c line 19

Quoted 5 lines

common/cmd_fastboot.c +1 -0

 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const
 argv[])  {
 	int ret;
 
+	board_usb_init(0, USB_INIT_DEVICE);

The controller index should be configurable. Also, should board_usb_cleanup be called at the end?

Quoted 10 lines · Angela

Hi Dileep,

Quoted 8 lines

-----Original Message-----
From: Dileep Katta [mailto:dileep.katta at linaro.org]
Sent: Tuesday, March 03, 2015 5:11 AM
To: u-boot at lists.denx.de; robherring2 at gmail.com; Rini, Tom; rob.herring at linaro.org; srae at broadcom.com; l.majewski at samsung.com; Stegmaier, Angela
Cc: Dileep Katta
Subject: [U-Boot][PATCH v2 2/4] fastboot: call board_usb_init() to

enable

Quoted 22 lines

Quoted 22 lines

usb

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c index renamed from common/cmd_fastboot.c +0 -0

346ab80..d7b8f6d 100644

common/cmd_fastboot.c +1 -0

@@ -10,11 +10,13 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 

Quoted 1 line

common/cmd_fastboot.c line 15

Quoted 1 line

common/cmd_fastboot.c +0 -0

 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char

*const

Quoted 3 lines

Quoted 3 lines

common/cmd_fastboot.c +0 -0

 argv[])  {
    int ret;
 

Quoted 3 lines

common/cmd_fastboot.c line 19

Quoted 1 line

common/cmd_fastboot.c +1 -0

+   board_usb_init(0, USB_INIT_DEVICE);

The controller index should be configurable. Also, should

board_usb_cleanup be called at the end?

I _really_ _really_ want to see if we can modify things so that we don't have to sprinkle ever gadget driver with a cleanup() and every gadget too if we don't have to. Thanks!

--
Tom

Quoted 44 lines · Tom Rini

Quoted 10 lines · Angela

Hi Dileep,

Quoted 8 lines

-----Original Message-----
From: Dileep Katta [mailto:dileep.katta at linaro.org]
Sent: Tuesday, March 03, 2015 5:11 AM
To: u-boot at lists.denx.de; robherring2 at gmail.com; Rini, Tom; rob.herring at linaro.org; srae at broadcom.com; l.majewski at samsung.com; Stegmaier, Angela
Cc: Dileep Katta
Subject: [U-Boot][PATCH v2 2/4] fastboot: call board_usb_init() to

enable

Quoted 22 lines

Quoted 22 lines

usb

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c index renamed from common/cmd_fastboot.c +0 -0

346ab80..d7b8f6d 100644

common/cmd_fastboot.c +1 -0

@@ -10,11 +10,13 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 

Quoted 1 line

common/cmd_fastboot.c line 15

Quoted 1 line

common/cmd_fastboot.c +0 -0

 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char

*const

Quoted 6 lines

common/cmd_fastboot.c line 19

Quoted 4 lines

common/cmd_fastboot.c +1 -0

 argv[])  {
    int ret;
 
+   board_usb_init(0, USB_INIT_DEVICE);

The controller index should be configurable. Also, should

board_usb_cleanup be called at the end?

Quoted 3 lines

I _really_ _really_ want to see if we can modify things so that we don't have to sprinkle ever gadget driver with a cleanup() and every gadget too if we don't have to. Thanks!

Most of the boards have board_usb_cleanup() as just a stub. For some, the function is not present, and adding board_usb_cleanup() here breaks the build for others with fastboot enabled.

Quoted 36 lines · Dileep Katta

Quoted 34 lines · Tom Rini

Quoted 10 lines · Angela

Hi Dileep,

Quoted 8 lines

-----Original Message-----
From: Dileep Katta [mailto:dileep.katta at linaro.org]
Sent: Tuesday, March 03, 2015 5:11 AM
To: u-boot at lists.denx.de; robherring2 at gmail.com; Rini, Tom; rob.herring at linaro.org; srae at broadcom.com; l.majewski at samsung.com; Stegmaier, Angela
Cc: Dileep Katta
Subject: [U-Boot][PATCH v2 2/4] fastboot: call board_usb_init() to

enable

Quoted 22 lines

Quoted 22 lines

usb

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c index renamed from common/cmd_fastboot.c +0 -0

346ab80..d7b8f6d 100644

common/cmd_fastboot.c +1 -0

@@ -10,11 +10,13 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 

Quoted 8 lines

Quoted 8 lines

Quoted 1 line

common/cmd_fastboot.c line 15

Quoted 1 line

common/cmd_fastboot.c +0 -0

 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char

*const

Quoted 6 lines

common/cmd_fastboot.c line 19

Quoted 4 lines

common/cmd_fastboot.c +1 -0

 argv[])  {
    int ret;
 
+   board_usb_init(0, USB_INIT_DEVICE);

The controller index should be configurable.

Also, should

Quoted 3 lines

Quoted 3 lines

board_usb_cleanup be called at the end?

I _really_ _really_ want to see if we can modify things so that we

don't

Quoted 3 lines

Quoted 2 lines

have to sprinkle ever gadget driver with a cleanup() and every gadget too if we don't have to. Thanks!

Quoted 3 lines

Most of the boards have board_usb_cleanup() as just a stub. For some, the function is not present, and adding board_usb_cleanup() here breaks the build for others with fastboot enabled.

That's a problem that needs fixing since those boards without a functional board_usb_cleanup() are likely causing breakage in Linux.

--
Tom

Quoted 46 lines · Dileep Katta

Quoted 44 lines · Tom Rini

Quoted 43 lines

Quoted 11 lines · Angela

Hi Dileep,

Quoted 9 lines

-----Original Message-----
From: Dileep Katta [mailto:dileep.katta at linaro.org]
Sent: Tuesday, March 03, 2015 5:11 AM
To: u-boot at lists.denx.de; robherring2 at gmail.com; Rini, Tom; rob.herring at linaro.org; srae at broadcom.com; l.majewski at samsung.com; Stegmaier, Angela
Cc: Dileep Katta
Subject: [U-Boot][PATCH v2 2/4] fastboot: call board_usb_init() to

enable

Quoted 22 lines

Quoted 22 lines

usb

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot.
Calling board_usb_init() fixes this.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 common/cmd_fastboot.c | 2 ++
 1 file changed, 2 insertions(+)

common/cmd_fastboot.c +1 -0

index 346ab80..d7b8f6d 100644
@@ -10,11 +10,13 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 

Quoted 2 lines

Quoted 2 lines

common/cmd_fastboot.c +0 -0

 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int

argc, char

*const

Quoted 3 lines

Quoted 3 lines

argv[])  {
    int ret;

Quoted 4 lines

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

Quoted 1 line

+ board_usb_init(0, USB_INIT_DEVICE);

The controller index should be configurable.

We are not getting controller Index as an argument for fastboot function. Might have to add extra logic to get the same. But do we need configurable index here for fastboot? Experts, please advise.

Quoted 10 lines

Also, should

Quoted 4 lines

Quoted 4 lines

board_usb_cleanup be called at the end?

I _really_ _really_ want to see if we can modify things so that we

don't

Quoted 3 lines

Quoted 2 lines

have to sprinkle ever gadget driver with a cleanup() and every gadget too if we don't have to. Thanks!

Quoted 7 lines

Quoted 3 lines

Most of the boards have board_usb_cleanup() as just a stub. For some, the function is not present, and adding board_usb_cleanup() here breaks the build for others with fastboot enabled.

That's a problem that needs fixing since those boards without a functional board_usb_cleanup() are likely causing breakage in Linux.

Will add the board_usb_cleanup() function at the end.

Quoted 5 lines

--
Tom

Quoted 4 lines

We are not getting controller Index as an argument for fastboot function. Might have to add extra logic to get the same. But do we need configurable index here for fastboot? Experts, please advise.

Some time ago we have changed syntax of all gadget related commands (from e.g. dfu mmc 0 -> dfu 0 mmc 0) to support different controllers. Rationale was to prepare ourself for future changes.

IMHO it would be feasible to do the same with fastboot command. However, lets wait for Marek's opinion.

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot. Calling board_usb_init() to fix this. fastboot command is now added with an optional controller index argument with default value as 0, to facilitate configurable controller index.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
Changes in v2:
- Changed fastboot command to facilitate passing controller
index
- Added board_usb_cleanup()
This patch considers the following change by Inha Song, without which the build will be broken on BeagleBone Black platform

	https://patchwork.ozlabs.org/patch/430303/

 common/cmd_fastboot.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

common/cmd_fastboot.c +8 -0

index 346ab80..9ca4a2f 100644
@@ -10,11 +10,19 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
 *const argv[]) {
 	int ret;
+	int controller_index = 0;
 
+	if (argc == 2) {
+		char *usb_controller = argv[1];
+		controller_index = simple_strtoul(usb_controller,
 NULL, 0);
+	}
+
+	board_usb_init(controller_index, USB_INIT_DEVICE);
 	g_dnl_clear_detach();
 	ret = g_dnl_register("usb_dnl_fastboot");

common/cmd_fastboot.c +1 -0

 	if (ret)

@@ -36,12 +44,13 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int
 flag, int argc, char *const argv[]) 
 	g_dnl_unregister();
 	g_dnl_clear_detach();
+	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
 	return CMD_RET_SUCCESS;
 }

Hi Dileep,

Quoted 52 lines

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot. Calling board_usb_init() to fix this. fastboot command is now added with an optional controller index argument with default value as 0, to facilitate configurable controller index.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
Changes in v2:
- Changed fastboot command to facilitate passing controller
index
- Added board_usb_cleanup()
This patch considers the following change by Inha Song, without which the build will be broken on BeagleBone Black platform

      https://patchwork.ozlabs.org/patch/430303/

 common/cmd_fastboot.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

common/cmd_fastboot.c +8 -0

index 346ab80..9ca4a2f 100644
@@ -10,11 +10,19 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
 *const argv[]) {
      int ret;
+     int controller_index = 0;
 
+     if (argc == 2) {
+             char *usb_controller = argv[1];
+             controller_index = simple_strtoul(usb_controller,
 NULL, 0);
+     }
+
+     board_usb_init(controller_index, USB_INIT_DEVICE);
      g_dnl_clear_detach();
      ret = g_dnl_register("usb_dnl_fastboot");

if (ret)

common/cmd_fastboot.c +1 -0

@@ -36,12 +44,13 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int
 flag, int argc, char *const argv[])
      g_dnl_unregister();
      g_dnl_clear_detach();
+     board_usb_cleanup(controller_index, USB_INIT_DEVICE);
      return CMD_RET_SUCCESS;
 }

common/cmd_fastboot.c static int do_fastboot(cmd_tbl_t *cmdtp, int · line 56

Quoted 10 lines

common/cmd_fastboot.c +3 -3

 
 U_BOOT_CMD(
-     fastboot,       1,      0,      do_fastboot,
+     fastboot,       2,      0,      do_fastboot,
      "use USB Fastboot protocol",
-     "\nLukasz Majewski <[email protected]>"
-     "    - run as a fastboot usb device"
+     "[<USB_controller>]\n"
+     "    - run as a fastboot usb device via <USB_controller>"
 );

Acked-by Lukasz Majewski <[email protected]>

Since I'm not CC'ed to all patches, I assume that this work would go via other tree?

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Hi Lukasz,

Quoted 67 lines · Lukasz Majewski

Hi Dileep,

Quoted 52 lines

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot. Calling board_usb_init() to fix this. fastboot command is now added with an optional controller index argument with default value as 0, to facilitate configurable controller index.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
Changes in v2:
- Changed fastboot command to facilitate passing controller
index
- Added board_usb_cleanup()
This patch considers the following change by Inha Song, without which the build will be broken on BeagleBone Black platform

      https://patchwork.ozlabs.org/patch/430303/

 common/cmd_fastboot.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

common/cmd_fastboot.c +8 -0

index 346ab80..9ca4a2f 100644
@@ -10,11 +10,19 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
 *const argv[]) {
      int ret;
+     int controller_index = 0;
 
+     if (argc == 2) {
+             char *usb_controller = argv[1];
+             controller_index = simple_strtoul(usb_controller,
 NULL, 0);
+     }
+
+     board_usb_init(controller_index, USB_INIT_DEVICE);
      g_dnl_clear_detach();
      ret = g_dnl_register("usb_dnl_fastboot");

if (ret)

common/cmd_fastboot.c +1 -0

@@ -36,12 +44,13 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int
 flag, int argc, char *const argv[])
      g_dnl_unregister();
      g_dnl_clear_detach();
+     board_usb_cleanup(controller_index, USB_INIT_DEVICE);
      return CMD_RET_SUCCESS;
 }

common/cmd_fastboot.c static int do_fastboot(cmd_tbl_t *cmdtp, int · line 56

Quoted 10 lines

common/cmd_fastboot.c +3 -3

 
 U_BOOT_CMD(
-     fastboot,       1,      0,      do_fastboot,
+     fastboot,       2,      0,      do_fastboot,
      "use USB Fastboot protocol",
-     "\nLukasz Majewski <[email protected]>"
-     "    - run as a fastboot usb device"
+     "[<USB_controller>]\n"
+     "    - run as a fastboot usb device via <USB_controller>"
 );

Acked-by Lukasz Majewski <[email protected]>

Quoted 3 lines

Since I'm not CC'ed to all patches, I assume that this work would go via other tree?

Other patches are TI board specific and I am working on next version of the patches as per the review comments.
I felt that this is generic functionality and hence sent it separately. Do you want me send all patches?

Regards, Dileep

Quoted 4 lines

--
Best regards,

Quoted 4 lines

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Quoted 72 lines · On Sat, 14 Mar 2015 00:58:51 +0530 Dileep Katta <[email protected]> wrote:

Hi Lukasz,

Quoted 67 lines · Lukasz Majewski

Hi Dileep,

Quoted 52 lines

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot. Calling board_usb_init() to fix this. fastboot command is now added with an optional controller index argument with default value as 0, to facilitate configurable controller index.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
Changes in v2:
- Changed fastboot command to facilitate passing controller
index
- Added board_usb_cleanup()
This patch considers the following change by Inha Song, without which the build will be broken on BeagleBone Black platform

      https://patchwork.ozlabs.org/patch/430303/

 common/cmd_fastboot.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

common/cmd_fastboot.c +8 -0

index 346ab80..9ca4a2f 100644
@@ -10,11 +10,19 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
 *const argv[]) {
      int ret;
+     int controller_index = 0;
 
+     if (argc == 2) {
+             char *usb_controller = argv[1];
+             controller_index = simple_strtoul(usb_controller,
 NULL, 0);
+     }
+
+     board_usb_init(controller_index, USB_INIT_DEVICE);
      g_dnl_clear_detach();
      ret = g_dnl_register("usb_dnl_fastboot");

if (ret)

common/cmd_fastboot.c +1 -0

@@ -36,12 +44,13 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int
 flag, int argc, char *const argv[])
      g_dnl_unregister();
      g_dnl_clear_detach();
+     board_usb_cleanup(controller_index, USB_INIT_DEVICE);
      return CMD_RET_SUCCESS;
 }

common/cmd_fastboot.c static int do_fastboot(cmd_tbl_t *cmdtp, int · line 56

Quoted 10 lines

common/cmd_fastboot.c +3 -3

 
 U_BOOT_CMD(
-     fastboot,       1,      0,      do_fastboot,
+     fastboot,       2,      0,      do_fastboot,
      "use USB Fastboot protocol",
-     "\nLukasz Majewski <[email protected]>"
-     "    - run as a fastboot usb device"
+     "[<USB_controller>]\n"
+     "    - run as a fastboot usb device via <USB_controller>"
 );

Acked-by Lukasz Majewski <[email protected]>

Quoted 7 lines

Quoted 3 lines

Since I'm not CC'ed to all patches, I assume that this work would go via other tree?

Other patches are TI board specific and I am working on next version of the patches as per the review comments.
I felt that this is generic functionality and hence sent it separately. Do you want me send all patches?

No, it is not necessary. Regarding above, I assume that Tom will probably fetch those patches.

I was just concern about tree to which this patch should belong.

Regards,
Lukasz

Quoted 15 lines

Regards, Dileep

Quoted 8 lines

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Experts,
Please send your valuable comments if this patch needs any change.

Regards, Dileep

Quoted 83 lines · Lukasz Majewski

Quoted 72 lines · On Sat, 14 Mar 2015 00:58:51 +0530 Dileep Katta <[email protected]> wrote:

Hi Lukasz,

Quoted 67 lines · Lukasz Majewski

Hi Dileep,

Quoted 52 lines

g_dnl_gadget_register() fails for dra7xx dwc3 gadget when running cmd_fastboot. Calling board_usb_init() to fix this. fastboot command is now added with an optional controller index argument with default value as 0, to facilitate configurable controller index.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
Changes in v2:
- Changed fastboot command to facilitate passing controller
index
- Added board_usb_cleanup()
This patch considers the following change by Inha Song, without which the build will be broken on BeagleBone Black platform

      https://patchwork.ozlabs.org/patch/430303/

 common/cmd_fastboot.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

common/cmd_fastboot.c +8 -0

index 346ab80..9ca4a2f 100644
@@ -10,11 +10,19 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
 *const argv[]) {
      int ret;
+     int controller_index = 0;
 
+     if (argc == 2) {
+             char *usb_controller = argv[1];
+             controller_index = simple_strtoul(usb_controller,
 NULL, 0);
+     }
+
+     board_usb_init(controller_index, USB_INIT_DEVICE);
      g_dnl_clear_detach();
      ret = g_dnl_register("usb_dnl_fastboot");

if (ret)

common/cmd_fastboot.c +1 -0

@@ -36,12 +44,13 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int
 flag, int argc, char *const argv[])
      g_dnl_unregister();
      g_dnl_clear_detach();
+     board_usb_cleanup(controller_index, USB_INIT_DEVICE);
      return CMD_RET_SUCCESS;
 }

common/cmd_fastboot.c static int do_fastboot(cmd_tbl_t *cmdtp, int · line 56

Quoted 10 lines

common/cmd_fastboot.c +3 -3

 
 U_BOOT_CMD(
-     fastboot,       1,      0,      do_fastboot,
+     fastboot,       2,      0,      do_fastboot,
      "use USB Fastboot protocol",
-     "\nLukasz Majewski <[email protected]>"
-     "    - run as a fastboot usb device"
+     "[<USB_controller>]\n"
+     "    - run as a fastboot usb device via <USB_controller>"
 );

Acked-by Lukasz Majewski <[email protected]>

Quoted 7 lines

Quoted 3 lines

Since I'm not CC'ed to all patches, I assume that this work would go via other tree?

Other patches are TI board specific and I am working on next version of the patches as per the review comments.
I felt that this is generic functionality and hence sent it separately. Do you want me send all patches?

Quoted 25 lines

No, it is not necessary. Regarding above, I assume that Tom will probably fetch those patches.

I was just concern about tree to which this patch should belong.

Regards,
Lukasz

Quoted 15 lines

Regards, Dileep

Quoted 8 lines

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Quoted 2 lines · Dileep Katta

Experts,
Please send your valuable comments if this patch needs any change.

Assuming everything has acks I'll pick it up for the next release, thanks.

Quoted 6 lines · Dileep Katta

Quoted 2 lines

Experts,
Please send your valuable comments if this patch needs any change.

Assuming everything has acks I'll pick it up for the next release, thanks.

Lukasz can pick it through the correct tree for next release just fine I think.

Best regards,
Marek Vasut

Adds the registers to get the serial number of dra7xx boards. Serial# environment variable will be set if not done already. This will be useful to show correct information in "fastboot devices" commands.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/prcm-regs.c |  2 ++
 arch/arm/include/asm/omap_common.h   |  2 ++
 board/ti/dra7xx/evm.c                | 11 +++++++++++
 3 files changed, 15 insertions(+)

(quoted diff) +0 -0

b/arch/arm/cpu/armv7/omap5/prcm-regs.c index 0745d42..020a964 100644

arch/arm/cpu/armv7/omap5/prcm-regs.c +2 -0

@@ -440,6 +440,8 @@ struct omap_sys_ctrl_regs const dra7xx_ctrl = {
 	.control_emif1_sdram_config_ext		= 0x4AE0C144,
 	.control_emif2_sdram_config_ext		= 0x4AE0C148,
 	.control_wkup_ldovbb_mpu_voltage_ctrl	= 0x4AE0C158,
+	.control_std_fuse_die_id_3		= 0x4AE0C210,
+	.control_std_fuse_prod_id_0		= 0x4AE0C214,
 	.control_padconf_mode			= 0x4AE0C5A0,
 	.control_xtal_oscillator		= 0x4AE0C5A4,
 	.control_i2c_2				= 0x4AE0C5A8,

(quoted diff) +0 -0

b/arch/arm/include/asm/omap_common.h index 323952f..b329803 100644

arch/arm/include/asm/omap_common.h +2 -0

@@ -362,6 +362,8 @@ struct omap_sys_ctrl_regs {
 	u32 control_core_control_io1;
 	u32 control_core_control_io2;
 	u32 control_id_code;
+	u32 control_std_fuse_die_id_3;
+	u32 control_std_fuse_prod_id_0;
 	u32 control_std_fuse_opp_bgap;
 	u32 control_ldosram_iva_voltage_ctrl;
 	u32 control_ldosram_mpu_voltage_ctrl;

board/ti/dra7xx/evm.c +11 -0

index 6522241..e20d950 100644
@@ -88,10 +88,21 @@ int board_init(void)
 int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+	char serialno[72];
+	uint32_t serialno_lo, serialno_hi;
+
 	if (omap_revision() == DRA722_ES1_0)
 		setenv("board_name", "dra72x");
 	else
 		setenv("board_name", "dra7xx");
+
+	if (!getenv("serial#")) {
+		printf("serial# not set, setting...\n");
+		serialno_lo =
 readl((*ctrl)->control_std_fuse_die_id_3);
+		serialno_hi =
 readl((*ctrl)->control_std_fuse_prod_id_0);
+		sprintf(serialno, "%08x%08x", serialno_hi,
 serialno_lo);
+		setenv("serial#", serialno);
+	}

#endif
return 0;
}

Adds the registers to get the serial number of dra7xx boards. Serial# environment variable will be set if not done already. This will be useful to show correct information in "fastboot devices" commands.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

Adds the registers to get the serial number of dra7xx boards. Serial# environment variable will be set if not done already. This will be useful to show correct information in "fastboot devices" commands.

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/prcm-regs.c |  2 ++
 arch/arm/include/asm/omap_common.h   |  2 ++
 board/ti/dra7xx/evm.c                | 11 +++++++++++
 3 files changed, 15 insertions(+)

arch/arm/cpu/armv7/omap5/prcm-regs.c +0 -0

index 0745d42..020a964 100644

arch/arm/cpu/armv7/omap5/prcm-regs.c +0 -0

 	.control_padconf_mode			= 0x4AE0C5A0,
 	.control_xtal_oscillator		= 0x4AE0C5A4,
 	.control_i2c_2				= 0x4AE0C5A8,

arch/arm/include/asm/omap_common.h +2 -0

index 323952f..b329803 100644
@@ -362,6 +362,8 @@ struct omap_sys_ctrl_regs {
 	u32 control_core_control_io1;
 	u32 control_core_control_io2;
 	u32 control_id_code;
+	u32 control_std_fuse_die_id_3;
+	u32 control_std_fuse_prod_id_0;
 	u32 control_std_fuse_opp_bgap;
 	u32 control_ldosram_iva_voltage_ctrl;
 	u32 control_ldosram_mpu_voltage_ctrl;

board/ti/dra7xx/evm.c +11 -0

index 6522241..e20d950 100644
@@ -88,10 +88,21 @@ int board_init(void)
 int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+	char serialno[72];
+	uint32_t serialno_lo, serialno_hi;
+
 	if (omap_revision() == DRA722_ES1_0)
 		setenv("board_name", "dra72x");
 	else
 		setenv("board_name", "dra7xx");
+
+	if (!getenv("serial#")) {
+		printf("serial# not set, setting...\n");
+		serialno_lo = readl((*ctrl)->control_std_fuse_die_id_3);
+		serialno_hi = readl((*ctrl)->control_std_fuse_prod_id_0);
+		sprintf(serialno, "%08x%08x", serialno_hi, serialno_lo);
+		setenv("serial#", serialno);
+	}
 #endif
 	return 0;
 }

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/Kconfig     |   5 +
 board/ti/dra7xx/Kconfig              |  13 ++
 board/ti/dra7xx/MAINTAINERS          |   2 +
 configs/dra7xx_evm_android_defconfig |   5 +
 include/configs/dra7xx_evm_android.h | 313
+++++++++++++++++++++++++++++++++++
 5 files changed, 338 insertions(+)
 create mode 100644 configs/dra7xx_evm_android_defconfig
 create mode 100644 include/configs/dra7xx_evm_android.h

arch/arm/cpu/armv7/omap5/Kconfig +5 -0

index aca862d..d8e9b2d 100644
@@ -12,6 +12,11 @@ config TARGET_OMAP5_UEVM
 config TARGET_DRA7XX_EVM
        bool "TI DRA7XX"
 
+config TARGET_DRA7XX_EVM_ANDROID
+       bool "TI DRA7XX ANDROID"
+       ---help---
+       TI DRA7XX build for Android. Enables Fastboot.
+
 config TARGET_BEAGLE_X15
        bool "BeagleBoard X15"
 

board/ti/dra7xx/Kconfig +13 -0

index 3bbd866..6837998 100644
@@ -10,3 +10,16 @@ config SYS_CONFIG_NAME
        default "dra7xx_evm"
 
 endif
+
+if TARGET_DRA7XX_EVM_ANDROID
+
+config SYS_BOARD
+       default "dra7xx"
+
+config SYS_VENDOR
+       default "ti"
+
+config SYS_CONFIG_NAME
+       default "dra7xx_evm_android"
+
+endif

board/ti/dra7xx/MAINTAINERS +2 -0

index 5ec6769..efd4f81 100644
@@ -6,3 +6,5 @@ F:      include/configs/dra7xx_evm.h
 F:     configs/dra7xx_evm_defconfig
 F:     configs/dra7xx_evm_qspiboot_defconfig
 F:     configs/dra7xx_evm_uart3_defconfig
+F:     include/configs/dra7xx_evm_android.h
+F:     configs/dra7xx_evm_android_defconfig

configs/dra7xx_evm_android_defconfig new file +5 -0

new file mode 100644
index 0000000..64ae4b3
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
++S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
++S:CONFIG_TARGET_DRA7XX_EVM_ANDROID=y

include/configs/dra7xx_evm_android.h new file +24 -0

new file mode 100644
index 0000000..68e7eec
@@ -0,0 +1,313 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments Incorporated.
+ * Lokesh Vutla          <[email protected]>
+ *
+ * Configuration settings for the TI DRA7XX board.
+ * See ti_omap5_common.h for omap5 common settings.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_DRA7XX_EVM_ANDROID_H
+#define __CONFIG_DRA7XX_EVM_ANDROID_H
+
+#define CONFIG_DRA7XX
+#define CONFIG_BOARD_EARLY_INIT_F
+
+#ifndef CONFIG_QSPI_BOOT
+/* MMC ENV related defines */
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
+#define CONFIG_ENV_SIZE                        (128 << 10)
+#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +

CONFIG_ENV_SIZE)

include/configs/dra7xx_evm_android.h new file +10 -0

+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#endif
+#define CONFIG_CMD_SAVEENV
+
+#if (CONFIG_CONS_INDEX == 1)
+#define CONSOLEDEV                     "ttyO0"
+#elif (CONFIG_CONS_INDEX == 3)
+#define CONSOLEDEV                     "ttyO2"
+#endif
+#define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base

EVM has UART0 */

include/configs/dra7xx_evm_android.h new file +77 -0

+#define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */
+#define CONFIG_SYS_NS16550_COM3                UART3_BASE      /* UART3 */
+#define CONFIG_BAUDRATE                        115200
+
+#define CONFIG_SYS_OMAP_ABE_SYSCK
+
+/* Define the default GPT table for eMMC */
+#define PARTS_DEFAULT \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
+
+#ifdef CONFIG_NAND
+/* Define NAND information. */
+#define NANDARGS \
+       "mtdids=" MTDIDS_DEFAULT "\0" \
+       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "nandargs=setenv bootargs console=${console} " \
+               "${optargs} " \
+               "root=${nandroot} " \
+               "rootfstype=${nandrootfstype}\0" \
+       "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \
+       "nandrootfstype=ubifs rootwait=1\0" \
+       "nandboot=echo Booting from nand ...; " \
+               "run nandargs; " \
+               "nand read ${fdtaddr} NAND.u-boot-spl-os; " \
+               "nand read ${loadaddr} NAND.kernel; " \
+               "bootz ${loadaddr} - ${fdtaddr}\0"
+#define NANDBOOT                       "run nandboot; "
+#endif
+
+#define DFU_ALT_INFO_MMC \
+       "dfu_alt_info_mmc=" \
+       "boot part 0 1;" \
+       "rootfs part 0 2;" \
+       "MLO fat 0 1;" \
+       "spl-os-args fat 0 1;" \
+       "spl-os-image fat 0 1;" \
+       "u-boot.img fat 0 1;" \
+       "uEnv.txt fat 0 1\0"
+
+#define DFU_ALT_INFO_EMMC \
+       "dfu_alt_info_emmc=" \
+       "MLO raw 0x100 0x100 mmcpart 0;" \
+       "u-boot.img raw 0x300 0x1000 mmcpart 0\0"
+
+#define DFU_ALT_INFO_RAM \
+       "dfu_alt_info_ram=" \
+       "kernel ram 0x80200000 0x4000000;" \
+       "fdt ram 0x80f80000 0x80000;" \
+       "ramdisk ram 0x81000000 0x4000000\0"
+
+#define DFUARGS \
+       "dfu_bufsiz=0x10000\0" \
+       DFU_ALT_INFO_MMC \
+       DFU_ALT_INFO_EMMC \
+       DFU_ALT_INFO_RAM
+
+/* Fastboot */
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_ANDROID_BOOT_IMAGE
+#define CONFIG_USB_FASTBOOT_BUF_ADDR    CONFIG_SYS_LOAD_ADDR
+#define CONFIG_USB_FASTBOOT_BUF_SIZE    0x2F000000
+#define CONFIG_FASTBOOT_FLASH
+#define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
+
+#include <configs/ti_omap5_common.h>
+
+/* Enhance our eMMC support / experience. */
+#define CONFIG_CMD_GPT
+#define CONFIG_EFI_PARTITION
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_CMD_PART
+
+/* CPSW Ethernet */
+#define CONFIG_CMD_NET                 /* 'bootp' and 'tftp' */
+#define CONFIG_CMD_DHCP
+#define CONFIG_BOOTP_DNS               /* Configurable parts of CMD_DHCP

*/

include/configs/dra7xx_evm_android.h new file +10 -0

+#define CONFIG_BOOTP_DNS2
+#define CONFIG_BOOTP_SEND_HOSTNAME
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_NET_RETRY_COUNT         10
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_MII
+#define CONFIG_DRIVER_TI_CPSW          /* Driver for IP block */
+#define CONFIG_MII                     /* Required in net/eth.c */
+#define CONFIG_PHY_GIGE                        /* per-board part of CPSW

*/

include/configs/dra7xx_evm_android.h new file +152 -0

+#define CONFIG_PHYLIB
+
+/* SPI */
+#undef CONFIG_OMAP3_SPI
+#define CONFIG_TI_QSPI
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_SPANSION
+#define CONFIG_CMD_SF
+#define CONFIG_CMD_SPI
+#define CONFIG_SPI_FLASH_BAR
+#define CONFIG_TI_SPI_MMAP
+#define CONFIG_SF_DEFAULT_SPEED                48000000
+#define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
+
+/*
+ * Default to using SPI for environment, etc.
+ * 0x000000 - 0x010000 : QSPI.SPL (64KiB)
+ * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB)
+ * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB)
+ * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB)
+ * 0x040000 - 0x140000 : QSPI.u-boot (1MiB)
+ * 0x140000 - 0x1C0000 : QSPI.u-boot-spl-os (512KiB)
+ * 0x1C0000 - 0x1D0000 : QSPI.u-boot-env (64KiB)
+ * 0x1D0000 - 0x1E0000 : QSPI.u-boot-env.backup1 (64KiB)
+ * 0x1E0000 - 0x9E0000 : QSPI.kernel (8MiB)
+ * 0x9E0000 - 0x2000000 : USERLAND
+ */
+#define CONFIG_SYS_SPI_KERNEL_OFFS     0x1E0000
+#define CONFIG_SYS_SPI_ARGS_OFFS       0x140000
+#define CONFIG_SYS_SPI_ARGS_SIZE       0x80000
+#if defined(CONFIG_QSPI_BOOT)
+/* In SPL, use the environment and discard MMC support for space. */
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_SPL_MMC_SUPPORT
+#undef CONFIG_SPL_MAX_SIZE
+#define CONFIG_SPL_MAX_SIZE             (64 << 10) /* 64 KiB */
+#endif
+#define CONFIG_SPL_ENV_SUPPORT
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
+#define CONFIG_ENV_SIZE                        (64 << 10)
+#define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
+#define CONFIG_ENV_OFFSET              0x1C0000
+#define CONFIG_ENV_OFFSET_REDUND       0x1D0000
+#endif
+
+/* SPI SPL */
+#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_DMA_SUPPORT
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_TI_EDMA
+#endif
+#define CONFIG_SPL_SPI_LOAD
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SPL_SPI_BUS             0
+#define CONFIG_SPL_SPI_CS              0
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x80000
+
+#define CONFIG_SUPPORT_EMMC_BOOT
+
+/* USB xHCI HOST */
+#define CONFIG_CMD_USB
+#define CONFIG_USB_HOST
+#define CONFIG_USB_XHCI
+#define CONFIG_USB_XHCI_OMAP
+#define CONFIG_USB_STORAGE
+#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
+
+#define CONFIG_OMAP_USB_PHY
+#define CONFIG_OMAP_USB2PHY2_HOST
+
+/* USB GADGET */
+#define CONFIG_USB_DWC3_PHY_OMAP
+#define CONFIG_USB_DWC3_OMAP
+#define CONFIG_USB_DWC3
+#define CONFIG_USB_DWC3_GADGET
+
+#define CONFIG_USB_GADGET
+#define CONFIG_MUSB_GADGET
+#define CONFIG_MUSB_PIO_ONLY
+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
+#define CONFIG_G_DNL_VENDOR_NUM 0x0451
+#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
+#define CONFIG_USB_GADGET_DUALSPEED
+
+/* USB Device Firmware Update support */
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_RAM
+#define CONFIG_CMD_DFU
+
+#define CONFIG_DFU_MMC
+#define CONFIG_DFU_RAM
+
+/* SATA */
+#define CONFIG_BOARD_LATE_INIT
+#define CONFIG_CMD_SCSI
+#define CONFIG_LIBATA
+#define CONFIG_SCSI_AHCI
+#define CONFIG_SCSI_AHCI_PLAT
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID    1
+#define CONFIG_SYS_SCSI_MAX_LUN                1
+#define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
+                                               CONFIG_SYS_SCSI_MAX_LUN)
+
+/* NAND support */
+#ifdef CONFIG_NAND
+/* NAND: device related configs */
+#define CONFIG_SYS_NAND_PAGE_SIZE      2048
+#define CONFIG_SYS_NAND_OOBSIZE                64
+#define CONFIG_SYS_NAND_BLOCK_SIZE     (128*1024)
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
+#define CONFIG_SYS_NAND_PAGE_COUNT     (CONFIG_SYS_NAND_BLOCK_SIZE / \
+                                        CONFIG_SYS_NAND_PAGE_SIZE)
+#define CONFIG_SYS_NAND_5_ADDR_CYCLE
+/* NAND: driver related configs */
+#define CONFIG_NAND_OMAP_GPMC
+#define CONFIG_NAND_OMAP_ELM
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW
+#define CONFIG_SYS_NAND_BAD_BLOCK_POS  NAND_LARGE_BADBLOCK_POS
+#define CONFIG_SYS_NAND_ECCPOS         { 2, 3, 4, 5, 6, 7, 8, 9, \
+                                        10, 11, 12, 13, 14, 15, 16, 17, \
+                                        18, 19, 20, 21, 22, 23, 24, 25, \
+                                        26, 27, 28, 29, 30, 31, 32, 33, \
+                                        34, 35, 36, 37, 38, 39, 40, 41, \
+                                        42, 43, 44, 45, 46, 47, 48, 49, \
+                                        50, 51, 52, 53, 54, 55, 56, 57, }
+#define CONFIG_SYS_NAND_ECCSIZE                512
+#define CONFIG_SYS_NAND_ECCBYTES       14
+#define MTDIDS_DEFAULT                 "nand0=nand.0"
+#define MTDPARTS_DEFAULT               "mtdparts=nand.0:" \
+                                       "128k(NAND.SPL)," \
+                                       "128k(NAND.SPL.backup1)," \
+                                       "128k(NAND.SPL.backup2)," \
+                                       "128k(NAND.SPL.backup3)," \
+                                       "256k(NAND.u-boot-spl-os)," \
+                                       "1m(NAND.u-boot)," \
+                                       "128k(NAND.u-boot-env)," \
+                                       "128k(NAND.u-boot-env.backup1)," \
+                                       "8m(NAND.kernel)," \
+                                       "-(NAND.file-system)"
+#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
+/* NAND: SPL related configs */
+#ifdef CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_NAND_AM33XX_BCH
+#endif
+/* NAND: SPL falcon mode configs */
+#ifdef CONFIG_SPL_OS_BOOT
+#define CONFIG_CMD_SPL_NAND_OFS                0x00080000 /* os-boot

params*/
+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel
offset */

include/configs/dra7xx_evm_android.h new file +39 -1

+#define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
+#endif
+#endif /* !CONFIG_NAND */
+
+/* Parallel NOR Support */
+#if defined(CONFIG_NOR)
+/* NOR: device related configs */
+#define CONFIG_SYS_MAX_FLASH_SECT      512
+#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
+#define CONFIG_SYS_FLASH_SIZE          (64 * 1024 * 1024) /* 64 MB */
+/* #define CONFIG_INIT_IGNORE_ERROR */
+#undef CONFIG_SYS_NO_FLASH
+#define CONFIG_CMD_FLASH
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_SYS_MAX_FLASH_BANKS     1
+#define CONFIG_SYS_FLASH_BASE          (0x08000000)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
+/* Reduce SPL size by removing unlikey targets */
+#ifdef CONFIG_NOR_BOOT
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE           (128 * 1024)    /* 128 KiB */
+#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0"
+#define MTDPARTS_DEFAULT               "mtdparts=physmap-flash.0:" \
+                                       "1m(NOR.u-boot)," \
+                                       "128k(NOR.u-boot-env)," \
+                                       "128k(NOR.u-boot-env.backup1)," \
+                                       "256k(NOR.u-boot-spl-os)," \
+                                       "8m(NOR.kernel)," \
+                                       "-(NOR.rootfs)"
+#define CONFIG_ENV_OFFSET              0x00100000
+#define CONFIG_ENV_OFFSET_REDUND       0x00120000
+#endif
+#endif  /* NOR support */
+
+#endif /* __CONFIG_DRA7XX_EVM_ANDROID_H */
--

1.8.3.2

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 board/ti/dra7xx/Makefile             |  1 +
 board/ti/dra7xx/fastboot.c           | 45 ++++++++++++++++++++++++++++++++++++
 common/cmd_bootm.c                   |  5 ++++
 drivers/usb/gadget/f_fastboot.c      |  5 ++++
 include/configs/dra7xx_evm_android.h | 14 +++++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 board/ti/dra7xx/fastboot.c

board/ti/dra7xx/Makefile +1 -0

index 434e8d1..ae730ae 100644
@@ -6,3 +6,4 @@
 #
 
 obj-y  := evm.o
+obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o

board/ti/dra7xx/fastboot.c new file +18 -0

new file mode 100644
index 0000000..e05010d
@@ -0,0 +1,45 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments Incorporated, <www.ti.com>
+ *
+ * Lokesh Vutla <[email protected]>
+ *
+ * Based on previous work by:
+ * Aneesh V       <[email protected]>
+ * Steve Sakoman  <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <config.h>
+
+

board/ti/dra7xx/fastboot.c new file +17 -0

+
+       return 0;
+}
+
+int fb_check_reboot_flag(void)
+{
+       /* Check if we are coming from a warm reset */
+       if (__raw_readl(DRA7XX_PRM_RSTST) & DRA7XX_PRM_RSTST_RESET_WARM_BIT)
+               if (!strncmp((const char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE,
+                               "bootloader", DRA7XX_REBOOT_REASON_SIZE)) {
+                       strncpy((char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE, "",
+                               DRA7XX_REBOOT_REASON_SIZE);
+                       return 0;
+               }
+
+       return 1;
+}

common/cmd_bootm.c +0 -0

index 48199bf..00791be 100644

common/cmd_bootm.c +1 -0

+
        /* Consume 'booti' */
        argc--; argv++;
 

drivers/usb/gadget/f_fastboot.c +5 -0

index 206b6d1..a450357 100644
@@ -332,6 +332,11 @@ int __weak fb_set_reboot_flag(void)
        return -ENOSYS;
 }
 
+int __weak fb_check_reboot_flag(void)
+{
+       return -ENOSYS;
+}
+
 static void cb_reboot(struct usb_ep *ep, struct usb_request *req)
 {
        char *cmd = req->buf;

include/configs/dra7xx_evm_android.h +0 -0

index 68e7eec..2038e00 100644
@@ -310,4 +310,18 @@
 #endif
 #endif  /* NOR support */

Quoted 2 lines · Dileep Katta

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

Quoted 42 lines

---
 board/ti/dra7xx/Makefile             |  1 +
 board/ti/dra7xx/fastboot.c           | 45 ++++++++++++++++++++++++++++++++++++
 common/cmd_bootm.c                   |  5 ++++
 drivers/usb/gadget/f_fastboot.c      |  5 ++++
 include/configs/dra7xx_evm_android.h | 14 +++++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 board/ti/dra7xx/fastboot.c

board/ti/dra7xx/Makefile +1 -0

index 434e8d1..ae730ae 100644
@@ -6,3 +6,4 @@
 #
 
 obj-y  := evm.o
+obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o

board/ti/dra7xx/fastboot.c new file +18 -0

new file mode 100644
index 0000000..e05010d
@@ -0,0 +1,45 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments Incorporated, <www.ti.com>
+ *
+ * Lokesh Vutla <[email protected]>
+ *
+ * Based on previous work by:
+ * Aneesh V       <[email protected]>
+ * Steve Sakoman  <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <config.h>
+
+

board/ti/dra7xx/fastboot.c line 28

Quoted 10 lines

board/ti/dra7xx/fastboot.c new file +10 -0

+int fb_set_reboot_flag(void)
+{
+       /* clear all reset events */
+       __raw_writel(DRA7XX_PRM_RSTST_CLR, PRM_RSTST);
+       strncpy((char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE, "bootloader",
+               DRA7XX_REBOOT_REASON_SIZE - 1);
+       *(((char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE) +
+                               DRA7XX_REBOOT_REASON_SIZE - 1) = '\0';
+       /* trigger warm reset */
+       __raw_writel(DRA7XX_PRM_RSTCTRL_RESET_WARM_BIT, DRA7XX_PRM_RSTCTRL);

Does this reset immediately? If so, then you will fail to send a response to the client.

Quoted 22 lines

board/ti/dra7xx/fastboot.c new file +17 -0

+
+       return 0;
+}
+
+int fb_check_reboot_flag(void)
+{
+       /* Check if we are coming from a warm reset */
+       if (__raw_readl(DRA7XX_PRM_RSTST) & DRA7XX_PRM_RSTST_RESET_WARM_BIT)
+               if (!strncmp((const char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE,
+                               "bootloader", DRA7XX_REBOOT_REASON_SIZE)) {
+                       strncpy((char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE, "",
+                               DRA7XX_REBOOT_REASON_SIZE);
+                       return 0;
+               }
+
+       return 1;
+}

common/cmd_bootm.c +0 -0

index 48199bf..00791be 100644

common/cmd_bootm.c int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 735

Quoted 7 lines

common/cmd_bootm.c +4 -0

@@ -729,6 +729,11 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int ret;
 
+#if defined(CONFIG_CMD_FASTBOOT)
+       if (!fb_check_reboot_flag())
+               do_fastboot(cmdtp, flag, argc, argv);
+#endif

Part of the booti command? First, booti is for arm64 Image files. How does this work for you?

More importantly, this should not be tied into any bootX command. It should probably be done in a boot script. If the flag is set, the board code can set some environment variable. Then the boot script can run the fastboot command if the env var is set.

Quoted 28 lines

common/cmd_bootm.c +1 -0

+
        /* Consume 'booti' */
        argc--; argv++;
 

drivers/usb/gadget/f_fastboot.c +5 -0

index 206b6d1..a450357 100644
@@ -332,6 +332,11 @@ int __weak fb_set_reboot_flag(void)
        return -ENOSYS;
 }
 
+int __weak fb_check_reboot_flag(void)
+{
+       return -ENOSYS;
+}
+
 static void cb_reboot(struct usb_ep *ep, struct usb_request *req)
 {
        char *cmd = req->buf;

include/configs/dra7xx_evm_android.h +0 -0

index 68e7eec..2038e00 100644
@@ -310,4 +310,18 @@
 #endif
 #endif  /* NOR support */
 

include/configs/dra7xx_evm_android.h line 319

Quoted 7 lines

include/configs/dra7xx_evm_android.h +7 -0

+#define DRA7XX_PUBLIC_SAR_RAM_1_FREE           (0x4AE26000 + 0xFE0)
+#define DRA7XX_PRM_RSTCTRL_RESET_WARM_BIT      (1<<0)
+#define DRA7XX_PRM_RSTST_RESET_WARM_BIT        (1<<1)
+#define DRA7XX_PRM_RSTST                       0x4AE07D04
+#define DRA7XX_PRM_RSTCTRL                     0x4AE07D00
+#define DRA7XX_PRM_RSTST_CLR                   0xfff
+#define DRA7XX_REBOOT_REASON_SIZE              0xf

include/configs/dra7xx_evm_android.h line 321

Quoted 1 line

include/configs/dra7xx_evm_android.h +1 -0

+#define CONFIG_BOARD_MACH_TYPE                  4070

You shouldn't need this anymore, right?

include/configs/dra7xx_evm_android.h line 323

Quoted 2 lines

include/configs/dra7xx_evm_android.h +2 -0

+#define MEMORY_BASE                             0x80000000
+#define CONFIG_ADDR_ATAGS                       (MEMORY_BASE + 0x100)

Or this?

include/configs/dra7xx_evm_android.h line 325

Quoted 2 lines

include/configs/dra7xx_evm_android.h +2 -0

+#define CONFIG_ADDR_DOWNLOAD                    (MEMORY_BASE + 0x02000000)
+#define DEVICE_TREE                             0x82f80000

Use fdt_addr_r env var instead?

Rob
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 board/ti/dra7xx/Makefile             |  1 +
 board/ti/dra7xx/fastboot.c           | 45
++++++++++++++++++++++++++++++++++++
common/cmd_bootm.c                   |  5 ++++
drivers/usb/gadget/f_fastboot.c      |  5 ++++
include/configs/dra7xx_evm_android.h | 14 +++++++++++ 5 files

changed, 70 insertions(+) create mode 100644
board/ti/dra7xx/fastboot.c

board/ti/dra7xx/Makefile +1 -0

index 434e8d1..ae730ae 100644
@@ -6,3 +6,4 @@
 #
 
 obj-y	:= evm.o
+obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o

board/ti/dra7xx/fastboot.c new file +26 -0

new file mode 100644
index 0000000..e05010d
@@ -0,0 +1,45 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments Incorporated, <www.ti.com>
+ *
+ * Lokesh Vutla <[email protected]>
+ *
+ * Based on previous work by:
+ * Aneesh V       <[email protected]>
+ * Steve Sakoman  <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <asm-generic/gpio.h>
+#include <config.h>
+
+
+int fb_set_reboot_flag(void)
+{
+	/* clear all reset events */
+	__raw_writel(DRA7XX_PRM_RSTST_CLR, PRM_RSTST);
+	strncpy((char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE, "bootloader",
+		DRA7XX_REBOOT_REASON_SIZE - 1);
+	*(((char *)DRA7XX_PUBLIC_SAR_RAM_1_FREE) +
+				DRA7XX_REBOOT_REASON_SIZE - 1) =

'\0';

board/ti/dra7xx/fastboot.c new file +2 -0

+	/* trigger warm reset */
+	__raw_writel(DRA7XX_PRM_RSTCTRL_RESET_WARM_BIT,

DRA7XX_PRM_RSTCTRL); +

board/ti/dra7xx/fastboot.c new file +7 -0

+	return 0;
+}
+
+int fb_check_reboot_flag(void)
+{
+	/* Check if we are coming from a warm reset */
+	if (__raw_readl(DRA7XX_PRM_RSTST) &

DRA7XX_PRM_RSTST_RESET_WARM_BIT)

board/ti/dra7xx/fastboot.c new file +1 -0

+		if (!strncmp((const char

*)DRA7XX_PUBLIC_SAR_RAM_1_FREE,

board/ti/dra7xx/fastboot.c new file +1 -0

+				"bootloader",

DRA7XX_REBOOT_REASON_SIZE)) {

board/ti/dra7xx/fastboot.c new file +1 -0

+			strncpy((char

*)DRA7XX_PUBLIC_SAR_RAM_1_FREE, "",

board/ti/dra7xx/fastboot.c new file +6 -0

+				DRA7XX_REBOOT_REASON_SIZE);
+			return 0;
+		}
+
+	return 1;
+}

common/cmd_bootm.c +5 -0

index 48199bf..00791be 100644
@@ -729,6 +729,11 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int
 argc, char * const argv[]) {
 	int ret;
 
+#if defined(CONFIG_CMD_FASTBOOT)
+	if (!fb_check_reboot_flag())
+		do_fastboot(cmdtp, flag, argc, argv);
+#endif
+
 	/* Consume 'booti' */
 	argc--; argv++;
 

(quoted diff) +0 -0

b/drivers/usb/gadget/f_fastboot.c index 206b6d1..a450357 100644

drivers/usb/gadget/f_fastboot.c +5 -0

@@ -332,6 +332,11 @@ int __weak fb_set_reboot_flag(void)
 	return -ENOSYS;
 }
 
+int __weak fb_check_reboot_flag(void)
+{
+	return -ENOSYS;
+}
+
 static void cb_reboot(struct usb_ep *ep, struct usb_request *req)
 {
 	char *cmd = req->buf;

(quoted diff) +0 -0

b/include/configs/dra7xx_evm_android.h index 68e7eec..2038e00 100644

include/configs/dra7xx_evm_android.h +12 -0

@@ -310,4 +310,18 @@
 #endif
 #endif  /* NOR support */
 
+#define DRA7XX_PUBLIC_SAR_RAM_1_FREE           (0x4AE26000 + 0xFE0)
+#define DRA7XX_PRM_RSTCTRL_RESET_WARM_BIT      (1<<0)
+#define DRA7XX_PRM_RSTST_RESET_WARM_BIT        (1<<1)
+#define DRA7XX_PRM_RSTST                       0x4AE07D04
+#define DRA7XX_PRM_RSTCTRL                     0x4AE07D00
+#define DRA7XX_PRM_RSTST_CLR                   0xfff
+#define DRA7XX_REBOOT_REASON_SIZE              0xf
+
+#define CONFIG_BOARD_MACH_TYPE                  4070
+#define MEMORY_BASE                             0x80000000
+#define CONFIG_ADDR_ATAGS                       (MEMORY_BASE + 0x100)
+#define CONFIG_ADDR_DOWNLOAD                    (MEMORY_BASE +

0x02000000) +#define DEVICE_TREE
0x82f80000 +
#endif /* __CONFIG_DRA7XX_EVM_ANDROID_H */

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/Kconfig     |   5 +
 board/ti/dra7xx/Kconfig              |  13 ++
 board/ti/dra7xx/MAINTAINERS          |   2 +
 configs/dra7xx_evm_android_defconfig |   5 +
 include/configs/dra7xx_evm_android.h | 313
+++++++++++++++++++++++++++++++++++ 5 files changed, 338 insertions(+)
 create mode 100644 configs/dra7xx_evm_android_defconfig
 create mode 100644 include/configs/dra7xx_evm_android.h

(quoted diff) +0 -0

b/arch/arm/cpu/armv7/omap5/Kconfig index aca862d..d8e9b2d 100644

arch/arm/cpu/armv7/omap5/Kconfig +5 -0

@@ -12,6 +12,11 @@ config TARGET_OMAP5_UEVM
 config TARGET_DRA7XX_EVM
 	bool "TI DRA7XX"
 
+config TARGET_DRA7XX_EVM_ANDROID
+	bool "TI DRA7XX ANDROID"
+	---help---
+	TI DRA7XX build for Android. Enables Fastboot.
+
 config TARGET_BEAGLE_X15
 	bool "BeagleBoard X15"
 

board/ti/dra7xx/Kconfig +0 -0

index 3bbd866..6837998 100644

board/ti/dra7xx/Kconfig +1 -0

+endif

board/ti/dra7xx/MAINTAINERS +2 -0

index 5ec6769..efd4f81 100644
@@ -6,3 +6,5 @@ F:	include/configs/dra7xx_evm.h
 F:	configs/dra7xx_evm_defconfig
 F:	configs/dra7xx_evm_qspiboot_defconfig
 F:	configs/dra7xx_evm_uart3_defconfig
+F:	include/configs/dra7xx_evm_android.h
+F:	configs/dra7xx_evm_android_defconfig

(quoted diff) +0 -0

b/configs/dra7xx_evm_android_defconfig new file mode 100644 index 0000000..64ae4b3

configs/dra7xx_evm_android_defconfig new file +5 -0

@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
++S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
++S:CONFIG_TARGET_DRA7XX_EVM_ANDROID=y

(quoted diff) +0 -0

b/include/configs/dra7xx_evm_android.h new file mode 100644 index 0000000..68e7eec

include/configs/dra7xx_evm_android.h new file +21 -0

@@ -0,0 +1,313 @@
+/*
+ * (C) Copyright 2013
+ * Texas Instruments Incorporated.
+ * Lokesh Vutla	  <[email protected]>
+ *
+ * Configuration settings for the TI DRA7XX board.
+ * See ti_omap5_common.h for omap5 common settings.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_DRA7XX_EVM_ANDROID_H
+#define __CONFIG_DRA7XX_EVM_ANDROID_H
+
+#define CONFIG_DRA7XX
+#define CONFIG_BOARD_EARLY_INIT_F
+
+#ifndef CONFIG_QSPI_BOOT
+/* MMC ENV related defines */
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2:

eMMC(1) */ +#define CONFIG_ENV_SIZE (128 << 10)

include/configs/dra7xx_evm_android.h new file +2 -0

+#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET +

CONFIG_ENV_SIZE) +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT

include/configs/dra7xx_evm_android.h new file +9 -0

+#endif
+#define CONFIG_CMD_SAVEENV
+
+#if (CONFIG_CONS_INDEX == 1)
+#define CONSOLEDEV			"ttyO0"
+#elif (CONFIG_CONS_INDEX == 3)
+#define CONSOLEDEV			"ttyO2"
+#endif
+#define CONFIG_SYS_NS16550_COM1		UART1_BASE	/*

Base EVM has UART0 */ +#define CONFIG_SYS_NS16550_COM2
UART2_BASE /* UART2 */ +#define
CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */

include/configs/dra7xx_evm_android.h new file +72 -0

+#define CONFIG_BAUDRATE			115200 +
+#define CONFIG_SYS_OMAP_ABE_SYSCK
+
+/* Define the default GPT table for eMMC */
+#define PARTS_DEFAULT \
+	"uuid_disk=${uuid_gpt_disk};" \
+	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
+
+#ifdef CONFIG_NAND
+/* Define NAND information. */
+#define NANDARGS \
+	"mtdids=" MTDIDS_DEFAULT "\0" \
+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
+	"nandargs=setenv bootargs console=${console} " \
+		"${optargs} " \
+		"root=${nandroot} " \
+		"rootfstype=${nandrootfstype}\0" \
+	"nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \
+	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandboot=echo Booting from nand ...; " \
+		"run nandargs; " \
+		"nand read ${fdtaddr} NAND.u-boot-spl-os; " \
+		"nand read ${loadaddr} NAND.kernel; " \
+		"bootz ${loadaddr} - ${fdtaddr}\0"
+#define NANDBOOT			"run nandboot; "
+#endif
+
+#define DFU_ALT_INFO_MMC \
+	"dfu_alt_info_mmc=" \
+	"boot part 0 1;" \
+	"rootfs part 0 2;" \
+	"MLO fat 0 1;" \
+	"spl-os-args fat 0 1;" \
+	"spl-os-image fat 0 1;" \
+	"u-boot.img fat 0 1;" \
+	"uEnv.txt fat 0 1\0"
+
+#define DFU_ALT_INFO_EMMC \
+	"dfu_alt_info_emmc=" \
+	"MLO raw 0x100 0x100 mmcpart 0;" \
+	"u-boot.img raw 0x300 0x1000 mmcpart 0\0"
+
+#define DFU_ALT_INFO_RAM \
+	"dfu_alt_info_ram=" \
+	"kernel ram 0x80200000 0x4000000;" \
+	"fdt ram 0x80f80000 0x80000;" \
+	"ramdisk ram 0x81000000 0x4000000\0"
+
+#define DFUARGS \
+	"dfu_bufsiz=0x10000\0" \
+	DFU_ALT_INFO_MMC \
+	DFU_ALT_INFO_EMMC \
+	DFU_ALT_INFO_RAM
+
+/* Fastboot */
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_ANDROID_BOOT_IMAGE
+#define CONFIG_USB_FASTBOOT_BUF_ADDR    CONFIG_SYS_LOAD_ADDR
+#define CONFIG_USB_FASTBOOT_BUF_SIZE    0x2F000000
+#define CONFIG_FASTBOOT_FLASH
+#define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
+
+#include <configs/ti_omap5_common.h>
+
+/* Enhance our eMMC support / experience. */
+#define CONFIG_CMD_GPT
+#define CONFIG_EFI_PARTITION
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_CMD_PART
+
+/* CPSW Ethernet */
+#define CONFIG_CMD_NET			/* 'bootp' and 'tftp'

*/ +#define CONFIG_CMD_DHCP
+#define CONFIG_BOOTP_DNS /* Configurable parts of
CMD_DHCP */ +#define CONFIG_BOOTP_DNS2

include/configs/dra7xx_evm_android.h new file +7 -0

+#define CONFIG_BOOTP_SEND_HOSTNAME
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_NET_RETRY_COUNT		10
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_MII
+#define CONFIG_DRIVER_TI_CPSW		/* Driver for IP block

*/ +#define CONFIG_MII /* Required in
net/eth.c */ +#define CONFIG_PHY_GIGE /*
per-board part of CPSW */ +#define CONFIG_PHYLIB

include/configs/dra7xx_evm_android.h new file +25 -0

+
+/* SPI */
+#undef	CONFIG_OMAP3_SPI
+#define CONFIG_TI_QSPI
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_SPANSION
+#define CONFIG_CMD_SF
+#define CONFIG_CMD_SPI
+#define CONFIG_SPI_FLASH_BAR
+#define CONFIG_TI_SPI_MMAP
+#define CONFIG_SF_DEFAULT_SPEED                48000000
+#define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
+
+/*
+ * Default to using SPI for environment, etc.
+ * 0x000000 - 0x010000 : QSPI.SPL (64KiB)
+ * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB)
+ * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB)
+ * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB)
+ * 0x040000 - 0x140000 : QSPI.u-boot (1MiB)
+ * 0x140000 - 0x1C0000 : QSPI.u-boot-spl-os (512KiB)
+ * 0x1C0000 - 0x1D0000 : QSPI.u-boot-env (64KiB)
+ * 0x1D0000 - 0x1E0000 : QSPI.u-boot-env.backup1 (64KiB)
+ * 0x1E0000 - 0x9E0000 : QSPI.kernel (8MiB)
+ * 0x9E0000 - 0x2000000 : USERLAND

include/configs/dra7xx_evm_android.h new file +7 -0

+#endif
+#define CONFIG_SPL_ENV_SUPPORT
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
+#define CONFIG_ENV_SIZE			(64 << 10)
+#define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64 KB

sectors */ +#define CONFIG_ENV_OFFSET 0x1C0000

include/configs/dra7xx_evm_android.h new file +61 -0

+#define CONFIG_ENV_OFFSET_REDUND	0x1D0000
+#endif
+
+/* SPI SPL */
+#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_DMA_SUPPORT
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_TI_EDMA
+#endif
+#define CONFIG_SPL_SPI_LOAD
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SPL_SPI_BUS             0
+#define CONFIG_SPL_SPI_CS              0
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x80000
+
+#define CONFIG_SUPPORT_EMMC_BOOT
+
+/* USB xHCI HOST */
+#define CONFIG_CMD_USB
+#define CONFIG_USB_HOST
+#define CONFIG_USB_XHCI
+#define CONFIG_USB_XHCI_OMAP
+#define CONFIG_USB_STORAGE
+#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
+
+#define CONFIG_OMAP_USB_PHY
+#define CONFIG_OMAP_USB2PHY2_HOST
+
+/* USB GADGET */
+#define CONFIG_USB_DWC3_PHY_OMAP
+#define CONFIG_USB_DWC3_OMAP
+#define CONFIG_USB_DWC3
+#define CONFIG_USB_DWC3_GADGET
+
+#define CONFIG_USB_GADGET
+#define CONFIG_MUSB_GADGET
+#define CONFIG_MUSB_PIO_ONLY
+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
+#define CONFIG_G_DNL_VENDOR_NUM 0x0451
+#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
+#define CONFIG_USB_GADGET_DUALSPEED
+
+/* USB Device Firmware Update support */
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_RAM
+#define CONFIG_CMD_DFU
+
+#define CONFIG_DFU_MMC
+#define CONFIG_DFU_RAM
+
+/* SATA */
+#define CONFIG_BOARD_LATE_INIT
+#define CONFIG_CMD_SCSI
+#define CONFIG_LIBATA
+#define CONFIG_SCSI_AHCI
+#define CONFIG_SCSI_AHCI_PLAT
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
+#define CONFIG_SYS_SCSI_MAX_LUN		1
+#define CONFIG_SYS_SCSI_MAX_DEVICE

(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
+
CONFIG_SYS_SCSI_MAX_LUN) +

include/configs/dra7xx_evm_android.h new file +8 -0

+/* NAND support */
+#ifdef CONFIG_NAND
+/* NAND: device related configs */
+#define CONFIG_SYS_NAND_PAGE_SIZE	2048
+#define CONFIG_SYS_NAND_OOBSIZE		64
+#define CONFIG_SYS_NAND_BLOCK_SIZE	(128*1024)
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
+#define CONFIG_SYS_NAND_PAGE_COUNT

(CONFIG_SYS_NAND_BLOCK_SIZE / \

include/configs/dra7xx_evm_android.h new file +9 -0

+					 CONFIG_SYS_NAND_PAGE_SIZE)
+#define CONFIG_SYS_NAND_5_ADDR_CYCLE
+/* NAND: driver related configs */
+#define CONFIG_NAND_OMAP_GPMC
+#define CONFIG_NAND_OMAP_ELM
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
+#define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
+#define CONFIG_SYS_NAND_ECCPOS		{ 2, 3, 4, 5, 6, 7, 8,

9, \

include/configs/dra7xx_evm_android.h new file +1 -0

+					 10, 11, 12, 13, 14, 15, 16,

17, \

include/configs/dra7xx_evm_android.h new file +1 -0

+					 18, 19, 20, 21, 22, 23, 24,

25, \

include/configs/dra7xx_evm_android.h new file +1 -0

+					 26, 27, 28, 29, 30, 31, 32,

33, \

include/configs/dra7xx_evm_android.h new file +1 -0

+					 34, 35, 36, 37, 38, 39, 40,

41, \

include/configs/dra7xx_evm_android.h new file +1 -0

+					 42, 43, 44, 45, 46, 47, 48,

49, \

include/configs/dra7xx_evm_android.h new file +1 -0

+					 50, 51, 52, 53, 54, 55, 56,

57, } +#define CONFIG_SYS_NAND_ECCSIZE 512

include/configs/dra7xx_evm_android.h new file +11 -0

+#define CONFIG_SYS_NAND_ECCBYTES	14
+#define MTDIDS_DEFAULT			"nand0=nand.0"
+#define MTDPARTS_DEFAULT		"mtdparts=nand.0:" \
+					"128k(NAND.SPL)," \
+					"128k(NAND.SPL.backup1)," \
+					"128k(NAND.SPL.backup2)," \
+					"128k(NAND.SPL.backup3)," \
+					"256k(NAND.u-boot-spl-os)," \
+					"1m(NAND.u-boot)," \
+					"128k(NAND.u-boot-env)," \
+					"128k(NAND.u-boot-env.backup1),"

\

include/configs/dra7xx_evm_android.h new file +10 -0

+					"8m(NAND.kernel)," \
+					"-(NAND.file-system)"
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x000c0000
+/* NAND: SPL related configs */
+#ifdef CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_NAND_AM33XX_BCH
+#endif
+/* NAND: SPL falcon mode configs */
+#ifdef CONFIG_SPL_OS_BOOT
+#define CONFIG_CMD_SPL_NAND_OFS		0x00080000 /* os-boot

params*/ +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS
0x00200000 /* kernel offset */ +#define
CONFIG_CMD_SPL_WRITE_SIZE 0x2000 +#endif

include/configs/dra7xx_evm_android.h new file +8 -0

+#endif /* !CONFIG_NAND */
+
+/* Parallel NOR Support */
+#if defined(CONFIG_NOR)
+/* NOR: device related configs */
+#define CONFIG_SYS_MAX_FLASH_SECT	512
+#define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
+#define CONFIG_SYS_FLASH_SIZE		(64 * 1024 * 1024) /*

64 MB */ +/* #define CONFIG_INIT_IGNORE_ERROR */

include/configs/dra7xx_evm_android.h new file +14 -0

+#undef CONFIG_SYS_NO_FLASH
+#define CONFIG_CMD_FLASH
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_SYS_MAX_FLASH_BANKS	1
+#define CONFIG_SYS_FLASH_BASE		(0x08000000)
+#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
+/* Reduce SPL size by removing unlikey targets */
+#ifdef CONFIG_NOR_BOOT
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE		(128 * 1024)	/*

128 KiB */ +#define
MTDIDS_DEFAULT "nor0=physmap-flash.0" +#define
MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \

include/configs/dra7xx_evm_android.h new file +3 -0

+					"1m(NOR.u-boot)," \
+					"128k(NOR.u-boot-env)," \
+					"128k(NOR.u-boot-env.backup1),"

\

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/Kconfig     |   5 +
 board/ti/dra7xx/Kconfig              |  13 ++
 board/ti/dra7xx/MAINTAINERS          |   2 +
 configs/dra7xx_evm_android_defconfig |   5 +
 include/configs/dra7xx_evm_android.h | 313 +++++++++++++++++++++++++++++++++++
 5 files changed, 338 insertions(+)
 create mode 100644 configs/dra7xx_evm_android_defconfig
 create mode 100644 include/configs/dra7xx_evm_android.h

Quoted 8 lines · Dileep Katta

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/Kconfig     |   5 +
 board/ti/dra7xx/Kconfig              |  13 ++
 board/ti/dra7xx/MAINTAINERS          |   2 +
 configs/dra7xx_evm_android_defconfig |   5 +
 include/configs/dra7xx_evm_android.h | 313

+++++++++++++++++++++++++++++++++++

Quoted 3 lines

 5 files changed, 338 insertions(+)
 create mode 100644 configs/dra7xx_evm_android_defconfig
 create mode 100644 include/configs/dra7xx_evm_android.h

I _really_ don't like how we're duplicating large hunks of dra7xx_evm.h. The first question is, what parts of this are not appropriate to just do in dra7xx_evm.h directly? And the second question would be, which of those cannot simply be done via Kconfig choices.

--
Tom

Hi Tom and Lukasz,

Quoted 15 lines · Tom Rini

Quoted 8 lines · Dileep Katta

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

---
 arch/arm/cpu/armv7/omap5/Kconfig     |   5 +
 board/ti/dra7xx/Kconfig              |  13 ++
 board/ti/dra7xx/MAINTAINERS          |   2 +
 configs/dra7xx_evm_android_defconfig |   5 +
 include/configs/dra7xx_evm_android.h | 313

+++++++++++++++++++++++++++++++++++

Quoted 3 lines

 5 files changed, 338 insertions(+)
 create mode 100644 configs/dra7xx_evm_android_defconfig
 create mode 100644 include/configs/dra7xx_evm_android.h

Quoted 4 lines

I _really_ don't like how we're duplicating large hunks of dra7xx_evm.h. The first question is, what parts of this are not appropriate to just do in dra7xx_evm.h directly? And the second question would be, which of those cannot simply be done via Kconfig choices.

Discussed this with Angela from TI, and arrived at a common header file so that the duplication could be avoided. Will send a follow-up patch with the update.

- Added new configuration for Android fastboot
- This is based on following patch modified accordingly
http://git.omapzoom.org/?p=repo/u-boot.git;a=commit;h=b2e04f92b5d91c708b6fd6b79d2266966ac51f4b

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

include/configs/dra7xx_evm.h +1 -0

@@ -43,6 +43,16 @@
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
+#ifdef CONFIG_DRA7XX_ANDROID

Quoted 3 lines · Dileep Katta

- Added new configuration for Android fastboot
- This is based on following patch modified accordingly

http://git.omapzoom.org/?p=repo/u-boot.git;a=commit;h=b2e04f92b5d91c708b6fd6b79d2266966ac51f4b

Quoted 3 lines

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

[snip]

Quoted 4 lines

include/configs/dra7xx_evm.h +0 -0

@@ -43,6 +43,16 @@
      "uuid_disk=${uuid_gpt_disk};" \
      "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 

include/configs/dra7xx_evm.h line 56

Quoted 11 lines

include/configs/dra7xx_evm.h +10 -0

+#ifdef CONFIG_DRA7XX_ANDROID
+/* Fastboot */
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_ANDROID_BOOT_IMAGE
+#define CONFIG_USB_FASTBOOT_BUF_ADDR    CONFIG_SYS_LOAD_ADDR
+#define CONFIG_USB_FASTBOOT_BUF_SIZE    0x2F000000
+#define CONFIG_FASTBOOT_FLASH
+#define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
+#endif
+
 #include <configs/ti_omap5_common.h>

No, just enable fastboot. There's a growing population of people whose workflow is "use fastboot to shove a new test kernel at my device" that aren't strictly using Android, lets enable them.

include/configs/dra7xx_evm.h line 132

Quoted 10 lines

include/configs/dra7xx_evm.h +4 -0

@@ -115,7 +125,11 @@
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
+#ifdef CONFIG_DRA7XX_ANDROID
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x80000
+#else
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
+#endif

Why are you moving U-Boot so much higher in SPI flash?

Quoted 5 lines

include/configs/dra7xx_evm.h +0 -0

@@ -130,6 +144,22 @@
 #define CONFIG_OMAP_USB_PHY
 #define CONFIG_OMAP_USB2PHY2_HOST
 

include/configs/dra7xx_evm.h line 150

Quoted 4 lines

include/configs/dra7xx_evm.h +4 -0

+/* USB GADGET */
+#define CONFIG_USB_GADGET
+#define CONFIG_MUSB_GADGET
+#define CONFIG_MUSB_PIO_ONLY

This board doesn't have MUSB, DWC3 only.

include/configs/dra7xx_evm.h line 161

Quoted 12 lines

include/configs/dra7xx_evm.h +11 -0

+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
+#ifdef CONFIG_CMD_FASTBOOT
+#define CONFIG_G_DNL_VENDOR_NUM 0x0451
+#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
+#else
+#define CONFIG_G_DNL_VENDOR_NUM 0x0403
+#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
+#endif
+#define CONFIG_USB_GADGET_DUALSPEED

Why can't we always use one vid/pid?

--
Tom

Hi Tom,

Quoted 14 lines · Tom Rini

Quoted 3 lines · Dileep Katta

- Added new configuration for Android fastboot
- This is based on following patch modified accordingly

http://git.omapzoom.org/?p=repo/u-boot.git;a=commit;h=b2e04f92b5d91c708b6fd6b79d2266966ac51f4b

Quoted 3 lines

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

[snip]

Quoted 4 lines

include/configs/dra7xx_evm.h +0 -0

@@ -43,6 +43,16 @@
      "uuid_disk=${uuid_gpt_disk};" \
      "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 

Quoted 16 lines

include/configs/dra7xx_evm.h line 56

Quoted 11 lines

include/configs/dra7xx_evm.h +10 -0

+#ifdef CONFIG_DRA7XX_ANDROID
+/* Fastboot */
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_ANDROID_BOOT_IMAGE
+#define CONFIG_USB_FASTBOOT_BUF_ADDR    CONFIG_SYS_LOAD_ADDR
+#define CONFIG_USB_FASTBOOT_BUF_SIZE    0x2F000000
+#define CONFIG_FASTBOOT_FLASH
+#define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
+#endif
+
 #include <configs/ti_omap5_common.h>

No, just enable fastboot. There's a growing population of people whose workflow is "use fastboot to shove a new test kernel at my device" that aren't strictly using Android, lets enable them.

OK, will enable fastboot unconditional.
Now there is no much difference for android_defconfig, but will still keep separate config for future changes.

Quoted 11 lines

include/configs/dra7xx_evm.h line 132

Quoted 9 lines

include/configs/dra7xx_evm.h +4 -0

@@ -115,7 +125,11 @@
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
+#ifdef CONFIG_DRA7XX_ANDROID
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x80000
+#else
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
+#endif

Why are you moving U-Boot so much higher in SPI flash?

This is done to accommodate larger size MLO.

Quoted 5 lines

Quoted 5 lines

include/configs/dra7xx_evm.h +5 -0

+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
+#ifdef CONFIG_CMD_FASTBOOT
+#define CONFIG_G_DNL_VENDOR_NUM 0x0451

Quoted 9 lines

include/configs/dra7xx_evm.h line 161

Quoted 6 lines

include/configs/dra7xx_evm.h +6 -0

+#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
+#else
+#define CONFIG_G_DNL_VENDOR_NUM 0x0403
+#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
+#endif
+#define CONFIG_USB_GADGET_DUALSPEED

Why can't we always use one vid/pid?

As we are restricted to use the vid which fastboot host application knows, the other/original
vid/pid kept intact for the dependent functionality, if any. Will check if 0x0403/0xBD00 could be removed.

Quoted 10 lines · Dileep Katta

Hi Tom,

Quoted 6 lines · Tom Rini

Quoted 3 lines · Dileep Katta

- Added new configuration for Android fastboot
- This is based on following patch modified accordingly

http://git.omapzoom.org/?p=repo/u-boot.git;a=commit;h=b2e04f92b5d91c708b6fd6b79d2266966ac51f4b

Quoted 24 lines

Quoted 24 lines

Quoted 3 lines

Signed-off-by Angela Stegmaier <[email protected]>

Signed-off-by Dileep Katta <[email protected]>

[snip]

Quoted 5 lines

include/configs/dra7xx_evm.h +1 -0

@@ -43,6 +43,16 @@
      "uuid_disk=${uuid_gpt_disk};" \
      "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
+#ifdef CONFIG_DRA7XX_ANDROID

include/configs/dra7xx_evm.h line 56

Quoted 10 lines

include/configs/dra7xx_evm.h +9 -0

+/* Fastboot */
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_ANDROID_BOOT_IMAGE
+#define CONFIG_USB_FASTBOOT_BUF_ADDR    CONFIG_SYS_LOAD_ADDR
+#define CONFIG_USB_FASTBOOT_BUF_SIZE    0x2F000000
+#define CONFIG_FASTBOOT_FLASH
+#define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
+#endif
+
 #include <configs/ti_omap5_common.h>

No, just enable fastboot. There's a growing population of people whose workflow is "use fastboot to shove a new test kernel at my device" that aren't strictly using Android, lets enable them.

Quoted 2 lines

OK, will enable fastboot unconditional.
Now there is no much difference for android_defconfig, but will still

keep

Quoted 1 line

separate config for future changes.

I remain unconvinced that we need a separate config upstream still.

Quoted 13 lines

Quoted 12 lines

include/configs/dra7xx_evm.h line 132

Quoted 10 lines

include/configs/dra7xx_evm.h +4 -0

@@ -115,7 +125,11 @@
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
+#ifdef CONFIG_DRA7XX_ANDROID
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x80000
+#else
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
+#endif

Why are you moving U-Boot so much higher in SPI flash?

Quoted 1 line

This is done to accommodate larger size MLO.

Oh that's right. Some parts can be made with a larger SRAM and thus we could use a larger MLO. But are we? What functionality would we be shoving into a larger MLO that would make sense to do this really? Frankly I had been thinking that in these parts it makes more sense to jump to full U-Boot and skip SPL rather than make SPL be very complicated.

Quoted 15 lines

Quoted 15 lines

include/configs/dra7xx_evm.h line 161

Quoted 12 lines

include/configs/dra7xx_evm.h +11 -0

+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
+#ifdef CONFIG_CMD_FASTBOOT
+#define CONFIG_G_DNL_VENDOR_NUM 0x0451
+#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
+#else
+#define CONFIG_G_DNL_VENDOR_NUM 0x0403
+#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
+#endif
+#define CONFIG_USB_GADGET_DUALSPEED

Why can't we always use one vid/pid?

Quoted 1 line

As we are restricted to use the vid which fastboot host application

knows,

Quoted 3 lines

the other/original
vid/pid kept intact for the dependent functionality, if any. Will check if 0x0403/0xBD00 could be removed.

I think we can just always use the VID/PID that fastboot knows, DFU isn't nearly so picky and other gadget use cases don't care I believe.

--
Tom