[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Przemyslaw Marczak]

Hello,
this patchset consists of all features required to use DFU on Odroid XU3.
The default extra environment settings from exynos5-common.h is redefined
and appended by dfu env settings.

For an example of boot.scr for this board, two script files are added,
for booting zImage only, or any of zImage/uImage/FIT.

DFU, THOR, UMS and boot with the attached scripts were tested on Odroid XU3.

The patchset is rebased on master tree:
'3238639 Tom Rini Merge git://git.denx.de/u-boot-net'

Thanks,
Przemyslaw Marczak

Inha Song (2):
  smdk5420: board: add functions to init dfu environment settings
  usb: f_mass_storage: sleep_thread: decrease the interval for check
    ctrlc()

Joonyoung Shim (1):
  smdk5420: board: add functions required to enable USB DWC3

Przemyslaw Marczak (2):
  odroid-xu3: config: enable DFU/THOR/UMS by add configs and environment
  samsung: common: add example boot scripts

??ukasz Majewski (2):
  arm: exynos: USB3 PHY base definition for Exynos5 SoCs
  samsung: usb: phy: Support for DWC3 PHY

 arch/arm/include/asm/arch-exynos/cpu.h        |  2 +-
 board/samsung/common/board.c                  |  6 +-
 board/samsung/common/bootscripts/autoboot.cmd | 92 +++++++++++++++++++++++++++
 board/samsung/common/bootscripts/bootzimg.cmd | 10 +++
 board/samsung/smdk5420/smdk5420.c             | 80 +++++++++++++++++++++--
 drivers/usb/dwc3/Makefile                     |  1 +
 drivers/usb/dwc3/samsung_usb_phy.c            | 78 +++++++++++++++++++++++
 drivers/usb/gadget/f_mass_storage.c           |  2 +-
 include/configs/odroid_xu3.h                  | 88 ++++++++++++++++++++++++-
 include/samsung-usb-phy-uboot.h               | 16 +++++
 10 files changed, 363 insertions(+), 12 deletions(-)
 create mode 100644 board/samsung/common/bootscripts/autoboot.cmd
 create mode 100644 board/samsung/common/bootscripts/bootzimg.cmd
 create mode 100644 drivers/usb/dwc3/samsung_usb_phy.c
 create mode 100644 include/samsung-usb-phy-uboot.h

-- 
1.9.1

[U-Boot] [PATCH 1/7] arm: exynos: USB3 PHY base definition for Exynos5 SoCs

[Przemyslaw Marczak]

From: Lukasz Majewski <l.majewski@samsung.com>

After that change it would be possible to call samsung_get_base_usb3_phy()
function to get proper base address

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 arch/arm/include/asm/arch-exynos/cpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h
index e739520..cb3d2cc 100644
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/include/asm/arch-exynos/cpu.h
@@ -167,6 +167,7 @@
 #define EXYNOS5420_USB_HOST_EHCI_BASE	0x12110000
 #define EXYNOS5420_MMC_BASE		0x12200000
 #define EXYNOS5420_SROMC_BASE		0x12250000
+#define EXYNOS5420_USB3PHY_BASE	0x12500000
 #define EXYNOS5420_UART_BASE		0x12C00000
 #define EXYNOS5420_I2C_BASE		0x12C60000
 #define EXYNOS5420_I2C_8910_BASE	0x12E00000
@@ -187,7 +188,6 @@
 #define EXYNOS5420_FIMD_BASE		DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_ADC_BASE		DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_MODEM_BASE		DEVICE_NOT_AVAILABLE
-#define EXYNOS5420_USB3PHY_BASE		DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_USB_HOST_XHCI_BASE	DEVICE_NOT_AVAILABLE
 
 
-- 
1.9.1

[U-Boot] [PATCH 2/7] samsung: usb: phy: Support for DWC3 PHY

[Przemyslaw Marczak]

From: Lukasz Majewski <l.majewski@samsung.com>

New files, namely samsung_usb_phy.c and samsung-usb-phy-uboot.h have
been added to u-boot to provide proper PHY handling at Exynos5 SoCs.

This code is used thereafter in the board_usb_init() call.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Marek Vasut <marex@denx.de>
---
 drivers/usb/dwc3/Makefile          |  1 +
 drivers/usb/dwc3/samsung_usb_phy.c | 78 ++++++++++++++++++++++++++++++++++++++
 include/samsung-usb-phy-uboot.h    | 16 ++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 drivers/usb/dwc3/samsung_usb_phy.c
 create mode 100644 include/samsung-usb-phy-uboot.h

diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index e455a52..02bb216 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -6,3 +6,4 @@ dwc3-y					+= gadget.o ep0.o
 
 obj-$(CONFIG_USB_DWC3_OMAP)		+= dwc3-omap.o
 obj-$(CONFIG_USB_DWC3_PHY_OMAP)		+= ti_usb_phy.o
