October 2014 - U-Boot

[U-Boot] converting BeagleBone Black to use config_distro_bootcmd
by Vagrant Cascadian 03 Oct '14

03 Oct '14

I've been working on standardizing the u-boot builds in Debian, and one platform I've been working on moving over to config_distro_defaults is the BeagleBone Black... In doing so, it took some moderate modification of config_distro_defaults to allow changing some hard-coded values, and implementing support for importing uEnv.txt files, and supporting alternate boot partitions. I've worked on trying to keep the default behavior for the BeagleBone Black and other platforms that use am335x_evm.h relatively unchanged, though I don't really have the other platforms to test. Haven't yet figured out u-boot's patch submission guidelines, and while I tried to maintain the existing coding style, checkpatch.pl produces quite a few errors on the patchset. If someone would be willing to help me get the patchset into shape for proper submission, that would be great. For the moment, the patches are available here: http://cascadia.debian.net/~vagrant/bootcmd-am335x/ Thanks! live well, vagrant

2 1

[U-Boot] [PATCH] tegra20: tamonten: Fix the early gpio init
by Alban Bedel 02 Oct '14

02 Oct '14

To set gpio during the early init we now need to use tegra_spl_gpio_direction_output(), copied from seaboard. Change-Id: Id0aadb17a71b78e75e8c3f8de374102b3eab767b Signed-off-by: Alban Bedel <alban.bedel(a)avionic-design.de> --- board/avionic-design/common/tamonten.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index 9c86779..ea2425a 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -23,8 +23,10 @@ #ifdef CONFIG_BOARD_EARLY_INIT_F void gpio_early_init(void) { +#ifndef CONFIG_SPL_BUILD gpio_request(GPIO_PI4, NULL); - gpio_direction_output(GPIO_PI4, 1); +#endif + tegra_spl_gpio_direction_output(GPIO_PI4, 1); } #endif -- 2.1.1

3 7

[U-Boot] [U-boot] [Patch 0/5] keystone2: add network support for K2E SoC and EVM
by Ivan Khoronzhuk 02 Oct '14

02 Oct '14

These patches add network support for Keystne2 Edison SoC boards. Based on "[U-boot] [Patch 0/5] keystone_net: use MDIO bus and eth PHY frameworks" https://www.mail-archive.com/u-boot@lists.denx.de/msg148974.html Hao Zhang (1): board: k2e_evm: add network support Ivan Khoronzhuk (4): ARM: keystone2: keysonte_nav: add support for K2E SoC net: keystone_serdes: add keystone K2E SoC support net: keystone_net: add Keystone2 K2E SoC support net: keystone_net: increase PHY auto negotiate time arch/arm/include/asm/arch-keystone/hardware-k2e.h | 20 +++++++ board/ti/ks2_evm/board_k2e.c | 68 ++++++++++++++++++++++- drivers/net/keystone_net.c | 47 ++++++++++++++-- include/configs/k2e_evm.h | 10 ++++ include/configs/ks2_evm.h | 1 + 5 files changed, 140 insertions(+), 6 deletions(-) -- 1.8.3.2

1 5

[U-Boot] Call for participation in the U-Boot Mini Summit 2014
by Detlev Zundel 02 Oct '14

02 Oct '14

Hi, as already indicated, we are looking forward to our next U-Boot Mini Summit at Embedded Linux Conference Europe 2014 which will take place in Düsseldorf, Germany from October 13 - 15. The call for papers of the main conference is now open[1] and if you want to submit a talk for the main tracks, you should note the deadline of July 11. For our U-Boot Mini Summit, I'd like to get the schedule completed synchronized to the schedule release of the main event, which is August 12. So please submit talk proposals here with at least me on CC. To coordinate the event better, I have setup another wiki page[2] that can and _should_ be edited by the interested parties. Feel free for example to add yourself to the "interested participants" so that we get an idea of how many of the U-Boot developers will be there. Best wishes Detlev [1] http://events.linuxfoundation.org/events/embedded-linux-conference-europe/p… [2] http://www.denx.de/wiki/U-Boot/MiniSummitELCE2014 -- Blaming Snowden for causing problems for the US cloud industry is like blaming Al Gore for the global warming. -- Mikko Hypponen -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu(a)denx.de

13 27

[U-Boot] [PATCH v3 0/11] dm: imx: Add driver model support for GPIO and serial on cm_fx6
by Simon Glass 02 Oct '14

02 Oct '14

