July 2014 - U-Boot

[U-Boot] [PATCH] board_r: Add missing return to initr_doc
by Ian Campbell 24 Jul '14

24 Jul '14

I happened to spot this while working in the area. Signed-off-by: Ian Campbell <ijc(a)hellion.org.uk> Cc: Simon Glass <sjg(a)chromium.org> --- common/board_r.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/board_r.c b/common/board_r.c index 4479acb..427ee67 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -600,6 +600,7 @@ static int initr_doc(void) { puts("DOC: "); doc_init(); + return 0 } #endif -- 2.0.1

3 3

[U-Boot] dfu download issue with ci_udc
by S Durga Prasad Paladugu 24 Jul '14

24 Jul '14

Hi, I am trying to download the file from dfu-utilities(version 0.7) and using the ci_udc at device side. After all the data was sent from the host, the dfu utilities sent the zpl packet but at the device side the dfu_write is not getting invoked for zero packet length and hence causing the data not to be copied to actual interface(ram/mmc/nand). I pasted here the debug log for the zpl for reference. *handle setup CLEAR_FEATURE, 21, 1 index 0 value 3 length 0* *handle_setup: Set ep0 to OUT for Data Stage* *handle_setup: 0 length: flip ep0 dir for Status Stage* *flip_ep0_direction: Flipping ep0 to IN* *non-core control req21.01 v0003 i0000 l0* *w_value: 0x3 len: 0x0* *req_type: 0x20 ctrl->bRequest: 0x1 f_dfu->dfu_state: 0x5* *ept0 in pre-queue req 3f5284a8, buffer 3f528580* *ept0 in queue len 0, req 3f5284a8, buffer 3f528580* *ept0 in req 3f5284a8, complete 0* My question here is does any one has tested the dfu download using ci_udc and what could be reason for this behavior? Regards, DP

2 3

[U-Boot] [PATCH] arm: rmobile: Add register infomation of i2c for rcar
by Nobuhiro Iwamatsu 24 Jul '14

24 Jul '14

This move to to the rcar_i2c.h the register address of the i2c that is defined in board config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- arch/arm/include/asm/arch-rmobile/rcar_i2c.h | 29 ++++++++++++++++++++++++++++ drivers/i2c/rcar_i2c.c | 1 + include/configs/lager.h | 5 ----- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 arch/arm/include/asm/arch-rmobile/rcar_i2c.h diff --git a/arch/arm/include/asm/arch-rmobile/rcar_i2c.h b/arch/arm/include/asm/arch-rmobile/rcar_i2c.h new file mode 100644 index 0000000..763b91e --- /dev/null +++ b/arch/arm/include/asm/arch-rmobile/rcar_i2c.h @@ -0,0 +1,29 @@ +/* + * arch/arm/include/asm/arch-rmobile/rcar_i2c.h + * + * Copyright (C) 2014 Renesas Electronics Corporation + * Copyright (C) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> + * + * SPDX-License-Identifier: GPL-2.0 +*/ + +#ifndef __ASM_ARCH_RCAR_I2C_H +#define __ASM_ARCH_RCAR_I2C_H + +/* + * R-Car (R8A7790/R8A7791) I2C Addresses + */ +#define RCAR_I2C0_BASE 0xE6508000 +#define RCAR_I2C1_BASE 0xE6518000 +#define RCAR_I2C2_BASE 0xE6530000 +#define RCAR_I2C3_BASE 0xE6540000 +#define RCAR_I2C4_BASE 0xE6520000 +#define RCAR_I2C5_BASE 0xE6528000 + +#if defined(CONFIG_R8A7790) + #define RCAR_I2C_NUM_CONTROLLERS 4 +#elif defined(CONFIG_R8A7791) + #define RCAR_I2C_NUM_CONTROLLERS 6 +#endif + +#endif /* __ASM_ARCH_RCAR_I2C_H */ diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index 50cebd6..d624637 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -10,6 +10,7 @@ #include <common.h> #include <i2c.h> #include <asm/io.h> +#include <asm/arch/rca_i2c.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/include/configs/lager.h b/include/configs/lager.h index f39a788..d1ea79d 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -148,15 +148,10 @@ /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_RCAR -#define CONFIG_SYS_RCAR_I2C0_BASE 0xE6508000 #define CONFIG_SYS_RCAR_I2C0_SPEED 400000 -#define CONFIG_SYS_RCAR_I2C1_BASE 0xE6518000 #define CONFIG_SYS_RCAR_I2C1_SPEED 400000 -#define CONFIG_SYS_RCAR_I2C2_BASE 0xE6530000 #define CONFIG_SYS_RCAR_I2C2_SPEED 400000 -#define CONFIG_SYS_RCAR_I2C3_BASE 0xE6540000 #define CONFIG_SYS_RCAR_I2C3_SPEED 400000 -#define CONFIF_SYS_RCAR_I2C_NUM_CONTROLLERS 4 #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ -- 2.0.0