+obj-$(CONFIG_USB_DWC3_PHY_SAMSUNG)	+= samsung_usb_phy.o
diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c
new file mode 100644
index 0000000..4220986
--- /dev/null
+++ b/drivers/usb/dwc3/samsung_usb_phy.c
@@ -0,0 +1,78 @@
+/**
+ * samsung_usb_phy.c - DesignWare USB3 (DWC3) PHY handling file
+ *
+ * Copyright (C) 2015 Samsung Electronics
+ *
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0
+ */
+
+#include <common.h>
+#include <asm/arch/power.h>
+#include <asm/arch/xhci-exynos.h>
+
+void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy)
+{
+	u32 reg;
+
+	/* Reset USB 3.0 PHY */
+	writel(0x0, &phy->phy_reg0);
+
+	clrbits_le32(&phy->phy_param0,
+			/* Select PHY CLK source */
+			PHYPARAM0_REF_USE_PAD |
+			/* Set Loss-of-Signal Detector sensitivity */
+			PHYPARAM0_REF_LOSLEVEL_MASK);
+	setbits_le32(&phy->phy_param0, PHYPARAM0_REF_LOSLEVEL);
+
+
+	writel(0x0, &phy->phy_resume);
+
+	/*
+	 * Setting the Frame length Adj value[6:1] to default 0x20
+	 * See xHCI 1.0 spec, 5.2.4
+	 */
+	setbits_le32(&phy->link_system,
+			LINKSYSTEM_XHCI_VERSION_CONTROL |
+			LINKSYSTEM_FLADJ(0x20));
+
+	/* Set Tx De-Emphasis level */
+	clrbits_le32(&phy->phy_param1, PHYPARAM1_PCS_TXDEEMPH_MASK);
+	setbits_le32(&phy->phy_param1, PHYPARAM1_PCS_TXDEEMPH);
+
+	setbits_le32(&phy->phy_batchg, PHYBATCHG_UTMI_CLKSEL);
+
+	/* PHYTEST POWERDOWN Control */
+	clrbits_le32(&phy->phy_test,
+			PHYTEST_POWERDOWN_SSP |
+			PHYTEST_POWERDOWN_HSP);
+
+	/* UTMI Power Control */
+	writel(PHYUTMI_OTGDISABLE, &phy->phy_utmi);
+
+		/* Use core clock from main PLL */
+	reg = PHYCLKRST_REFCLKSEL_EXT_REFCLK |
+		/* Default 24Mhz crystal clock */
+		PHYCLKRST_FSEL(FSEL_CLKSEL_24M) |
+		PHYCLKRST_MPLL_MULTIPLIER_24MHZ_REF |
+		PHYCLKRST_SSC_REFCLKSEL(0) |
+		/* Force PortReset of PHY */
+		PHYCLKRST_PORTRESET |
+		/* Digital power supply in normal operating mode */
+		PHYCLKRST_RETENABLEN |
+		/* Enable ref clock for SS function */
+		PHYCLKRST_REF_SSP_EN |
+		/* Enable spread spectrum */
+		PHYCLKRST_SSC_EN |
+		/* Power down HS Bias and PLL blocks in suspend mode */
+		PHYCLKRST_COMMONONN;
+
+	writel(reg, &phy->phy_clk_rst);
+
+	/* giving time to Phy clock to settle before resetting */
+	udelay(10);
+
+	reg &= ~PHYCLKRST_PORTRESET;
+	writel(reg, &phy->phy_clk_rst);
+}
diff --git a/include/samsung-usb-phy-uboot.h b/include/samsung-usb-phy-uboot.h
new file mode 100644
index 0000000..9f37560
--- /dev/null
+++ b/include/samsung-usb-phy-uboot.h
@@ -0,0 +1,16 @@
+/* include/samsung-usb-phy-uboot.h
+ *
+ * Copyright (c) 2015 Samsung Electronics
+ *
+ * USB3 (DWC3) PHY uboot init
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __SAMSUNG_USB_PHY_UBOOT_H_
+#define __SAMSUNG_USB_PHY_UBOOT_H_
+
+#include <asm/arch/xhci-exynos.h>
+
+void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy);
+#endif /* __SAMSUNG_USB_PHY_UBOOT_H_ */
-- 
1.9.1

[U-Boot] [PATCH 3/7] smdk5420: board: add functions required to enable USB DWC3

[Przemyslaw Marczak]

From: Joonyoung Shim <jy0922.shim@samsung.com>

This commit adds implementation of function calls:
- usb_gadget_handle_interrupts()
- board_usb_init()

Which allow enable USB DWC3 gadget for this board.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Inha Song <ideal.song@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 board/samsung/common/board.c      |  6 ++++-
 board/samsung/smdk5420/smdk5420.c | 50 +++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 20dd75c..1a4e8c9 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -24,8 +24,9 @@
 #include <asm/arch/sromc.h>
 #include <lcd.h>
 #include <i2c.h>
-#include <samsung/misc.h>
 #include <usb.h>
+#include <dwc3-uboot.h>
+#include <samsung/misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -378,5 +379,8 @@ void reset_misc(void)
 
 int board_usb_cleanup(int index, enum usb_init_type init)
 {
+#ifdef CONFIG_USB_DWC3
+	dwc3_uboot_exit(index);
+#endif
 	return 0;
 }