This series adjusts the IMX serial and GPIO drivers to support driver model. As an example of its use, the recently-added cm_fx6 board is converted over to driver model. Some minor driver model core changed are required to make this work and these are included with this series. Changes in v3: - Add a check for the Ethernet gpio_request() also - Add a comment for the CONFIG_SPL_BUILD #ifdef - Just warn when one of the board init stages fails - Use gpio_is_requested() in one more place Changes in v2: - Add an internal function to check if a GPIO is requested - Add new patch to add error checking to setup_i2c() - Add patch to display error number when an error occurs in initcall - Change 'reserved' to 'requested' - Check return values of gpio_request() - Tidy up confusing code that creates names for gpio_request() - Use the correct namespace for the platform data Simon Glass (11): dm: linker_lists: Add a way to declare multiple objects dm: core: Allow a list of devices to be declared in one step dm: core: Allow device_bind() to used without CONFIG_OF_CONTROL initcall: Display error number when an error occurs dm: serial: Don't require device tree to configure a console dm: serial: Put common code into separate functions imx: Add error checking to setup_i2c() dm: imx: Use gpio_request() to request GPIOs dm: imx: gpio: Support driver model in MXC gpio driver dm: imx: serial: Support driver model in the MXC serial driver dm: imx: Move cm_fx6 to use driver model for serial and GPIO arch/arm/imx-common/i2c-mxv7.c | 48 ++++- arch/arm/include/asm/imx-common/mxc_i2c.h | 4 +- board/compulab/cm_fx6/cm_fx6.c | 88 +++++++-- board/compulab/cm_fx6/common.c | 8 + drivers/core/device.c | 7 +- drivers/gpio/mxc_gpio.c | 304 +++++++++++++++++++++++++++++- drivers/serial/serial-uclass.c | 35 ++-- drivers/serial/serial_mxc.c | 170 ++++++++++++++--- include/configs/cm_fx6.h | 11 ++ include/dm/platdata.h | 4 + include/linker_lists.h | 21 +++ include/serial_mxc.h | 14 ++ lib/initcall.c | 8 +- 13 files changed, 657 insertions(+), 65 deletions(-) create mode 100644 include/serial_mxc.h -- 2.1.0.rc2.206.gedb03e5

4 25

[U-Boot] [U-boot] [Patch 0/5] keystone_net: use MDIO bus and eth PHY frameworks
by Ivan Khoronzhuk 02 Oct '14

02 Oct '14

This patch series optimize keystone_net driver to use MDIO bus and eht PHY frameworks. Based on "[U-boot] [Patch v2 0/5] keystone2: serdes: add seredes driver" https://www.mail-archive.com/u-boot@lists.denx.de/msg148694.html Ivan Khoronzhuk (5): net: phy: print a number of phy that is not found net: keystone_net: use mdio_reset function net: keystone_net: register MDIO bus net: keystone_net: register eth PHYs on MDIO bus net: keystone_net: use general get link function arch/arm/include/asm/ti-common/keystone_net.h | 1 + drivers/net/keystone_net.c | 166 +++++++++++--------------- drivers/net/phy/phy.c | 2 +- include/configs/ks2_evm.h | 3 +- 4 files changed, 76 insertions(+), 96 deletions(-) -- 1.8.3.2

1 5

[U-Boot] [PATCH] tegra20: display: Add support for flipped panels
by Alban Bedel 02 Oct '14

02 Oct '14

