December 2015 - U-Boot

[U-Boot] [RFC] board_f: generalize code for case of no relocation
by Alexey Brodkin 22 Dec '15

22 Dec '15

Current implementation of disabled relocation only works for EFI. In case of GD_FLG_SKIP_RELOC jump_to_copy() will return instead of jumping further in board_init_r() etc. And jump_to_copy() being the last call in init_sequence_f when returning simply triggers hang() in board_init_f(). Well for everything except ARM, SANDBOX and EFI_APP. Not sure why ARM and SANBOX are here - I would assume it's all on purpose but as for EFI_APP this is an essential need for getting out of board_init_f() and jumping in board_init_r() immediately afterwards, see efi_main(). But what if in case of no relocation we jump in board_init_r() right from jump_to_copy()? In that case we remove one ifdef from board_init_f() and leave a chance to seamlessly re-use disabled relocation for other (non-EFI) cases. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- Note I didn't test it for EFI because I don't know how to do that in simulation, please let me know if there's a simple way to do it. But I did test it for ARC boards (with additional patches) that enable disabled relocation - these patches to follow once something similar to my proposal here is implemented. common/board_f.c | 11 ++++++++--- lib/efi/efi_app.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index eac7c5e..2d60ed9 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -720,8 +720,14 @@ static int setup_reloc(void) static int jump_to_copy(void) { + /* + * In case of no relocation nothing to do between "running from flash" + * (init_f) and "running from ram" (init_r), so just jumping in + * board_init_r(). + */ if (gd->flags & GD_FLG_SKIP_RELOC) - return 0; + board_init_r((gd_t *)gd, gd->relocaddr); + /* * x86 is special, but in a nice way. It uses a trampoline which * enables the dcache if possible. @@ -1017,8 +1023,7 @@ void board_init_f(ulong boot_flags) if (initcall_run_list(init_sequence_f)) hang(); -#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ - !defined(CONFIG_EFI_APP) +#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) /* NOTREACHED - jump_to_copy() does not return */ hang(); #endif diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c index 452ab5d..5e41b7f 100644 --- a/lib/efi/efi_app.c +++ b/lib/efi/efi_app.c @@ -123,7 +123,7 @@ efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) printf("starting\n"); board_init_f(GD_FLG_SKIP_RELOC); - board_init_r(NULL, 0); + /* board_init_r() is called in the end of board_init_f() */ free_memory(priv); return EFI_SUCCESS; -- 2.4.3

3 5

[U-Boot] [PATCH] arm: novena: Fix EEPROM i2c configuration
by Marek Vasut 22 Dec '15

22 Dec '15

On Novena, the DRAM SPD is connected to i2c1 while the Utility EEPROM is connected to i2c3. Now that the EEPROM handling in U-Boot is fixed, also fix this bit on Novena. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Sean Cross <xobs(a)kosagi.com> Cc: Stefano Babic <sbabic(a)denx.de> --- include/configs/novena.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/novena.h b/include/configs/novena.h index d88389a..718989f 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -108,11 +108,12 @@ #define CONFIG_I2C_MULTI_BUS #define CONFIG_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_SPD_BUS_NUM 0 /* I2C EEPROM */ #ifdef CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_SPD_BUS_NUM 2 +#define CONFIG_SYS_I2C_EEPROM_BUS 2 #endif /* MMC Configs */ -- 2.1.4

1 1

[U-Boot] [PATCH] arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS
by Chin Liang See 22 Dec '15

22 Dec '15

Update the qspiboot console command to use UBIFS instead of old jffs2 file system. Signed-off-by: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> --- include/configs/socfpga_cyclone5_socdk.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -71,11 +71,9 @@ "load mmc 0:1 ${loadaddr} ${bootimage};" \ "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ "qspiload=sf probe; mtdparts default;run ubiload\0" \ - "qspiroot=/dev/mtdblock0\0" \ - "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${qspiroot} rw rootfstype=${qspirootfstype};"\ - "bootm ${loadaddr} - ${fdt_addr}\0" \ + " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ + "bootz ${loadaddr} - ${fdt_addr}\0" \ "ubiload=ubi part UBI; ubifsmount ubi0;" \ "ubifsload ${loadaddr} /boot/${bootimage};" \ "ubifsload ${fdt_addr} /boot/${fdtimage}\0" -- 1.9.2.468.g3f0c02a

2 4

[U-Boot] [PATCH] arm: socfpga: cyclone5_socdk: Enable qspiload console command
by Chin Liang See 22 Dec '15

22 Dec '15

Enabling qspiload command which will load the kernel image and dtb from UBIFS within MTD partition labeled UBI. Signed-off-by: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> --- include/configs/socfpga_cyclone5_socdk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 21b35d8..61450cb 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -70,6 +70,7 @@ "mmcload=mmc rescan;" \ "load mmc 0:1 ${loadaddr} ${bootimage};" \ "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ + "qspiload=sf probe; mtdparts default;run ubiload\0" \ "qspiroot=/dev/mtdblock0\0" \ "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ -- 1.9.2.468.g3f0c02a

2 3

[U-Boot] [PATCH v2] usb: dwc2: avoid out of bounds access
by Stefan Brüns 22 Dec '15

22 Dec '15

flush_dcache_range may access data after priv->aligned_buffer end if len > DWC2_DATA_BUF_SIZE. memcpy may access data after buffer end if done > 0 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Acked-by: Marek Vasut <marex(a)denx.de> Acked-by: Stephen Warren <swarren(a)wwwdotorg.org> --- v2: Added Acked-by: ... drivers/usb/host/dwc2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 541c0f9..5ef6deb 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -823,12 +823,13 @@ int chunk_msg(struct dwc2_priv *priv, struct usb_device *dev, (*pid << DWC2_HCTSIZ_PID_OFFSET), &hc_regs->hctsiz); - if (!in) { - memcpy(priv->aligned_buffer, (char *)buffer + done, len); + if (!in && xfer_len) { + memcpy(priv->aligned_buffer, (char *)buffer + done, + xfer_len); flush_dcache_range((unsigned long)priv->aligned_buffer, (unsigned long)((void *)priv->aligned_buffer + - roundup(len, ARCH_DMA_MINALIGN))); + roundup(xfer_len, ARCH_DMA_MINALIGN))); } writel(phys_to_bus((unsigned long)priv->aligned_buffer), -- 2.1.4

2 1

[U-Boot] [PATCH v2] usb: Alloc buffer for USB descriptor dynamically
by Stefan Brüns 22 Dec '15

22 Dec '15

The configuration descriptor includes all interface, endpoint and auxiliary descriptors (e.g. report, union) so 512 bytes may not be enough. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Reviewed-by: Marek Vasut <marex(a)denx.de> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- v2: add missing free() in error path common/usb.c | 42 ++++++++++++++++++++++++++++-------------- include/usb.h | 5 +++-- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/common/usb.c b/common/usb.c index 700bfc3..b177391 100644 --- a/common/usb.c +++ b/common/usb.c @@ -566,13 +566,12 @@ static int usb_get_descriptor(struct usb_device *dev, unsigned char type, } /********************************************************************** - * gets configuration cfgno and store it in the buffer + * gets len of configuration cfgno */ -int usb_get_configuration_no(struct usb_device *dev, - unsigned char *buffer, int cfgno) +int usb_get_configuration_len(struct usb_device *dev, int cfgno) { int result; - unsigned int length; + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, 9); struct usb_config_descriptor *config; config = (struct usb_config_descriptor *)&buffer[0]; @@ -586,17 +585,23 @@ int usb_get_configuration_no(struct usb_device *dev, "(expected %i, got %i)\n", 9, result); return -EIO; } - length = le16_to_cpu(config->wTotalLength); + return le16_to_cpu(config->wTotalLength); +} - if (length > USB_BUFSIZ) { - printf("%s: failed to get descriptor - too long: %d\n", - __func__, length); - return -EIO; - } +/********************************************************************** + * gets configuration cfgno and store it in the buffer + */ +int usb_get_configuration_no(struct usb_device *dev, int cfgno, + unsigned char *buffer, int length) +{ + int result; + struct usb_config_descriptor *config; + config = (struct usb_config_descriptor *)&buffer[0]; result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, length); - debug("get_conf_no %d Result %d, wLength %d\n", cfgno, result, length); - config->wTotalLength = length; /* validated, with CPU byte order */ + debug("get_conf_no %d Result %d, wLength %d\n", cfgno, result, + le16_to_cpu(config->wTotalLength)); + config->wTotalLength = result; /* validated, with CPU byte order */ return result; } @@ -1070,7 +1075,7 @@ static int usb_prepare_device(struct usb_device *dev, int addr, bool do_read, int usb_select_config(struct usb_device *dev) { - ALLOC_CACHE_ALIGN_BUFFER(unsigned char, tmpbuf, USB_BUFSIZ); + unsigned char *tmpbuf = 0; int err; err = get_descriptor_len(dev, USB_DT_DEVICE_SIZE, USB_DT_DEVICE_SIZE); @@ -1084,14 +1089,23 @@ int usb_select_config(struct usb_device *dev) le16_to_cpus(&dev->descriptor.bcdDevice); /* only support for one config for now */ - err = usb_get_configuration_no(dev, tmpbuf, 0); + err = usb_get_configuration_len(dev, 0); + if (err >= 0) { + tmpbuf = (unsigned char *)malloc_cache_aligned(err); + if (!tmpbuf) + err = -ENOMEM; + else + err = usb_get_configuration_no(dev, 0, tmpbuf, err); + } if (err < 0) { printf("usb_new_device: Cannot read configuration, " \ "skipping device %04x:%04x\n", dev->descriptor.idVendor, dev->descriptor.idProduct); + free(tmpbuf); return err; } usb_parse_config(dev, tmpbuf, 0); + free(tmpbuf); usb_set_maxpacket(dev); /* * we set the default configuration here diff --git a/include/usb.h b/include/usb.h index 55b9268..198ecbc 100644 --- a/include/usb.h +++ b/include/usb.h @@ -266,8 +266,9 @@ int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int transfer_len, int interval); int usb_disable_asynch(int disable); int usb_maxpacket(struct usb_device *dev, unsigned long pipe); -int usb_get_configuration_no(struct usb_device *dev, unsigned char *buffer, - int cfgno); +int usb_get_configuration_no(struct usb_device *dev, int cfgno, + unsigned char *buffer, int length); +int usb_get_configuration_len(struct usb_device *dev, int cfgno); int usb_get_report(struct usb_device *dev, int ifnum, unsigned char type, unsigned char id, void *buf, int size); int usb_get_class_descriptor(struct usb_device *dev, int ifnum, -- 2.1.4

2 1

[U-Boot] [PATCH] arm: socfpga: Enable ubiload console command
by Chin Liang See 22 Dec '15

22 Dec '15

Enabling ubiload command to load kernel image and device tree from mtd part labeled "UBI". ubiload command will search the file from folder /boot. Signed-off-by: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> --- include/configs/socfpga_cyclone5_socdk.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 3c2e2ae..21b35d8 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -74,7 +74,10 @@ "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ " root=${qspiroot} rw rootfstype=${qspirootfstype};"\ - "bootm ${loadaddr} - ${fdt_addr}\0" + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "ubiload=ubi part UBI; ubifsmount ubi0;" \ + "ubifsload ${loadaddr} /boot/${bootimage};" \ + "ubifsload ${fdt_addr} /boot/${fdtimage}\0" /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> -- 1.9.2.468.g3f0c02a

2 2

[U-Boot] [PATCH] arm: socfpga: Enable ubi and ubifs support
by Chin Liang See 22 Dec '15

22 Dec '15

When QSPI and NAND is enabled, the ubi and ubifs support will be enabled too. Signed-off-by: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> --- include/configs/socfpga_common.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index f7c0eb5..7c50100 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -300,6 +300,15 @@ unsigned int cm_get_qspi_controller_clk_hz(void); "-@1536k(UBI)\0" #endif +/* UBI and UBIFS support */ +#if defined(CONFIG_CMD_SF) || defined(CONFIG_CMD_NAND) +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#define CONFIG_RBTREE +#define CONFIG_LZO +#undef CONFIG_SPI_FLASH_USE_4K_SECTORS +#endif + /* * SPL * -- 1.9.2.468.g3f0c02a

2 2

[U-Boot] [PATCH v2 0/8] Add support for Synology DS414 and some related fixes
by Phil Sutter 22 Dec '15

22 Dec '15

This is version 2 of my patch series to support Synology DS414 NAS after rebasing it onto mvebu-dm-spl-2015-12-14 branch of u-boot-a38x.git. Due to this, some things became unnecessary or could be solved differently. In addition to that, static env settings have been added. In detail: * Dropped patch 2, already fixed upstream. * Dropped patch 7, board IDs now start at 1. * Dropped patch 8, ECC is now selectable from board headers. * Changed patch 9: * Use switch() statement in mvebu_soc_family(). * Move changes to ctrl_model_get() here from DS414 support patch since it belongs to SoC support. * Changed patch 10: * Added U-Boot specific things to DT file. * Static env settings added. * Updated ds414_defconfig and ds414.h to incorporate changes done for other Armada XP boards as well. * Fixed comment in ds414.h. * Added partition types and VFAT support to ds414.h. The new summary is as follows: * Patches 1, 2 and 4 fix various files for enabled debugging. * Patch 3 updates the board porting guide in README file. * Patch 5 holds a crucial pci_mvebu fix necessary for DS414 support. * Patches 6 and 7 contain the actual board support, split into a generic part for MV78230 SoC and a board specific part for clarity. * Patch 8 adds a new command to deal with Synology specialties. In case you would like me to split this into multiple series, just let me know and I will resend. Phil Sutter (8): drivers/pci: Fix for debug builds without CONFIG_PCI_ENUM_ONLY mvebu: Fix for non-DM ehci-marvell support README: Review the u-boot porting guide list axp: Fix debugging support in DDR3 write leveling drivers/pci/pci_mvebu: Fix for boards with X4 lanes mvebu: Add rudimental MV78320 support mvebu: Support Synology DS414 common: Implement Synology specific command set README | 11 +- arch/arm/Kconfig | 1 + arch/arm/dts/Makefile | 2 + arch/arm/dts/armada-xp-synology-ds414.dts | 337 +++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 3 + arch/arm/mach-mvebu/cpu.c | 37 ++- arch/arm/mach-mvebu/include/mach/cpu.h | 3 + arch/arm/mach-mvebu/include/mach/soc.h | 10 +- arch/arm/mach-mvebu/serdes/axp/board_env_spec.h | 5 +- .../arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 9 +- board/Synology/ds414/Kconfig | 12 + board/Synology/ds414/Makefile | 1 + board/Synology/ds414/ds414.c | 173 +++++++++++ board/Synology/ds414/kwbimage.cfg | 12 + common/Makefile | 1 + common/cmd_syno.c | 225 ++++++++++++++ configs/ds414_defconfig | 18 ++ drivers/ddr/marvell/axp/ddr3_write_leveling.c | 4 +- drivers/pci/pci_auto_old.c | 2 +- drivers/pci/pci_mvebu.c | 21 ++ include/configs/ds414.h | 165 ++++++++++ 21 files changed, 1033 insertions(+), 19 deletions(-) create mode 100644 arch/arm/dts/armada-xp-synology-ds414.dts create mode 100644 board/Synology/ds414/Kconfig create mode 100644 board/Synology/ds414/Makefile create mode 100644 board/Synology/ds414/ds414.c create mode 100644 board/Synology/ds414/kwbimage.cfg create mode 100644 common/cmd_syno.c create mode 100644 configs/ds414_defconfig create mode 100644 include/configs/ds414.h -- 2.5.3

1 0

[U-Boot] [U-boot] Pull arc changes
by Alexey Brodkin 22 Dec '15

22 Dec '15

Hi Tom, The following changes since commit 3721208fa7fdb2af6ac13300d5d81433742c6ba1: x86: Remove Graeme Russ from the git alias file (2015-12-21 09:37:46 -0500) are available in the git repository at: git://git.denx.de/u-boot-arc.git for you to fetch changes up to d0602bd4675c4f49e455b3b7a4aebb9a01287d43: axs103: add support of generic OHCI USB 1.1 controller (2015-12-21 23:29:04 +0300) ---------------------------------------------------------------- Alexey Brodkin (1): axs103: add support of generic OHCI USB 1.1 controller arch/arc/dts/axs10x.dts | 6 ++++++ configs/axs103_defconfig | 3 +-- include/configs/axs101.h | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) Regards, Alexey

2 1