diff --git a/board/samsung/smdk5420/smdk5420.c b/board/samsung/smdk5420/smdk5420.c
index 82f607b..8021f77 100644
--- a/board/samsung/smdk5420/smdk5420.c
+++ b/board/samsung/smdk5420/smdk5420.c
@@ -6,19 +6,24 @@
 
 #include <common.h>
 #include <fdtdec.h>
-#include <asm/io.h>
-#include <i2c.h>
-#include <lcd.h>
-#include <parade.h>
-#include <spi.h>
 #include <errno.h>
+#include <asm/io.h>
 #include <asm/gpio.h>
-#include <asm/arch/board.h>
 #include <asm/arch/cpu.h>
-#include <asm/arch/pinmux.h>
+#include <asm/arch/board.h>
+#include <asm/arch/power.h>
 #include <asm/arch/system.h>
+#include <asm/arch/pinmux.h>
 #include <asm/arch/dp_info.h>
+#include <asm/arch/xhci-exynos.h>
 #include <power/tps65090_pmic.h>
+#include <i2c.h>
+#include <lcd.h>
+#include <parade.h>
+#include <spi.h>
+#include <usb.h>
+#include <dwc3-uboot.h>
+#include <samsung-usb-phy-uboot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -75,3 +80,34 @@ int board_get_revision(void)
 {
 	return 0;
 }
+
+#ifdef CONFIG_USB_DWC3
+static struct dwc3_device dwc3_device_data = {
+	.maximum_speed = USB_SPEED_SUPER,
+	.base = 0x12400000,
+	.dr_mode = USB_DR_MODE_PERIPHERAL,
+	.index = 0,
+};
+
+int usb_gadget_handle_interrupts(void)
+{
+	dwc3_uboot_handle_interrupt(0);
+	return 0;
+}
+
+int board_usb_init(int index, enum usb_init_type init)
+{
+	struct exynos_usb3_phy *phy = (struct exynos_usb3_phy *)
+		samsung_get_base_usb3_phy();
+
+	if (!phy) {
+		error("usb3 phy not supported");
+		return -ENODEV;
+	}
+
+	set_usbdrd_phy_ctrl(POWER_USB_DRD_PHY_CTRL_EN);
+	exynos5_usb3_phy_init(phy);
+
+	return dwc3_uboot_init(&dwc3_device_data);
+}
+#endif
-- 
1.9.1

[U-Boot] [PATCH 4/7] smdk5420: board: add functions to init dfu environment settings

[Przemyslaw Marczak]

From: Inha Song <ideal.song@samsung.com>

This commit extends SMDK5420 board's file by adding functions:
- get_dfu_alt_system()
- get_dfu_alt_boot()

This allows setting the DFU environment by function set_dfu_alt_info()
from: board/samsung/common/misc.c

Signed-off-by: Inha Song <ideal.song@samsung.com>
Cc: Akshay Saraswat <akshay.s@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 board/samsung/smdk5420/smdk5420.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/board/samsung/smdk5420/smdk5420.c b/board/samsung/smdk5420/smdk5420.c
index 8021f77..88f4044 100644
--- a/board/samsung/smdk5420/smdk5420.c
+++ b/board/samsung/smdk5420/smdk5420.c
@@ -19,6 +19,7 @@
 #include <power/tps65090_pmic.h>
 #include <i2c.h>
 #include <lcd.h>
+#include <mmc.h>
 #include <parade.h>
 #include <spi.h>
 #include <usb.h>
@@ -111,3 +112,32 @@ int board_usb_init(int index, enum usb_init_type init)
 	return dwc3_uboot_init(&dwc3_device_data);
 }
 #endif
+#ifdef CONFIG_SET_DFU_ALT_INFO
+char *get_dfu_alt_system(char *interface, char *devstr)
+{
+	return getenv("dfu_alt_system");
+}
+
+char *get_dfu_alt_boot(char *interface, char *devstr)
+{
+	struct mmc *mmc;
+	char *alt_boot;
+	int dev_num;
+
+	dev_num = simple_strtoul(devstr, NULL, 10);
+
+	mmc = find_mmc_device(dev_num);
+	if (!mmc)
+		return NULL;
+
+	if (mmc_init(mmc))
+		return NULL;
+
+	if (IS_SD(mmc))
+		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
+	else
+		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
+
+	return alt_boot;
+}
+#endif
-- 
1.9.1

[U-Boot] [PATCH 5/7] usb: f_mass_storage: sleep_thread: decrease the interval for check ctrlc()

[Przemyslaw Marczak]

From: Inha Song <ideal.song@samsung.com>

This change decreases the interval of calls to:
- display busy indicator
- check ctrlc()
- check cable connection

By this change, breaking the UMS command is more easy on Odroid XU3.

Signed-off-by: Inha Song <ideal.song@samsung.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
---
 drivers/usb/gadget/f_mass_storage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index d1bc5ef..abe9391 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -671,7 +671,7 @@ static int sleep_thread(struct fsg_common *common)
 		if (common->thread_wakeup_needed)
 			break;
 
