October 2014 - U-Boot

[U-Boot] [PATCH 0/3] ARM: sunxi: Fix reset support on sun6i/sun8i
by Chen-Yu Tsai 21 Oct '14

21 Oct '14

Hi, This series fixes support for the reset command on sun6i/sun8i. The watchdog hardware has changed in sun6i, both the register addresses and definitions. This makes the reset command unusable on sun6i. Patch 1 moves the watchdog register definitions into a separate file. The rationale behind this is that on sun6i, the watchdog is effectively a separate piece of hardware and not part of the timer. Patch 2 fixes the register definitions for sun6i, most importantly the watchdog offsets. Patch 3 adds the sun6i version of reset via watchdog timeout. I intended to submit this series after the basic sun8i series. It just so happens that I forgot to leave my A23 tablet on at the office, hence I won't be able to test that series until next week. Since this series has no dependencies nor conflicts, I decided to send this one first. Cheers ChenYu Chen-Yu Tsai (3): ARM: sunxi: Move watchdog register definitions to separate file ARM: sunxi: Add sun6i/sun8i timer block register definition ARM: sunxi: Fix reset command on sun6i/sun8i arch/arm/cpu/armv7/sunxi/board.c | 15 ++++++++++ arch/arm/include/asm/arch-sunxi/timer.h | 23 ++++++---------- arch/arm/include/asm/arch-sunxi/watchdog.h | 44 ++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/watchdog.h -- 2.1.1

3 11

[U-Boot] [PATCH] mmc: tegra: handle error returned from bounce_buffer_start
by Michael Scott 21 Oct '14

21 Oct '14

Function bounce_buffer_start can return ENOMEM when memalign fails, but the error code is never checked. One such failure happens when state->len_aligned is larger than the remaining free memory (set via CONFIG_SYS_MALLOC_LEN). This leaves state->bounce_buffer as a NULL. If unchecked, the tegra_mmc driver writes the entire block as a 0xFF and will continue on its way. Let's handle this error by printing that it happened, and then return it up the chain. This bug was discoverd during fastboot flashing of sparse images. A pointer is moved through buffered data and often needs to be DMA aligned prior to MMC write. These blocks are are often more than 4mb which is the default Tegra setting for CONFIG_SYS_MALLOC_LEN. Signed-off-by: Michael Scott <michael.scott(a)linaro.org> Cc: Tom Warren <twarren(a)nvidia.com> Cc: Stephen Warren <swarren(a)nvidia.com> --- drivers/mmc/tegra_mmc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index ca9c4aa..5ecc2c9 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -332,7 +332,13 @@ static int tegra_mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } len = data->blocks * data->blocksize; - bounce_buffer_start(&bbstate, buf, len, bbflags); + ret = bounce_buffer_start(&bbstate, buf, len, bbflags); + if (ret) { + printf("%s: bounce_buffer_start failed with error %d " + "(buf = %p, len = %u, flags = %u)\n", + __func__, ret, buf, len, bbflags); + return ret; + } } ret = mmc_send_cmd_bounced(mmc, cmd, data, &bbstate); -- 1.9.1

1 0

[U-Boot] Hi Simon, There may exist a problem about FIT image signature verify , can you check this problem?
by Duxiaoqiang 21 Oct '14

21 Oct '14