Add support for two new panel properties, flip-vertical and flip-horizontal. If set the display controller will be setup to correctly flip the image. Change-Id: I324b5d2b0b7ebbde7e08e5f32509cf101c057c84 Signed-off-by: Alban Bedel <alban.bedel(a)avionic-design.de> --- arch/arm/cpu/armv7/tegra20/display.c | 20 ++++++++++++++++++-- arch/arm/include/asm/arch-tegra20/display.h | 4 ++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/cpu/armv7/tegra20/display.c index fd77f3f..b332dd4 100644 --- a/arch/arm/cpu/armv7/tegra20/display.c +++ b/arch/arm/cpu/armv7/tegra20/display.c @@ -20,6 +20,7 @@ static void update_window(struct dc_ctlr *dc, struct disp_ctl_win *win) { unsigned h_dda, v_dda; unsigned long val; + unsigned x, y; val = readl(&dc->cmd.disp_win_header); val |= WINDOW_A_SELECT; @@ -58,11 +59,22 @@ static void update_window(struct dc_ctlr *dc, struct disp_ctl_win *win) val = WIN_ENABLE; if (win->bpp < 24) val |= COLOR_EXPAND; + if (win->flip_h) + val |= H_DIRECTION; + if (win->flip_v) + val |= V_DIRECTION; writel(val, &dc->win.win_opt); + x = win->x; + if (win->flip_h) + x += (win->w - 1) * (win->bpp / 8); + y = win->y; + if (win->flip_v) + y += win->h - 1; + writel((unsigned long)win->phys_addr, &dc->winbuf.start_addr); - writel(win->x, &dc->winbuf.addr_h_offset); - writel(win->y, &dc->winbuf.addr_v_offset); + writel(x, &dc->winbuf.addr_h_offset); + writel(y, &dc->winbuf.addr_v_offset); writel(0xff00, &dc->win.blend_nokey); writel(0xff00, &dc->win.blend_1win); @@ -204,6 +216,8 @@ int setup_window(struct disp_ctl_win *win, struct fdt_disp_config *config) win->out_y = 0; win->out_w = config->width; win->out_h = config->height; + win->flip_h = config->flip_h; + win->flip_v = config->flip_v; win->phys_addr = config->frame_buffer; win->stride = config->width * (1 << config->log2_bpp) / 8; debug("%s: depth = %d\n", __func__, config->log2_bpp); @@ -258,6 +272,8 @@ static int tegra_decode_panel(const void *blob, int node, config->width = fdtdec_get_int(blob, node, "xres", -1); config->height = fdtdec_get_int(blob, node, "yres", -1); + config->flip_h = fdtdec_get_bool(blob, node, "flip-horizontal"); + config->flip_v = fdtdec_get_bool(blob, node, "flip-vertical"); config->pixel_clock = fdtdec_get_int(blob, node, "clock", 0); if (!config->pixel_clock || config->width == -1 || config->height == -1) { diff --git a/arch/arm/include/asm/arch-tegra20/display.h b/arch/arm/include/asm/arch-tegra20/display.h index a04c84e..05c7bd5 100644 --- a/arch/arm/include/asm/arch-tegra20/display.h +++ b/arch/arm/include/asm/arch-tegra20/display.h @@ -25,6 +25,8 @@ struct disp_ctl_win { unsigned out_y; /* Top edge of output window (row) */ unsigned out_w; /* Width of output window in pixels */ unsigned out_h; /* Height of output window in pixels */ + unsigned flip_h; /* Horizontally flip the image */ + unsigned flip_v; /* Vertically flip the image */ }; #define FDT_LCD_TIMINGS 4 @@ -53,6 +55,8 @@ struct fdt_disp_config { int width; /* width in pixels */ int height; /* height in pixels */ int bpp; /* number of bits per pixel */ + unsigned flip_h; /* Horizontally flip the image */ + unsigned flip_v; /* Vertically flip the image */ /* * log2 of number of bpp, in general, unless it bpp is 24 in which -- 2.1.1

1 0

[U-Boot] Boot reason in SPL for OMAP4
by Gregoire Gentil 02 Oct '14

02 Oct '14

Hello, In TI x-loader, the boot reason is copied to a scratchpad 0x4A326000 as shown here: https://gitorious.org/x-loader/x-loader/source/HEAD:cpu/omap4/start.S#L102 How can I access the boot reason in u-boot or in the SPL? Grégoire

2 4

[U-Boot] [PATCH] mmc: Fix mmc bus width
by Mario Schuknecht 02 Oct '14

02 Oct '14

After setting the bus width, the extended CSD register is read. Some selected fields are compared with previously read extended CSD register fields. In this comparison the EXT_CSD_ERASE_GROUP_DEF field is compared. But this field is previously written under certain circumstances. And then the comparison fails. Only compare read-only fields. Therefore compare field EXT_CSD_HC_WP_GRP_SIZE instead of field EXT_CSD_ERASE_GROUP_DEF. Signed-off-by: Mario Schuknecht <mario.schuknecht(a)dresearch-fe.de> --- drivers/mmc/mmc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index a26f3ce..d1faa9f 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1127,10 +1127,11 @@ static int mmc_startup(struct mmc *mmc) mmc_set_bus_width(mmc, widths[idx]); err = mmc_send_ext_csd(mmc, test_csd); + /* Only compare read only fields */ if (!err && ext_csd[EXT_CSD_PARTITIONING_SUPPORT] \ == test_csd[EXT_CSD_PARTITIONING_SUPPORT] - && ext_csd[EXT_CSD_ERASE_GROUP_DEF] \ - == test_csd[EXT_CSD_ERASE_GROUP_DEF] \ + && ext_csd[EXT_CSD_HC_WP_GRP_SIZE] \ + == test_csd[EXT_CSD_HC_WP_GRP_SIZE] \ && ext_csd[EXT_CSD_REV] \ == test_csd[EXT_CSD_REV] && ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] \ -- 1.8.4.5

2 1

[U-Boot] [PATCH v2] mvebu_mmc: Driver addition
by Mario Schuknecht 02 Oct '14

02 Oct '14

In function mvebu_mmc_write notice command timeout. It is possible that a command is done, but a timeout occurred. Enable timeout in set bus function. Set window registers. Without that I could not use the driver on a Kirkwood 88F6282 SoC. Set high capacity and 52MHz driver feature. Signed-off-by: Mario Schuknecht <mario.schuknecht(a)dresearch-fe.de> --- Changes in v2: - Correct indentation - Remove unneeded parentheses - Use correct coding style for multi-line statements drivers/mmc/mvebu_mmc.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c index 9759198..d34e743 100644 --- a/drivers/mmc/mvebu_mmc.c +++ b/drivers/mmc/mvebu_mmc.c @@ -17,8 +17,12 @@ #include <asm/arch/kirkwood.h> #include <mvebu_mmc.h> +DECLARE_GLOBAL_DATA_PTR; + #define DRIVER_NAME "MVEBU_MMC" +#define MVEBU_TARGET_DRAM 0 + static void mvebu_mmc_write(u32 offs, u32 val) { writel(val, CONFIG_SYS_MMC_BASE + (offs)); @@ -164,6 +168,9 @@ static int mvebu_mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, return TIMEOUT; } } + if (mvebu_mmc_read(SDIO_ERR_INTR_STATUS) & + (SDIO_ERR_CMD_TIMEOUT | SDIO_ERR_DATA_TIMEOUT)) + return TIMEOUT; /* Handling response */ if (cmd->resp_type & MMC_RSP_136) { @@ -271,6 +278,7 @@ static void mvebu_mmc_set_bus(unsigned int bus) /* default to maximum timeout */ ctrl_reg |= SDIO_HOST_CTRL_TMOUT(SDIO_HOST_CTRL_TMOUT_MAX); + ctrl_reg |= SDIO_HOST_CTRL_TMOUT_EN; ctrl_reg |= SDIO_HOST_CTRL_PUSH_PULL_EN; @@ -296,6 +304,55 @@ static void mvebu_mmc_set_ios(struct mmc *mmc) mvebu_mmc_set_clk(mmc->clock); } +/* + * Set window register. + */ +static void mvebu_window_setup(void) +{ + int i; + + for (i = 0; i < 4; i++) { + mvebu_mmc_write(WINDOW_CTRL(i), 0); + mvebu_mmc_write(WINDOW_BASE(i), 0); + } + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { + u32 size, base, attrib; + + /* Enable DRAM bank */ + switch (i) { + case 0: + attrib = KWCPU_ATTR_DRAM_CS0; + break; + case 1: + attrib = KWCPU_ATTR_DRAM_CS1; + break; + case 2: + attrib = KWCPU_ATTR_DRAM_CS2; + break; + case 3: + attrib = KWCPU_ATTR_DRAM_CS3; + break; + default: + /* invalide bank, disable access */ + attrib = 0; + break; + } + + size = gd->bd->bi_dram[i].size; + base = gd->bd->bi_dram[i].start; + if (size && attrib) { + mvebu_mmc_write(WINDOW_CTRL(i), + MVCPU_WIN_CTRL_DATA(size, + MVEBU_TARGET_DRAM, + attrib, + MVCPU_WIN_ENABLE)); + } else { + mvebu_mmc_write(WINDOW_CTRL(i), MVCPU_WIN_DISABLE); + } + mvebu_mmc_write(WINDOW_BASE(i), base); + } +} + static int mvebu_mmc_initialize(struct mmc *mmc) { debug("%s: mvebu_mmc_initialize", DRIVER_NAME); @@ -322,6 +379,8 @@ static int mvebu_mmc_initialize(struct mmc *mmc) mvebu_mmc_write(SDIO_NOR_INTR_EN, 0); mvebu_mmc_write(SDIO_ERR_INTR_EN, 0); + mvebu_window_setup(); + /* SW reset */ mvebu_mmc_write(SDIO_SW_RESET, SDIO_SW_RESET_NOW); @@ -342,7 +401,8 @@ static struct mmc_config mvebu_mmc_cfg = { .f_min = MVEBU_MMC_BASE_FAST_CLOCK / MVEBU_MMC_BASE_DIV_MAX, .f_max = MVEBU_MMC_CLOCKRATE_MAX, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, - .host_caps = MMC_MODE_4BIT | MMC_MODE_HS, + .host_caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HC | + MMC_MODE_HS_52MHz, .part_type = PART_TYPE_DOS, .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, }; -- 1.8.4.5

3 3