-		if (++i == 50000) {
+		if (++i == 20000) {
 			busy_indicator();
 			i = 0;
 			k++;
-- 
1.9.1

[U-Boot] [PATCH 6/7] odroid-xu3: config: enable DFU/THOR/UMS by add configs and environment

[Przemyslaw Marczak]

This patch enables all functions required to use DFU/THOR and UMS:
- DWC3: core, gadget, Samsung DWC3 PHY
- USB gadget: endpoint autoconf, downloader, DFU, THOR, UMS

The CONFIG_EXTRA_ENV_SETINGS from exynos5-common.h is redefined
and appended by dfu environment setting and some system settings.

The boot is still using $distro_boot as previous.

Signed-off-by: Inha Song <ideal.song@samsung.com>
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 include/configs/odroid_xu3.h | 88 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 2 deletions(-)

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index c395020..cf17f3d 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -35,8 +35,8 @@
 
 #undef CONFIG_ENV_SIZE
 #undef CONFIG_ENV_OFFSET
-#define CONFIG_ENV_SIZE			4096
-#define CONFIG_ENV_OFFSET		(SZ_1K * 1280) /* 1.25 MiB offset */
+#define CONFIG_ENV_SIZE			(SZ_1K * 16)
+#define CONFIG_ENV_OFFSET		(SZ_1K * 3136) /* ~3 MiB offset */
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
@@ -46,8 +46,92 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
 
+/* DWC3 */
+#define CONFIG_USB_DWC3
+#define CONFIG_USB_DWC3_GADGET
+#define CONFIG_USB_DWC3_PHY_SAMSUNG
+
+/* USB gadget */
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_DUALSPEED
+#define CONFIG_USB_GADGET_VBUS_DRAW	2
+
+/* Downloader */
+#define CONFIG_G_DNL_VENDOR_NUM		0x04E8
+#define CONFIG_G_DNL_PRODUCT_NUM	0x6601
+#define CONFIG_G_DNL_MANUFACTURER	"Samsung"
+#define CONFIG_USBDOWNLOAD_GADGET
+
+/* DFU */
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_MMC
+#define CONFIG_CMD_DFU
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_32M
+#define DFU_DEFAULT_POLL_TIMEOUT	300
+
+/* THOR */
+#define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_G_DNL_VENDOR_NUM
+#define CONFIG_G_DNL_THOR_PRODUCT_NUM	0x685D
+#define CONFIG_THOR_FUNCTION
+#define CONFIG_CMD_THOR_DOWNLOAD
+
+/* UMS */
+#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CONFIG_USB_GADGET_MASS_STORAGE
+#define CONFIG_CMD_USB_MASS_STORAGE
+
 /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
 #undef CONFIG_EXYNOS_TMU
 #undef CONFIG_TMU_CMD_DTT
 
+#define CONFIG_DFU_ALT_SYSTEM               \
+	"uImage fat 0 1;"                   \
+	"zImage fat 0 1;"                   \
+	"Image.itb fat 0 1;"                \
+	"uInitrd fat 0 1;"                  \
+	"boot.scr fat 0 1;"                 \
+	"boot.cmd fat 0 1;"                 \
+	"exynos5422-odroidxu3.dtb fat 0 1;" \
+	"boot part 0 1;"                    \
+	"root part 0 2\0"
+
+#define CONFIG_DFU_ALT_BOOT_EMMC           \
+	"u-boot raw 0x3e 0x800 mmcpart 1;" \
+	"bl1 raw 0x0 0x1e mmcpart 1;"      \
+	"bl2 raw 0x1e 0x1d mmcpart 1;"     \
+	"tzsw raw 0x83e 0x200 mmcpart 1;"  \
+	"params.bin raw 0x1880 0x20\0"
+
+#define CONFIG_DFU_ALT_BOOT_SD   \
+	"u-boot raw 0x3f 0x800;" \
+	"bl1 raw 0x1 0x1e;"      \
+	"bl2 raw 0x1f 0x1d;"     \
+	"tzsw raw 0x83f 0x200;"  \
+	"params.bin raw 0x1880 0x20\0"
+
+/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */
+#define CONFIG_MISC_COMMON
+#define CONFIG_SET_DFU_ALT_INFO
+#define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
+
+/* Define new extra env settings, including DFU settings */
+#undef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	EXYNOS_DEVICE_SETTINGS \
+	EXYNOS_FDTFILE_SETTING \
+	MEM_LAYOUT_ENV_SETTINGS \
+	BOOTENV \
+	"bootdelay=0\0" \
+	"rootfstype=ext4\0" \
+	"console=" CONFIG_DEFAULT_CONSOLE \
+	"fdtfile=exynos5422-odroidxu3.dtb\0" \
+	"boardname=odroidxu3\0" \
+	"mmcbootdev=0\0" \
+	"mmcrootdev=0\0" \
+	"mmcbootpart=1\0" \
+	"mmcrootpart=2\0" \
+	"dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \
+	"dfu_alt_info=Autoset by THOR/DFU command run.\0"
+
 #endif	/* __CONFIG_H */
-- 
1.9.1

[U-Boot] [PATCH 7/7] samsung: common: add example boot scripts

[Przemyslaw Marczak]

This commit adds example scripts of boot.scr:
- bootzimg.cmd - check if dtb exists and boot zImage
- autoboot.cmd - check which image exists: Image.itb, zImage or uImage
                 and optionally load fdt file for u/zImage

The blank spaces are added to improve readability and can be removed
before use mkimage.

Required U-Boot environment variables: $boardname, $fdtfile, $console,
$mmcbootdev, $mmcbootpart, $mmcrootdev, $mmcrootpart, $rootfstype.

Making boot.scr from file.cmd:
 mkimage -C none -A arm -T script -d file.cmd boot.scr

The Odroid XU3 default environment is ready for those boot scripts and
the right script can be loaded by DFU.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 board/samsung/common/bootscripts/autoboot.cmd | 92 +++++++++++++++++++++++++++
 board/samsung/common/bootscripts/bootzimg.cmd | 10 +++
 2 files changed, 102 insertions(+)
 create mode 100644 board/samsung/common/bootscripts/autoboot.cmd
 create mode 100644 board/samsung/common/bootscripts/bootzimg.cmd

diff --git a/board/samsung/common/bootscripts/autoboot.cmd b/board/samsung/common/bootscripts/autoboot.cmd
new file mode 100644
index 0000000..3b40156
--- /dev/null
+++ b/board/samsung/common/bootscripts/autoboot.cmd
@@ -0,0 +1,92 @@
+# This is an example file to generate boot.scr - a boot script for U-Boot
+# Generate boot.scr:
+# ./tools/mkimage -c none -A arm -T script -d autoboot.cmd boot.scr
+#
+# It requires a list of environment variables to be defined before load:
+# platform dependent: boardname, fdtfile, console
+# system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype
+#
+setenv fdtaddr     "40800000"
+setenv initrdname  "uInitrd"
+setenv initrdaddr  "42000000"
+setenv loaddtb     "load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} ${fdtfile}"
+setenv loadinitrd  "load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} ${initrdname}"
+setenv loadkernel  "load mmc ${mmcbootdev}:${mmcbootpart} '${kerneladdr}' '${kernelname}'"
+setenv kernel_args "setenv bootargs ${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}"
+
+#### Routine: check_dtb - check that target.dtb exists on boot partition
+setenv check_dtb "
+if test -e mmc '${mmcbootdev}':'${mmcbootpart}' '${fdtfile}'; then
+	run loaddtb;
+	setenv fdt_addr ${fdtaddr};
+else
+	echo Warning! Booting without DTB: '${fdtfile}'!;
+	setenv fdt_addr;
+fi;"
+
+#### Routine: check_ramdisk - check that uInitrd exists on boot partition
+setenv check_ramdisk "
+if test -e mmc '${mmcbootdev}':'${mmcbootpart}' '${initrdname}'; then
+	echo "Found ramdisk image.";
+	run loadinitrd;
+	setenv initrd_addr ${initrdaddr};
+else
+	echo Warning! Booting without RAMDISK: '${initrdname}'!;
+	setenv initrd_addr -;
+fi;"
+
+#### Routine: boot_fit - check that env $boardname is set and boot proper config of ITB image
+setenv setboot_fit "
+if test -e '${boardname}'; then
+	setenv fdt_addr ;
+	setenv initrd_addr ;
+	setenv kerneladdr  0x42000000;
+	setenv kernelname  Image.itb;
+	setenv itbcfg      \#'${boardname}';
+	setenv imgbootcmd  bootm;
+else
+	echo Warning! Variable: \$boardname is undefined!;
+fi"
+
+#### Routine: setboot_uimg - prepare env to boot uImage
+setenv setboot_uimg "
+	setenv kerneladdr 0x40007FC0;
+	setenv kernelname uImage;
+	setenv itbcfg     ;
+	setenv imgbootcmd bootm;
+	run check_dtb;
+	run check_ramdisk;"
+
+#### Routine: setboot_zimg - prepare env to boot zImage
+setenv setboot_zimg "
+	setenv kerneladdr 0x40007FC0;
+	setenv kernelname zImage;
+	setenv itbcfg     ;
+	setenv imgbootcmd bootz;
+	run check_dtb;
+	run check_ramdisk;"
+
+#### Routine: boot_img - boot the kernel after env setup
+setenv boot_img "
+	run loadkernel;
+	run kernel_args;
+	'${imgbootcmd}' '${kerneladdr}${itbcfg}' '${initrd_addr}' '${fdt_addr}';"
+
+#### Routine: autoboot - choose proper boot path
+setenv autoboot "
+if test -e mmc 0:${mmcbootpart} Image.itb; then
+	echo Found kernel image: Image.itb;
+	run setboot_fit;
+	run boot_img;
+elif test -e mmc 0:${mmcbootpart} zImage; then
+	echo Found kernel image: zImage;
+	run setboot_zimg;
+	run boot_img;
+elif test -e mmc 0:${mmcbootpart} uImage; then
+	echo Found kernel image: uImage;
+	run setboot_uimg;
+	run boot_img;
+fi;"
+
+#### Execute the defined autoboot macro
+run autoboot
diff --git a/board/samsung/common/bootscripts/bootzimg.cmd b/board/samsung/common/bootscripts/bootzimg.cmd
new file mode 100644
index 0000000..2fb4c16
--- /dev/null
+++ b/board/samsung/common/bootscripts/bootzimg.cmd
@@ -0,0 +1,10 @@
+setenv kernelname zImage;
+setenv boot_kernel "setenv bootargs \"${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}\";
+load mmc ${mmcbootdev}:${mmcbootpart} 0x40007FC0 '${kernelname}';
+if load mmc ${mmcbootdev}:${mmcbootpart} 40800000 ${fdtfile}; then
+	bootz 0x40007FC0 - 40800000;
+else
+	echo Warning! Booting without DTB: '${fdtfile}'!;
+	bootz 0x40007FC0 -;
+fi;"
+run boot_kernel;
\ No newline at end of file
-- 
1.9.1

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Marek Vasut]

On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
> Hello,
> this patchset consists of all features required to use DFU on Odroid XU3.
> The default extra environment settings from exynos5-common.h is redefined
> and appended by dfu env settings.
> 
> For an example of boot.scr for this board, two script files are added,
> for booting zImage only, or any of zImage/uImage/FIT.
> 
> DFU, THOR, UMS and boot with the attached scripts were tested on Odroid
> XU3.
> 
> The patchset is rebased on master tree:
> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
> 
> Thanks,
> Przemyslaw Marczak

Entire series
Reviewed-by: Marek Vasut <marex@denx.de>

Which tree will this go through ?

Best regards,
Marek Vasut

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Przemyslaw Marczak]

