January 2013 - U-Boot

[U-Boot] [PATCH] Make patman usable outside of u-boot tree
by Vadim Bendebury 09 Jan '13

09 Jan '13

To make it usable in git trees not providing a patch checker implementation, add a command line option, allowing to suippress patch check. While we are at it, sort debug options alphabetically. . unit test passes: $ ./patman -t <unittest.result.TestResult run=7 errors=0 failures=0> . successfully used patman in the autotest tree to generate a patch email (with --no-check option) . successfully used patman in the u-boot tree to generate a patch email . `patman --help' now shows command line options ordered alphabetically Signed-off-by: Vadim Bendebury <vbendeb(a)chromium.org> --- tools/patman/patman.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/patman/patman.py b/tools/patman/patman.py index e56dd01..6620a48 100755 --- a/tools/patman/patman.py +++ b/tools/patman/patman.py @@ -50,6 +50,9 @@ parser.add_option('-i', '--ignore-errors', action='store_true', help='Send patches email even if patch errors are found') parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run', default=False, help="Do a try run (create but don't email patches)") +parser.add_option('-p', '--project', default=project.DetectProject(), + help="Project name; affects default option values and " + "aliases [default: %default]") parser.add_option('-s', '--start', dest='start', type='int', default=0, help='Commit to start creating patches from (0 = HEAD)') parser.add_option('-t', '--test', action='store_true', dest='test', @@ -58,11 +61,11 @@ parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='Verbose output of errors and warnings') parser.add_option('--cc-cmd', dest='cc_cmd', type='string', action='store', default=None, help='Output cc list for patch file (used by git)') +parser.add_option('--no-check', action='store_true', dest='no_check', + default=False, + help="Don't check for patch compliance") parser.add_option('--no-tags', action='store_false', dest='process_tags', default=True, help="Don't process subject tags as aliaes") -parser.add_option('-p', '--project', default=project.DetectProject(), - help="Project name; affects default option values and " - "aliases [default: %default]") parser.usage = """patman [options] @@ -146,7 +149,10 @@ else: series.DoChecks() # Check the patches, and run them through 'git am' just to be sure - ok = checkpatch.CheckPatches(options.verbose, args) + if options.no_check: + ok = True + else: + ok = checkpatch.CheckPatches(options.verbose, args) if not gitutil.ApplyPatches(options.verbose, args, options.count + options.start): ok = False -- 1.7.7.3

2 1

[U-Boot] [PATCH] tegra: remove IRDA pinmux synonym
by Allen Martin 09 Jan '13

09 Jan '13

IRDA is a synonym for UARTB in tegra pinmux, remove all usage of this synonym and replace with UARTB to disambiguate. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- arch/arm/cpu/tegra-common/board.c | 2 +- arch/arm/cpu/tegra20-common/funcmux.c | 4 ++-- arch/arm/cpu/tegra20-common/pinmux.c | 2 +- arch/arm/include/asm/arch-tegra20/funcmux.h | 2 +- arch/arm/include/asm/arch-tegra20/pinmux.h | 1 - arch/arm/include/asm/arch-tegra30/pinmux.h | 1 - board/nvidia/cardhu/pinmux-config-cardhu.h | 4 ++-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/cpu/tegra-common/board.c index af1879c..1ec6c06 100644 --- a/arch/arm/cpu/tegra-common/board.c +++ b/arch/arm/cpu/tegra-common/board.c @@ -113,7 +113,7 @@ static int uart_configs[] = { #else FUNCMUX_UART1_IRRX_IRTX, #endif - FUNCMUX_UART2_IRDA, + FUNCMUX_UART2_UARTB, -1, FUNCMUX_UART4_GMC, -1, diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/cpu/tegra20-common/funcmux.c index ece7ad9..a1c55a6 100644 --- a/arch/arm/cpu/tegra20-common/funcmux.c +++ b/arch/arm/cpu/tegra20-common/funcmux.c @@ -98,8 +98,8 @@ int funcmux_select(enum periph_id id, int config) break; case PERIPH_ID_UART2: - if (config == FUNCMUX_UART2_IRDA) { - pinmux_set_func(PINGRP_UAD, PMUX_FUNC_IRDA); + if (config == FUNCMUX_UART2_UARTB) { + pinmux_set_func(PINGRP_UAD, PMUX_FUNC_UARTB); pinmux_tristate_disable(PINGRP_UAD); } break; diff --git a/arch/arm/cpu/tegra20-common/pinmux.c b/arch/arm/cpu/tegra20-common/pinmux.c index a2a0916..5ad2121 100644 --- a/arch/arm/cpu/tegra20-common/pinmux.c +++ b/arch/arm/cpu/tegra20-common/pinmux.c @@ -390,7 +390,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { PIN(UAA, BB, SPI3, MIPI_HS, UARTA, ULPI, MIPI_HS), PIN(UAB, BB, SPI2, MIPI_HS, UARTA, ULPI, MIPI_HS), PIN(UAC, BB, OWR, RSVD, RSVD, RSVD, RSVD4), - PIN(UAD, UART, IRDA, SPDIF, UARTA, SPI4, SPDIF), + PIN(UAD, UART, UARTB, SPDIF, UARTA, SPI4, SPDIF), PIN(UCA, UART, UARTC, RSVD, GMI, RSVD, RSVD4), PIN(UCB, UART, UARTC, PWM, GMI, RSVD, RSVD4), diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h index 1bac25e..963f021 100644 --- a/arch/arm/include/asm/arch-tegra20/funcmux.h +++ b/arch/arm/include/asm/arch-tegra20/funcmux.h @@ -35,7 +35,7 @@ enum { FUNCMUX_UART1_UAA_UAB, FUNCMUX_UART1_GPU, FUNCMUX_UART1_SDIO1, - FUNCMUX_UART2_IRDA = 0, + FUNCMUX_UART2_UARTB = 0, FUNCMUX_UART4_GMC = 0, /* I2C configs */ diff --git a/arch/arm/include/asm/arch-tegra20/pinmux.h b/arch/arm/include/asm/arch-tegra20/pinmux.h index 797e158..a9b4eda 100644 --- a/arch/arm/include/asm/arch-tegra20/pinmux.h +++ b/arch/arm/include/asm/arch-tegra20/pinmux.h @@ -204,7 +204,6 @@ enum pmux_func { PMUX_FUNC_I2C2, PMUX_FUNC_I2C3, PMUX_FUNC_IDE, - PMUX_FUNC_IRDA, PMUX_FUNC_KBC, PMUX_FUNC_MIO, PMUX_FUNC_MIPI_HS, diff --git a/arch/arm/include/asm/arch-tegra30/pinmux.h b/arch/arm/include/asm/arch-tegra30/pinmux.h index de1fc12..341951b 100644 --- a/arch/arm/include/asm/arch-tegra30/pinmux.h +++ b/arch/arm/include/asm/arch-tegra30/pinmux.h @@ -349,7 +349,6 @@ enum pmux_func { PMUX_FUNC_I2C2, PMUX_FUNC_I2C3, PMUX_FUNC_IDE, - PMUX_FUNC_IRDA, PMUX_FUNC_KBC, PMUX_FUNC_MIO, PMUX_FUNC_MIPI_HS, diff --git a/board/nvidia/cardhu/pinmux-config-cardhu.h b/board/nvidia/cardhu/pinmux-config-cardhu.h index 3162219..8428bba 100644 --- a/board/nvidia/cardhu/pinmux-config-cardhu.h +++ b/board/nvidia/cardhu/pinmux-config-cardhu.h @@ -176,8 +176,8 @@ static struct pingroup_config tegra3_pinmux_common[] = { LV_PINMUX(VI_D7, SDMMC2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_D10, RSVD1, NORMAL, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_MCLK, VI, UP, NORMAL, INPUT, DISABLE, DISABLE), - DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(UART2_RXD, UARTB, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(UART2_TXD, UARTB, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART2_RTS_N, UARTB, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART2_CTS_N, UARTB, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART3_TXD, UARTC, NORMAL, NORMAL, OUTPUT), -- 1.7.10.4

2 1

[U-Boot] [U-Boot Web-Documentation misses command nand]
by Christoph Petzold 09 Jan '13

09 Jan '13

Hi, why is it, that the documentation in http://www.denx.de/wiki/view/DULG/Manual misses the U-Boot "nand" command? For newbies like me the web manual is one of the first points to start when trying to understand how to accomplish a specific boot task with the help of U-Boot. The sources contain documentation for the "nand" command in "doc/README.nand". I wished to have had a hint in the Documentation at the very beginning of http://www.denx.de/wiki/view/DULG/Manual and maybe another hint in section "5.9 U-Boot command line interface", just a reference to the source documentation "src/doc". Best regards, Christoph Petzold

2 1

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 09 Jan '13

09 Jan '13

Hello Tom, The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm.git master for you to fetch changes up to 61bdb9133593f0f881a57232039296f64bd662ed: arm: remove useless code in start.S files (2013-01-08 22:14:54 +0100) ---------------------------------------------------------------- Albert ARIBAUD (2): arm: move C runtime setup code in crt0.S arm: remove useless code in start.S files arch/arm/cpu/arm1136/start.S | 71 +++--------- arch/arm/cpu/arm1176/start.S | 62 ++--------- arch/arm/cpu/arm720t/start.S | 53 ++------- arch/arm/cpu/arm920t/start.S | 61 ++-------- arch/arm/cpu/arm925t/start.S | 65 ++--------- arch/arm/cpu/arm926ejs/start.S | 86 ++------------ arch/arm/cpu/arm946es/start.S | 56 ++-------- arch/arm/cpu/arm_intcm/start.S | 63 ++--------- arch/arm/cpu/armv7/start.S | 58 +++------- arch/arm/cpu/ixp/start.S | 55 ++------- arch/arm/cpu/pxa/start.S | 63 ++--------- arch/arm/cpu/s3c44b0/start.S | 55 ++------- arch/arm/cpu/sa1100/start.S | 50 ++------- arch/arm/lib/Makefile | 2 + arch/arm/lib/board.c | 11 -- arch/arm/lib/crt0.S | 173 +++++++++++++++++++++++++++++ include/common.h | 2 +- include/configs/socfpga_cyclone5.h | 2 +- lib/asm-offsets.c | 14 +++ nand_spl/board/freescale/mx31pdk/Makefile | 6 +- nand_spl/board/karo/tx25/Makefile | 6 +- 21 files changed, 326 insertions(+), 688 deletions(-) create mode 100644 arch/arm/lib/crt0.S Amicalement, -- Albert.

2 1

[U-Boot] [PULL] Please pull u-boot-atmel/master
by Andreas Bießmann 09 Jan '13

09 Jan '13

Dear Albert Aribaud, please consider the following board related changes for u-boot-arm/master. The following changes since commit b8a7c467960ffb4d5a5e1eef5f7783fb6f594542: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2012-11-25 13:01:58 +0100) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master for you to fetch changes up to ac81e1ccf7135d8004763bbf9bef1d95a03fbe92: spi: atmel: sam9m10g45 also support WDRBT bit (2012-12-09 22:40:13 +0100) ---------------------------------------------------------------- Bo Shen (1): spi: atmel: sam9m10g45 also support WDRBT bit Richard Genoud (3): at91sam9x5: enable USB support for 9x5ek board. at91sam9x5ek: regroup FAT/DOS features at91sam9x5ek: add USB configuration arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 13 ++++++++++ arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++ board/atmel/at91sam9x5ek/at91sam9x5ek.c | 3 +++ drivers/spi/atmel_spi.c | 2 +- drivers/usb/host/ohci-at91.c | 6 +++-- include/configs/at91sam9x5ek.h | 29 +++++++++++++++++++++- 6 files changed, 51 insertions(+), 4 deletions(-)

2 1

[U-Boot] [PATCH] tegra30: cardhu: fix UART2 pinmux settings
by Allen Martin 09 Jan '13

09 Jan '13

Use UARTB instead of IRDA synonym for cardhu pinmux settings to match tegra30 pinmux tables. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- board/nvidia/cardhu/pinmux-config-cardhu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/nvidia/cardhu/pinmux-config-cardhu.h b/board/nvidia/cardhu/pinmux-config-cardhu.h index 3162219..8428bba 100644 --- a/board/nvidia/cardhu/pinmux-config-cardhu.h +++ b/board/nvidia/cardhu/pinmux-config-cardhu.h @@ -176,8 +176,8 @@ static struct pingroup_config tegra3_pinmux_common[] = { LV_PINMUX(VI_D7, SDMMC2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_D10, RSVD1, NORMAL, NORMAL, INPUT, DISABLE, DISABLE), LV_PINMUX(VI_MCLK, VI, UP, NORMAL, INPUT, DISABLE, DISABLE), - DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(UART2_RXD, UARTB, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(UART2_TXD, UARTB, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART2_RTS_N, UARTB, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART2_CTS_N, UARTB, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART3_TXD, UARTC, NORMAL, NORMAL, OUTPUT), -- 1.7.10.4

2 2

[U-Boot] [PATCH] tegra30: fix UART2 pinmux table entry
by Allen Martin 09 Jan '13

09 Jan '13

UART2_TXD and UART2_RXD mux 0 SFIO entries should be IRDA not UARTB. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- arch/arm/cpu/tegra30-common/pinmux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/tegra30-common/pinmux.c b/arch/arm/cpu/tegra30-common/pinmux.c index 122665f..8045fa1 100644 --- a/arch/arm/cpu/tegra30-common/pinmux.c +++ b/arch/arm/cpu/tegra30-common/pinmux.c @@ -149,8 +149,8 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { PINI(VI_MCLK, VI, VI, VI, VI, VI), PINI(VI_VSYNC, VI, DDR, RSVD2, VI, RSVD4), PINI(VI_HSYNC, VI, DDR, RSVD2, VI, RSVD4), - PINI(UART2_RXD, UART, UARTB, SPDIF, UARTA, SPI4), - PINI(UART2_TXD, UART, UARTB, SPDIF, UARTA, SPI4), + PINI(UART2_RXD, UART, IRDA, SPDIF, UARTA, SPI4), + PINI(UART2_TXD, UART, IRDA, SPDIF, UARTA, SPI4), PINI(UART2_RTS_N, UART, UARTA, UARTB, GMI, SPI4), PINI(UART2_CTS_N, UART, UARTA, UARTB, GMI, SPI4), PINI(UART3_TXD, UART, UARTC, RSVD2, GMI, RSVD4), -- 1.7.10.4

2 3

[U-Boot] [PATCH v3] mx53loco: Add support for SEIKO 4.3'' WVGA panel
by Fabio Estevam 09 Jan '13

09 Jan '13

Add support for the Seiko 4.3'' WVGA panel on mx53loco. By default, the CLAA WVGA panel is selected. In order to support the Seiko panel, the enviroment variable 'panel' must be set to 'seiko'. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - Simplify lcd detection logic Changes since v1: - Allow a single binary to support both CLAA and Seiko panels board/freescale/mx53loco/mx53loco.c | 2 -- board/freescale/mx53loco/mx53loco_video.c | 38 ++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index 60cd4f0..8f39c38 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -503,8 +503,6 @@ int board_init(void) mxc_set_sata_internal_clock(); setup_iomux_i2c(); - lcd_enable(); - return 0; } diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c index 69991e8..a4d5a6a 100644 --- a/board/freescale/mx53loco/mx53loco_video.c +++ b/board/freescale/mx53loco/mx53loco_video.c @@ -46,6 +46,21 @@ static struct fb_videomode const claa_wvga = { .vmode = FB_VMODE_NONINTERLACED }; +static struct fb_videomode const seiko_wvga = { + .name = "Seiko-43WVF1G", + .refresh = 60, + .xres = 800, + .yres = 480, + .pixclock = 29851, /* picosecond (33.5 MHz) */ + .left_margin = 89, + .right_margin = 164, + .upper_margin = 23, + .lower_margin = 10, + .hsync_len = 10, + .vsync_len = 10, + .sync = 0, +}; + void setup_iomux_lcd(void) { mxc_request_iomux(MX53_PIN_DI0_DISP_CLK, IOMUX_CONFIG_ALT0); @@ -86,9 +101,26 @@ void setup_iomux_lcd(void) gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_GPIO_1), 1); } -void lcd_enable(void) +int board_video_skip(void) { - int ret = ipuv3_fb_init(&claa_wvga, 0, IPU_PIX_FMT_RGB565); + int ret; + char const *e = getenv("panel"); + + if (e) { + if (strcmp(e, "seiko") == 0) { + ret = ipuv3_fb_init(&seiko_wvga, 0, IPU_PIX_FMT_RGB24); + if (ret) + printf("Seiko cannot be configured: %d\n", ret); + return ret; + } + } + + /* + * 'panel' env variable not found or has different value than 'seiko' + * Defaulting to claa lcd. + */ + ret = ipuv3_fb_init(&claa_wvga, 0, IPU_PIX_FMT_RGB565); if (ret) - printf("LCD cannot be configured: %d\n", ret); + printf("CLAA cannot be configured: %d\n", ret); + return ret; } -- 1.7.9.5

2 1

[U-Boot] [PATCH v3] mx6: Add workaround for ARM errata
by Fabio Estevam 09 Jan '13

09 Jan '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Add workaround for the following ARM errata: 743622 and 751472. The motivation for this change is the following kernel commit 62e4d357a (ARM: 7609/1: disable errata work-arounds which access secure registers), which removes the errata from multiplatform kernel. Since imx has been converted to multiplatform in the kernel, we need to apply such workarounds into the bootloader. Workaround code has been taken from arch/arm/mm/proc-v7.S from 3.7.1 kernel. Explanation of each erratum is provided at "Chip Errata for the i.MX 6Dual/6Quad" document available at: cache.freescale.com/files/32bit/doc/errata/IMX6DQCE.pdf Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Following patch has been proposed into arm kernel mailing list: http://www.spinics.net/lists/arm-kernel/msg214840.html Changes since v2: - Use c15 register (which match both the mx6 errata and kernel code) and also put a note to mx6q erratum document. Changes since v1: - Use the same style of the erratum in arch/arm/cpu/armv7/mx5/lowlevel_init.S. arch/arm/cpu/armv7/mx6/lowlevel_init.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/lowlevel_init.S b/arch/arm/cpu/armv7/mx6/lowlevel_init.S index acadef2..bf06152 100644 --- a/arch/arm/cpu/armv7/mx6/lowlevel_init.S +++ b/arch/arm/cpu/armv7/mx6/lowlevel_init.S @@ -20,6 +20,16 @@ #include <linux/linkage.h> +.macro init_arm_errata + /* ARM erratum ID #743622 */ + mrc p15, 0, r10, c15, c0, 1 /* read diagnostic register */ + orr r10, r10, #1 << 6 /* set bit #6 */ + /* ARM erratum ID #751472 */ + orr r10, r10, #1 << 11 /* set bit #11 */ + mcr p15, 0, r10, c15, c0, 1 /* write diagnostic register */ +.endm + ENTRY(lowlevel_init) + init_arm_errata mov pc, lr ENDPROC(lowlevel_init) -- 1.7.9.5

2 1

[U-Boot] [PATCH v5 0/6] Improve default environment for easy use
by Otavio Salvador 09 Jan '13

09 Jan '13

This patchset improves the default environment of machines currently supported in OpenEmbedded and Yocto to make it compatible with mainline and Freescale BSP Linux kernel. A new patch has been add to change the format in mx6qsabrelite in environment setting and already merged patches removed from this new pull request. Changes in v5: - Change subject - Reword the warning Changes in v4: - Use a warning, instead of error when failing to fetch fdt - Drop exit use - Fix netboot - Use fdt instead of ftd Changes in v3: - Add loadfdt - Use loadfdt - Call exit to abort script Changes in v2: - New patch - reformat environment change to fit in 80 cols - Allow use of dynamic/static ip - Allow force use, or not, of fdt - Change 'auto' to 'try' Otavio Salvador (6): mx6qsabrelite: Use tabs to environment setting mx28evk: We shouldn't hardcode a rootfs filesystem type mx28evk: Add support to dynamically choose between fdt use or not mx53loco: Add support to dynamically choose between fdt use or not mx6qsabrelite: Add support to dynamically choose between fdt use or not mx6qsabre{auto,sd}: Add support to dynamically choose between fdt use or not include/configs/mx28evk.h | 47 ++++++++++++++--- include/configs/mx53loco.h | 40 +++++++++++++- include/configs/mx6qsabre_common.h | 41 +++++++++++++-- include/configs/mx6qsabreauto.h | 1 + include/configs/mx6qsabrelite.h | 101 ++++++++++++++++++++++++------------ include/configs/mx6qsabresd.h | 1 + 6 files changed, 186 insertions(+), 45 deletions(-) -- 1.7.10.4

3 11