1 0

[U-Boot] [PATCH] Makefile: replace stat -c %s with wc
by Jeroen Hofstee 23 Jul '14

23 Jul '14

The binary_size_check target relies on stat -c %s to return the size of u-boot.bin. This only works with GNU stat though. Use wc instead. cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5277781..5d8e4ba 100644 --- a/Makefile +++ b/Makefile @@ -786,7 +786,7 @@ u-boot.hex u-boot.srec: u-boot FORCE OBJCOPYFLAGS_u-boot.bin := -O binary binary_size_check: u-boot.bin System.map FORCE - @file_size=`stat -c %s u-boot.bin` ; \ + @file_size=`wc -c u-boot.bin | awk '{print $$1}'` ; \ map_size=$(shell cat System.map | \ awk '/_image_copy_start/ {start = $$1} /_image_binary_end/ {end = $$1} END {if (start != "" && end != "") print "ibase=16; " toupper(end) " - " toupper(start)}' \ | bc); \ -- 1.9.1

2 2

[U-Boot] [PATCH] sunxi: use random parts of SID to set ethaddr
by Hans de Goede 23 Jul '14

23 Jul '14

From: Jonathan Liu <net147(a)gmail.com> Similar to the USB NIC found on OMAP5uEVM, PandaBoard and BeagleBoard-XM boards, the sunxi SoCs have a NIC onboard without an embedded MAC address. Just like the omap used on these boards, the sunxi SoCs do have a unique chip id, in the form of the 128 bit SID register: http://linux-sunxi.org/SID_Register_Guide So mimick the BeagleBoard-XM board code (commit 548a64d8) and use the chip id to generate a unique fixed MAC address. We check for the SID not being all 0, since some early A20 batches shipped without having there SID programmed. Note we use specific parts of the 128 bits, since some parts indicate the SoC family / revision, and thus are fixed. The algorithm for this was taken from the linux-sunxi.org kernels. Signed-off-by: Jonathan Liu <net147(a)gmail.com> [hdegoede(a)redhat.com: Expanded the commit message with some more info] Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/board.c | 28 ++++++++++++++++++++++++++++ include/configs/sunxi-common.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 8607eb3..2179e23 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -19,9 +19,12 @@ #include <axp209.h> #endif #include <asm/arch/clock.h> +#include <asm/arch/cpu.h> #include <asm/arch/dram.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> +#include <asm/io.h> +#include <net.h> DECLARE_GLOBAL_DATA_PTR; @@ -157,3 +160,28 @@ void sunxi_board_init(void) printf("Failed to set core voltage! Can't set CPU frequency\n"); } #endif + +#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{ + if (!getenv("ethaddr")) { + uint32_t reg_val = readl(SUNXI_SID_BASE); + + if (reg_val) { + uint8_t mac_addr[6]; + + mac_addr[0] = 0x02; /* Non OUI / registered MAC address */ + mac_addr[1] = (reg_val >> 0) & 0xff; + reg_val = readl(SUNXI_SID_BASE + 0x0c); + mac_addr[2] = (reg_val >> 24) & 0xff; + mac_addr[3] = (reg_val >> 16) & 0xff; + mac_addr[4] = (reg_val >> 8) & 0xff; + mac_addr[5] = (reg_val >> 0) & 0xff; + + eth_setenv_enetaddr("ethaddr", mac_addr); + } + } + + return 0; +} +#endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 4083388..13e72d5 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -207,6 +207,8 @@ #define CONFIG_ENV_IS_NOWHERE #endif +#define CONFIG_MISC_INIT_R + #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h> #endif -- 2.0.0

3 2

[U-Boot] [PATCH v2 0/5] sunxi: i2c and pmic support
by Hans de Goede 23 Jul '14

23 Jul '14

Hi Albert, Heiko, Here is v2 of my standalone i2c and pmic support for sunxi series. I think it would be best for this series to go upstream through the u-boot-arm tree, since most changes are sunxi specific. Note patch 5/5 is an unrelated sunxi bugfix for a bug I found while testing the i2c + pmic support. Changes since v1: -"mvtwsi: convert to CONFIG_SYS_I2C framework" Use CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE when instantiating the controller with the U_BOOT_I2C_ADAP_COMPLETE macro -Add Acked-by tags from Ian / Heiko / Prafulla to all patches Regards, Hans