Hello Marek,

On 05/22/2015 09:40 PM, Marek Vasut wrote:
> On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
>> Hello,
>> this patchset consists of all features required to use DFU on Odroid XU3.
>> The default extra environment settings from exynos5-common.h is redefined
>> and appended by dfu env settings.
>>
>> For an example of boot.scr for this board, two script files are added,
>> for booting zImage only, or any of zImage/uImage/FIT.
>>
>> DFU, THOR, UMS and boot with the attached scripts were tested on Odroid
>> XU3.
>>
>> The patchset is rebased on master tree:
>> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
>>
>> Thanks,
>> Przemyslaw Marczak
>
> Entire series
> Reviewed-by: Marek Vasut <marex@denx.de>
>
> Which tree will this go through ?
>
> Best regards,
> Marek Vasut
>

Thank you for the review.
I think, that it can go through usb tree.

Minkyu, do you agree?

Best regards,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Marek Vasut]

On Monday, May 25, 2015 at 10:51:27 AM, Przemyslaw Marczak wrote:
> Hello Marek,

Hi!

> On 05/22/2015 09:40 PM, Marek Vasut wrote:
> > On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
> >> Hello,
> >> this patchset consists of all features required to use DFU on Odroid
> >> XU3. The default extra environment settings from exynos5-common.h is
> >> redefined and appended by dfu env settings.
> >> 
> >> For an example of boot.scr for this board, two script files are added,
> >> for booting zImage only, or any of zImage/uImage/FIT.
> >> 
> >> DFU, THOR, UMS and boot with the attached scripts were tested on Odroid
> >> XU3.
> >> 
> >> The patchset is rebased on master tree:
> >> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
> >> 
> >> Thanks,
> >> Przemyslaw Marczak
> > 
> > Entire series
> > Reviewed-by: Marek Vasut <marex@denx.de>
> > 
> > Which tree will this go through ?
> > 
> > Best regards,
> > Marek Vasut
> 
> Thank you for the review.
> I think, that it can go through usb tree.