Hi Simon & All These days I tested verified U-Boot on ARM Foundation. And I found a problem when I tested like this: 1) Generate a FIT image and signature blob file like: mkimage -D "-I dts -O dtb -p 2000" -F kernel.its -k keys -K fvp.dtb -r signed_image.fit 2) Compile the Uboot like : Step1: Make distclean Step2: Make DEVICE_TREE=foundation all. After this step, there generated a u-boot-dtb.bin file, but public key was not contained in it. Normally I should use the public key contained blob file fvp.dtb to compile Uoobt like: make EXT_DTB=<path>/fvp.dtb. In my test case, I omitted the last step, and just choose step2's result to test. 3) Package firmware together with uboot 4) Boot system on Foundation For the signed_image.fit contains the signature information, but U-Boot has no public key information contained, When U-boot load the image, There occurred error information like ": No signature node found: ", this result was normal. But the system wasn't stopped after this error information, it keep going on and boot the system success at last! I checked the source code about UBoot, and found problem in function fit_config_verify_required_sigs Please note the red part. int fit_config_verify_required_sigs(const void *fit, int conf_noffset, const void *sig_blob) { int noffset; int sig_node; /* Work out what we need to verify */ sig_node = fdt_subnode_offset(sig_blob, 0, FIT_SIG_NODENAME); if (sig_node < 0) { debug("%s: No signature node found: %s\n", __func__, fdt_strerror(sig_node)); return 0; --> Since mismatch exists between UBoot and images, system should return a error code. Return 0 means the result was ok. } ......... After I modified return0 to return -1, result seems ok. Please check this problem, and confirm should I have to commit a patch or someone else will modify it. Sincerely. Jason

2 1

[U-Boot] [PATCH v3 1/3] net: Add a command to manipulate ethernet devices
by Alban Bedel 21 Oct '14

21 Oct '14

Add the 'eth' command for operations on ethernet devices. This first version only contains a command to show a device properties, currently only name, index and MAC address. Signed-off-by: Alban Bedel <alban.bedel(a)avionic-design.de> --- v1: * Patch didn't exists v2: * Patch didn't exists v3: * Replace the dedicated 'eth_eeprom' command with a subcommand to the 'eth' command --- common/cmd_net.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/common/cmd_net.c b/common/cmd_net.c index 09489d4..9cc0bdf 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -445,3 +445,51 @@ U_BOOT_CMD( ); #endif /* CONFIG_CMD_LINK_LOCAL */ + +static int do_eth_show(struct eth_device *dev, + int argc, char * const argv[]) +{ + printf("Name : %s\n", dev->name); + printf("Index: %d\n", dev->index); + printf("MAC : %pM\n", dev->enetaddr); + return 0; +} + +static int do_eth(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + struct eth_device *dev; + char *endp = NULL; + int index; + + if (argc < 3) + return CMD_RET_USAGE; + + /* Get the ethernet device, by ID or by name */ + index = (int) simple_strtoul(argv[1], &endp, 16); + if (endp > argv[1]) + dev = eth_get_dev_by_index(index); + else + dev = eth_get_dev_by_name(argv[2]); + + if (!dev) { + printf("Ethernet device not found\n"); + return CMD_RET_FAILURE; + } + + if (!strcmp(argv[2], "show")) + return do_eth_show(dev, argc - 2, argv + 2); + + printf("Unknown eth sub command: %s\n", argv[2]); + + return CMD_RET_USAGE; +} + +U_BOOT_CMD( + eth, 7, 0, do_eth, + "extended ops for ethernet devices", + "<dev> <command> [<args>...]\n" + " - run command on a device, device may be a name or id.\n" + "\n" + "eth <dev> show\n" + " - show basic information about the ethernet device\n" +); -- 2.1.1

4 10

[U-Boot] [PATCH] fix get_ram_size memory corruption
by Gerd Hoffmann 21 Oct '14

21 Oct '14

base[0] is saved, but never restored. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- common/memsize.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/memsize.c b/common/memsize.c index 589400d..8bda2ba 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -48,7 +48,9 @@ long get_ram_size(long *base, long maxsize) *addr = 0; sync (); - if ((val = *addr) != 0) { + val = *addr; + *addr = save[i]; + if ((val = 0) != 0) { /* Restore the original data before leaving the function. */ sync (); -- 1.8.3.1

2 8

[U-Boot] [PATCH 1/2] mx6qsabreauto: Add HDMI support
by Fabio Estevam 21 Oct '14

21 Oct '14

Let HDMI splash screen support work by default. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 60 ++++++++++++++++++++++++++- include/configs/mx6qsabreauto.h | 17 ++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index dd6d2a6..6e9b4d8 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -23,6 +23,9 @@ #include <netdev.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <asm/arch/mxc_hdmi.h> +#include <asm/imx-common/video.h> +#include <asm/arch/crm_regs.h> DECLARE_GLOBAL_DATA_PTR; @@ -234,10 +237,65 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | rev; } +#if defined(CONFIG_VIDEO_IPUV3) +static void do_enable_hdmi(struct display_info_t const *dev) +{ + imx_enable_hdmi_phy(); +} + +struct display_info_t const displays[] = {{ + .bus = -1, + .addr = 0, + .pixfmt = IPU_PIX_FMT_RGB24, + .detect = detect_hdmi, + .enable = do_enable_hdmi, + .mode = { + .name = "HDMI", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED, +} } }; +size_t display_count = ARRAY_SIZE(displays); + +static void setup_display(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + int reg; + + enable_ipu_clock(); + imx_setup_hdmi(); + + reg = readl(&mxc_ccm->chsccdr); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET); + writel(reg, &mxc_ccm->chsccdr); +} +#endif /* CONFIG_VIDEO_IPUV3 */ + +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int board_early_init_f(void) { setup_iomux_uart(); - +#ifdef CONFIG_VIDEO_IPUV3 + setup_display(); +#endif return 0; } diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 0ab3127..48fec6f 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -45,4 +45,21 @@ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 +/* Framebuffer */ +#define CONFIG_VIDEO +#define CONFIG_VIDEO_IPUV3 +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_LOGO +#define CONFIG_IPUV3_CLK 260000000 +#define CONFIG_IMX_HDMI +#define CONFIG_IMX_VIDEO_SKIP + #endif /* __MX6QSABREAUTO_CONFIG_H */ -- 1.9.1

2 3

[U-Boot] [PATCH] ot1200: remove superfluous "string" tag
by Christian Gmeiner 21 Oct '14

21 Oct '14

Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- board/bachmann/ot1200/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board/bachmann/ot1200/Kconfig b/board/bachmann/ot1200/Kconfig index 55a825d..6cf2573 100644 --- a/board/bachmann/ot1200/Kconfig +++ b/board/bachmann/ot1200/Kconfig @@ -1,23 +1,18 @@ if TARGET_OT1200 config SYS_CPU - string default "armv7" config SYS_BOARD - string default "ot1200" config SYS_VENDOR - string default "bachmann" config SYS_SOC - string default "mx6" config SYS_CONFIG_NAME - string default "ot1200" endif -- 1.9.3

3 2

Re: [U-Boot] [PATCH] arm: tegra: use architecture specific memcpy
by Marcel Ziswiler 21 Oct '14

21 Oct '14

On Mon, 2014-10-20 at 15:40 +0000, Tom Warren wrote: > Sorry, Marcel. Must have missed it. I'll rebase u-boot-tegra/master against ARM master and apply this, and if no other Tegra patches are pending, I'll send a PR later this week. Thanks, Tom. According to my notes the following 10 patches are still pending: [PATCH] arm: tegra: use architecture specific memcpy Tested-by: Stephen Warren <swarren(a)nvidia.com> [PATCH v2] ARM: tegra: Use mem size from MC in combination with get_ram_size() Acked-by: Stephen Warren <swarren(a)nvidia.com> [PATCH] tegra: colibri_t30: clean-up spurious new line Acked-by: Simon Glass <sjg(a)chromium.org> [PATCH] tegra: gpio: fix null label regression Acked-by: Simon Glass <sjg(a)chromium.org> [PATCH] tegra: apalis_t30: master revamp [PATCH] tegra: dts: colibri_t30 add serial port details [PATCH] tegra: clean-up useless define Acked-by: Simon Glass <sjg(a)chromium.org> [PATCH] gpio: header file comment spelling fixes Acked-by: Simon Glass <sjg(a)chromium.org> [PATCH] tegra: colibri_t30: asix usb ethernet reset regression Acked-by: Simon Glass <sjg(a)chromium.org> [PATCH] mmc: Tegra: Fix timeout issue seen on certain eMMC parts Are you OK with those or should I resend any of them? BTW: Maybe acknowledging patch emails with applied messages like some other maintainers do would ease the tracking of an individual patch's status.

1 0

[U-Boot] dm: Should U-Boot driver model abandon platform data?
by Simon Glass 21 Oct '14

21 Oct '14

Hi, This question came up at the U-Boot mini-summit yesterday and I was tasked with starting a thread on the mailing list. There seemed to be a strong feeling in the room that permitting platform data in driver model is a mistake. Reasons mentioned were: - device tree is how things are done in Linux at least for most platforms we support - we can therefore import this directly in from Linux rather than writing new platform data - platform data is considered 'legacy' and we should not support legacy features in a new framework - device tree permits fully abstracting the device data from the code, avoiding #ifdefs - it is easier to change settings in device tree than in platform data The main impact is that all boards would need at least some sort of device tree when they move to driver model. There is also the question of SPL, where we are sometimes space-constrained. If we go with this policy I wonder if we should permit an exception for things required by SPL for now? Typically in SPL for these space-constrained platforms we only need a few devices so we could provide platform data for SPL while still using device tree in U-Boot It would be possible to enable device tree in SPL for many platforms but that feels like something that should not block progress. So perhaps platform data in SPL should be a separate question. Please have a think about this and reply on this thread. Regards, Simon

4 3

[U-Boot] compile issue with U-boot-2014.10-rc2 & Cubieboard
by Tom Everett 21 Oct '14

21 Oct '14

I am getting this compile error: scripts/Makefile.build:55: /tank/home/tom/freebsd/uboot/u-boot-2014.10-rc2/board/amd/sunxi/Makefile: No such file or directory gmake[1]: *** No rule to make target `/tank/home/tom/freebsd/uboot/u-boot-2014.10-rc2/board/amd/sunxi/Makefile'. Stop. It appears that the dir "/board/amd/sunxi" does not exist. It should be "/board/sunxi". -- A better world shall emerge based on faith and understanding - Douglas MacArthur

3 4