3 13

[U-Boot] sunxi: Bug fixes, sun4i and sun5i support, pmic support and network improvements
by Hans de Goede 23 Jul '14

23 Jul '14

Hi All, Here is a patch series to be applied on top of Ian's recently merged series which added basic sun7i support. This patch series begins with a few bug fixes found while working on preparing the rest of the series, adds sun4i and sun5i support, pmic support (which is necessary to clock the CPU at its max speed), and rounds things of with some networking fixes / additions. Regards, Hans

3 38

[U-Boot] [PATCH v2] zynq: disable -Wstrict-prototypes option for ps7_init.c
by Masahiro Yamada 23 Jul '14

23 Jul '14

The files ps7_init.c and ps7_init.h are supposed to be generated by hw projects such as Vivado, PlanAhead and then to be copied into board/xilinx/zynq directory. But some prototypes in them cause annoying warning messages: CC spl/board/xilinx/zynq/ps7_init.o In file included from board/xilinx/zynq/ps7_init.c:50:0: board/xilinx/zynq/ps7_init.h:137:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.h:138:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.h:139:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.h:145:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12602:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12723:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12742:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12761:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] board/xilinx/zynq/ps7_init.c:12854:6: warning: function declaration isn't a prototype [-Wstrict-prototypes] The prototypes should be int ps7_init(void); int ps7_post_config(void); int ps7_debug(void); rather than int ps7_init(); int ps7_post_config(); int ps7_debug(); We do not want to be bothered because of automatically generated files. But we cannot touch the external projects for now. What we can do is to disable -Wstrict-prototypes for ps7_init.c Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Tested-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: No change in code. Some changes in git-log - Fix a typo: s/causes/cause/ - Add Tested-by credit board/xilinx/zynq/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index fd93f63..71c0c35 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -10,3 +10,6 @@ obj-y := board.o # Please copy ps7_init.c/h from hw project to this directory obj-$(CONFIG_SPL_BUILD) += \ $(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o) + +# Suppress "warning: function declaration isn't a prototype" +CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes -- 1.9.1

2 2

[U-Boot] [PATCH] ARM: zynq: Show ECC status on the same line as DRAM size
by Michal Simek 23 Jul '14

23 Jul '14

Without this patch is DRAM size one line below DRAM: which is not nice Origin: I2C: ready DRAM: ECC disabled 1 GiB Now running in RAM - U-Boot at: 3ff59000 MMC: zynq_sdhci: 0 Fixed by this patch: I2C: ready DRAM: ECC disabled 1 GiB Now running in RAM - U-Boot at: 3ff59000 MMC: zynq_sdhci: 0 Using default environment Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Based on http://patchwork.ozlabs.org/patch/347048/ --- arch/arm/cpu/armv7/zynq/ddrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/zynq/ddrc.c b/arch/arm/cpu/armv7/zynq/ddrc.c index e0ed3bfb4350..1ea086d52079 100644 --- a/arch/arm/cpu/armv7/zynq/ddrc.c +++ b/arch/arm/cpu/armv7/zynq/ddrc.c @@ -34,7 +34,7 @@ void zynq_ddrc_init(void) /* ECC is enabled when memory is in 16bit mode and it is enabled */ if ((ecctype == ZYNQ_DDRC_ECC_SCRUBREG_ECCMODE_SECDED) && (width == ZYNQ_DDRC_CTRLREG_BUSWIDTH_16BIT)) { - puts("Memory: ECC enabled\n"); + puts("ECC enabled "); /* * Clear the first 1MB because it is not initialized from * first stage bootloader. To get ECC to work all memory has @@ -42,6 +42,6 @@ void zynq_ddrc_init(void) */ memset((void *)0, 0, 1 * 1024 * 1024); } else { - puts("Memory: ECC disabled\n"); + puts("ECC disabled "); } } -- 1.8.2.3

3 2

[U-Boot] [PATCH v3 0/3] sunxi: AHCI support
by Ian Campbell 23 Jul '14

23 Jul '14

Hi Albert, I picked up the GPIO and Cubieboard2 bits of v2 into the sunxi PR which I just sent out[0]. What remains here in v3 is the generic AHCI changes and the sunxi driver itself which I have rebased onto u-boot-sunxi.git#master. Cheers, Ian. [0] http://lists.denx.de/pipermail/u-boot/2014-July/183993.html

5 16