I think it should go through gadget tree, no ? What's with Lukasz anyway,
he's been inactive recently ... ?

Best regards,
Marek Vasut

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Przemyslaw Marczak]

Hello Marek,

On 05/25/2015 12:24 PM, Marek Vasut wrote:
> On Monday, May 25, 2015 at 10:51:27 AM, Przemyslaw Marczak wrote:
>> Hello Marek,
>
> Hi!
>
>> On 05/22/2015 09:40 PM, Marek Vasut wrote:
>>> On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
>>>> Hello,
>>>> this patchset consists of all features required to use DFU on Odroid
>>>> XU3. The default extra environment settings from exynos5-common.h is
>>>> redefined and appended by dfu env settings.
>>>>
>>>> For an example of boot.scr for this board, two script files are added,
>>>> for booting zImage only, or any of zImage/uImage/FIT.
>>>>
>>>> DFU, THOR, UMS and boot with the attached scripts were tested on Odroid
>>>> XU3.
>>>>
>>>> The patchset is rebased on master tree:
>>>> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
>>>>
>>>> Thanks,
>>>> Przemyslaw Marczak
>>>
>>> Entire series
>>> Reviewed-by: Marek Vasut <marex@denx.de>
>>>
>>> Which tree will this go through ?
>>>
>>> Best regards,
>>> Marek Vasut
>>
>> Thank you for the review.
>> I think, that it can go through usb tree.
>
> I think it should go through gadget tree, no ? What's with Lukasz anyway,
> he's been inactive recently ... ?
>
> Best regards,
> Marek Vasut
>

Lukasz was unreachable for a few last days. I will talk to him tomorrow 
and I think, he can take those patches then.

Best regards,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Marek Vasut]

On Monday, May 25, 2015 at 12:42:02 PM, Przemyslaw Marczak wrote:
> Hello Marek,

Hi!

