From mboxrd@z Thu Jan  1 00:00:00 1970
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 20 Nov 2015 16:21:33 +0100
Subject: [U-Boot] [U-Boot,1/2] sunxi: Enable DFU for RAM
In-Reply-To: <1445748287-12421-2-git-send-email-siarhei.siamashka@gmail.com>
References: <1445748287-12421-2-git-send-email-siarhei.siamashka@gmail.com>
Message-ID: <564F3A7D.3000306@redhat.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi,

On 25-10-15 05:44, Siarhei Siamashka wrote:
> The DFU protocol implementation in U-Boot is much faster than the
> FEL protocol implementation in the boot ROM on Allwinner devices.
> Using DFU instead of FEL improves the USB transfer speed from
> 500-900 KB/s to 3.2-3.7 MB/s. This is particularly useful for
> reducing the time needed for booting systems with large initrd
> images.
>
> FEL is still useful for loading the U-Boot bootloader and a boot
> script, which may then activate DFU in the following way:
>
>     setenv dfu_alt_info ${dfu_alt_info_ram}
>     dfu 0 ram 0
>     bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
>
> The rest of the files can be transferred to the device using the
> "dfu-util" tool.
>
> Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>

Thanks, I've applied this series to my tree, and it will be part
of the next pull-req.

Regards,

Hans


> ---
>   include/configs/sunxi-common.h | 30 +++++++++++++++++++++++++-----
>   1 file changed, 25 insertions(+), 5 deletions(-)
>
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index ddcfe94..38c0bc5 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -337,6 +337,7 @@ extern int soft_i2c_gpio_scl;
>   #define CONFIG_USB_GADGET_VBUS_DRAW	0
>
>   #define CONFIG_USB_GADGET_DOWNLOAD
> +#define CONFIG_USB_FUNCTION_DFU
>   #define CONFIG_USB_FUNCTION_FASTBOOT
>   #define CONFIG_USB_FUNCTION_MASS_STORAGE
>   #endif
> @@ -347,6 +348,11 @@ extern int soft_i2c_gpio_scl;
>   #define CONFIG_G_DNL_MANUFACTURER	"Allwinner Technology"
>   #endif
>
> +#ifdef CONFIG_USB_FUNCTION_DFU
> +#define CONFIG_CMD_DFU
> +#define CONFIG_DFU_RAM
> +#endif
> +
>   #ifdef CONFIG_USB_FUNCTION_FASTBOOT
>   #define CONFIG_CMD_FASTBOOT
>   #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR
> @@ -394,13 +400,26 @@ extern int soft_i2c_gpio_scl;
>    * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
>    * 1M script, 1M pxe and the ramdisk at the end.
>    */
> +
> +#define KERNEL_ADDR_R  __stringify(SDRAM_OFFSET(2000000))
> +#define FDT_ADDR_R     __stringify(SDRAM_OFFSET(3000000))
> +#define SCRIPT_ADDR_R  __stringify(SDRAM_OFFSET(3100000))
> +#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000))
> +#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000))
> +
>   #define MEM_LAYOUT_ENV_SETTINGS \
>   	"bootm_size=0xa000000\0" \
> -	"kernel_addr_r=" __stringify(SDRAM_OFFSET(2000000)) "\0" \
> -	"fdt_addr_r=" __stringify(SDRAM_OFFSET(3000000)) "\0" \
> -	"scriptaddr=" __stringify(SDRAM_OFFSET(3100000)) "\0" \
> -	"pxefile_addr_r=" __stringify(SDRAM_OFFSET(3200000)) "\0" \
> -	"ramdisk_addr_r=" __stringify(SDRAM_OFFSET(3300000)) "\0"
> +	"kernel_addr_r=" KERNEL_ADDR_R "\0" \
> +	"fdt_addr_r=" FDT_ADDR_R "\0" \
> +	"scriptaddr=" SCRIPT_ADDR_R "\0" \
> +	"pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
> +	"ramdisk_addr_r=" RAMDISK_ADDR_R "\0"
> +
> +#define DFU_ALT_INFO_RAM \
> +	"dfu_alt_info_ram=" \
> +	"kernel ram " KERNEL_ADDR_R " 0x1000000;" \
> +	"fdt ram " FDT_ADDR_R " 0x100000;" \
> +	"ramdisk ram " RAMDISK_ADDR_R " 0x4000000\0"
>
>   #ifdef CONFIG_MMC
>   #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
> @@ -482,6 +501,7 @@ extern int soft_i2c_gpio_scl;
>   #define CONFIG_EXTRA_ENV_SETTINGS \
>   	CONSOLE_ENV_SETTINGS \
>   	MEM_LAYOUT_ENV_SETTINGS \
> +	DFU_ALT_INFO_RAM \
>   	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
>   	"console=ttyS0,115200\0" \
>   	BOOTCMD_SUNXI_COMPAT \
>