> On 05/25/2015 12:24 PM, Marek Vasut wrote:
> > On Monday, May 25, 2015 at 10:51:27 AM, Przemyslaw Marczak wrote:
> >> Hello Marek,
> > 
> > Hi!
> > 
> >> On 05/22/2015 09:40 PM, Marek Vasut wrote:
> >>> On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
> >>>> Hello,
> >>>> this patchset consists of all features required to use DFU on Odroid
> >>>> XU3. The default extra environment settings from exynos5-common.h is
> >>>> redefined and appended by dfu env settings.
> >>>> 
> >>>> For an example of boot.scr for this board, two script files are added,
> >>>> for booting zImage only, or any of zImage/uImage/FIT.
> >>>> 
> >>>> DFU, THOR, UMS and boot with the attached scripts were tested on
> >>>> Odroid XU3.
> >>>> 
> >>>> The patchset is rebased on master tree:
> >>>> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
> >>>> 
> >>>> Thanks,
> >>>> Przemyslaw Marczak
> >>> 
> >>> Entire series
> >>> Reviewed-by: Marek Vasut <marex@denx.de>
> >>> 
> >>> Which tree will this go through ?
> >>> 
> >>> Best regards,
> >>> Marek Vasut
> >> 
> >> Thank you for the review.
> >> I think, that it can go through usb tree.
> > 
> > I think it should go through gadget tree, no ? What's with Lukasz anyway,
> > he's been inactive recently ... ?
> > 
> > Best regards,
> > Marek Vasut
> 
> Lukasz was unreachable for a few last days. I will talk to him tomorrow
> and I think, he can take those patches then.

It's not really necessary to bother him if he's busy with stuff, I can
help there. I was just worrying if something could have happened (I hope
not) to him.

Best regards,
Marek Vasut

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Przemyslaw Marczak]

Hello Marek,

On 05/25/2015 01:15 PM, Marek Vasut wrote:
> On Monday, May 25, 2015 at 12:42:02 PM, Przemyslaw Marczak wrote:
>> Hello Marek,
>
> Hi!
>
>> On 05/25/2015 12:24 PM, Marek Vasut wrote:
>>> On Monday, May 25, 2015 at 10:51:27 AM, Przemyslaw Marczak wrote:
>>>> Hello Marek,
>>>
>>> Hi!
>>>
>>>> On 05/22/2015 09:40 PM, Marek Vasut wrote:
>>>>> On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
>>>>>> Hello,
>>>>>> this patchset consists of all features required to use DFU on Odroid
>>>>>> XU3. The default extra environment settings from exynos5-common.h is
>>>>>> redefined and appended by dfu env settings.
>>>>>>
>>>>>> For an example of boot.scr for this board, two script files are added,
>>>>>> for booting zImage only, or any of zImage/uImage/FIT.
>>>>>>
>>>>>> DFU, THOR, UMS and boot with the attached scripts were tested on
>>>>>> Odroid XU3.
>>>>>>
>>>>>> The patchset is rebased on master tree:
>>>>>> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
>>>>>>
>>>>>> Thanks,
>>>>>> Przemyslaw Marczak
>>>>>
>>>>> Entire series
>>>>> Reviewed-by: Marek Vasut <marex@denx.de>
>>>>>
>>>>> Which tree will this go through ?
>>>>>
>>>>> Best regards,
>>>>> Marek Vasut
>>>>
>>>> Thank you for the review.
>>>> I think, that it can go through usb tree.
>>>
>>> I think it should go through gadget tree, no ? What's with Lukasz anyway,
>>> he's been inactive recently ... ?
>>>
>>> Best regards,
>>> Marek Vasut
>>
>> Lukasz was unreachable for a few last days. I will talk to him tomorrow
>> and I think, he can take those patches then.
>
> It's not really necessary to bother him if he's busy with stuff, I can
> help there. I was just worrying if something could have happened (I hope
> not) to him.
>
> Best regards,
> Marek Vasut
>

Ah, thanks. Lukasz is fine - but he was busy with some task last days 
and today he is out of office.

I think, he will have a while for taking those patches tomorrow or if 
you want, you can take those patches.

Best regards,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Lukasz Majewski]

Hi Marek,

> On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
> > Hello,
> > this patchset consists of all features required to use DFU on
> > Odroid XU3. The default extra environment settings from
> > exynos5-common.h is redefined and appended by dfu env settings.
> > 
> > For an example of boot.scr for this board, two script files are
> > added, for booting zImage only, or any of zImage/uImage/FIT.
> > 
> > DFU, THOR, UMS and boot with the attached scripts were tested on
> > Odroid XU3.
> > 
> > The patchset is rebased on master tree:
> > '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
> > 
> > Thanks,
> > Przemyslaw Marczak
> 
> Entire series
> Reviewed-by: Marek Vasut <marex@denx.de>
> 
> Which tree will this go through ?
> 
> Best regards,
> Marek Vasut

If you don't mind it can go through u-boot-dfu tree.

-- 
Best regards,

Lukasz Majewski

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

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Marek Vasut]

On Monday, May 25, 2015 at 04:51:29 PM, Lukasz Majewski wrote:
> Hi Marek,

Hi!

> > On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
> > > Hello,
> > > this patchset consists of all features required to use DFU on
> > > Odroid XU3. The default extra environment settings from
> > > exynos5-common.h is redefined and appended by dfu env settings.
> > > 
> > > For an example of boot.scr for this board, two script files are
> > > added, for booting zImage only, or any of zImage/uImage/FIT.
> > > 
> > > DFU, THOR, UMS and boot with the attached scripts were tested on
> > > Odroid XU3.
> > > 
> > > The patchset is rebased on master tree:
> > > '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
> > > 
> > > Thanks,
> > > Przemyslaw Marczak
> > 
> > Entire series
> > Reviewed-by: Marek Vasut <marex@denx.de>
> > 
> > Which tree will this go through ?
> > 
> > Best regards,
> > Marek Vasut
> 
> If you don't mind it can go through u-boot-dfu tree.

I don't mind, please go ahead! Good to see you back :)

Best regards,
Marek Vasut

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Minkyu Kang]

Hi,

On 26/05/15 00:07, Marek Vasut wrote:
> On Monday, May 25, 2015 at 04:51:29 PM, Lukasz Majewski wrote:
>> Hi Marek,
> 
> Hi!
> 
>>> On Friday, May 22, 2015 at 06:14:21 PM, Przemyslaw Marczak wrote:
>>>> Hello,
>>>> this patchset consists of all features required to use DFU on
>>>> Odroid XU3. The default extra environment settings from
>>>> exynos5-common.h is redefined and appended by dfu env settings.
>>>>
>>>> For an example of boot.scr for this board, two script files are
>>>> added, for booting zImage only, or any of zImage/uImage/FIT.
>>>>
>>>> DFU, THOR, UMS and boot with the attached scripts were tested on
>>>> Odroid XU3.
>>>>
>>>> The patchset is rebased on master tree:
>>>> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
>>>>
>>>> Thanks,
>>>> Przemyslaw Marczak
>>>
>>> Entire series
>>> Reviewed-by: Marek Vasut <marex@denx.de>
>>>
>>> Which tree will this go through ?
>>>
>>> Best regards,
>>> Marek Vasut
>>
>> If you don't mind it can go through u-boot-dfu tree.
> 
> I don't mind, please go ahead! Good to see you back :)
> 
> Best regards,
> Marek Vasut
> 

I agreed.

Acked-by: Minkyu Kang <mk7.kang@samsung.com>

Thanks,
Minkyu Kang.

[U-Boot] [PATCH 0/7] Odroid XU3: enable DWC3 and DFU/THOR/UMS

[Lukasz Majewski]

Hi Przemyslaw,

> Hello,
> this patchset consists of all features required to use DFU on Odroid
> XU3. The default extra environment settings from exynos5-common.h is
> redefined and appended by dfu env settings.
> 
> For an example of boot.scr for this board, two script files are added,
> for booting zImage only, or any of zImage/uImage/FIT.
> 
> DFU, THOR, UMS and boot with the attached scripts were tested on
> Odroid XU3.
> 
> The patchset is rebased on master tree:
> '3238639 Tom Rini Merge git://git.denx.de/u-boot-net'
> 
> Thanks,
> Przemyslaw Marczak
> 
> Inha Song (2):
>   smdk5420: board: add functions to init dfu environment settings
>   usb: f_mass_storage: sleep_thread: decrease the interval for check
>     ctrlc()
> 
> Joonyoung Shim (1):
>   smdk5420: board: add functions required to enable USB DWC3
> 
> Przemyslaw Marczak (2):
>   odroid-xu3: config: enable DFU/THOR/UMS by add configs and
> environment samsung: common: add example boot scripts
> 
> ?ukasz Majewski (2):
>   arm: exynos: USB3 PHY base definition for Exynos5 SoCs
>   samsung: usb: phy: Support for DWC3 PHY
> 
>  arch/arm/include/asm/arch-exynos/cpu.h        |  2 +-
>  board/samsung/common/board.c                  |  6 +-
>  board/samsung/common/bootscripts/autoboot.cmd | 92
> +++++++++++++++++++++++++++
> board/samsung/common/bootscripts/bootzimg.cmd | 10 +++
> board/samsung/smdk5420/smdk5420.c             | 80
> +++++++++++++++++++++-- drivers/usb/dwc3/Makefile
> |  1 + drivers/usb/dwc3/samsung_usb_phy.c            | 78
> +++++++++++++++++++++++ drivers/usb/gadget/f_mass_storage.c
> |  2 +- include/configs/odroid_xu3.h                  | 88
> ++++++++++++++++++++++++-
> include/samsung-usb-phy-uboot.h               | 16 +++++ 10 files
> changed, 363 insertions(+), 12 deletions(-) create mode 100644
> board/samsung/common/bootscripts/autoboot.cmd create mode 100644
> board/samsung/common/bootscripts/bootzimg.cmd create mode 100644
> drivers/usb/dwc3/samsung_usb_phy.c create mode 100644
> include/samsung-usb-phy-uboot.h
> 

Applied to u-boot-dfu tree.

(Automated) Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Test HW: Trats (Exynos4210)

-- 
Best regards,

Lukasz Majewski

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