November 2013 - U-Boot

[U-Boot] Pull request: u-boot-mmc 31102013
by Pantelis Antoniou 04 Nov '13

04 Nov '13

Hi Tom, The following changes since commit 509dca7a11aad394d781a9d31a7bfa6692562741: Merge branch 'master' of git://git.denx.de/u-boot-video (2013-10-30 08:36:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-mmc.git master for you to fetch changes up to ef38f3ffb97331725b00dce667da3aefa0a75340: powerpc/esdhc: Add 3.3v voltage support in esdhc capacity register (2013-10-31 09:55:34 +0200) ---------------------------------------------------------------- Haijun.Zhang (4): powerpc/esdhc: Map register for eSDHC Host Controller V3.0 Powerpc/esdhc: Add simple description of esdhc register esdhc: memset mmc struct before putting into use powerpc/esdhc: Add 3.3v voltage support in esdhc capacity register Jaehoon Chung (1): mmc: dw_mmc: change the callback function name. Oliver Metz (1): mmc: Fix erase_grp_size for partitioned card Przemyslaw Marczak (1): mmc: sdhci: Avoid commands errors by simple timeout adaptation. Rajeshwari Shinde (1): DWMMC: SMDK5420: Disable SMU for eMMC arch/arm/include/asm/arch-exynos/dwmmc.h | 13 +++++++++++++ drivers/mmc/dw_mmc.c | 17 ++++++++++++++--- drivers/mmc/exynos_dw_mmc.c | 5 ++++- drivers/mmc/fsl_esdhc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++------------------------- drivers/mmc/mmc.c | 17 +++++++++++++---- drivers/mmc/sdhci.c | 35 ++++++++++++++++++++++++++++------- include/configs/T4240QDS.h | 1 + include/dwmmc.h | 5 ++++- include/mmc.h | 2 ++ 9 files changed, 123 insertions(+), 41 deletions(-) Regards -- Pantelis

2 1

[U-Boot] [PATCH] TI:omap5: Add rdaddr, use consistent loadaddr values
by Tom Rini 04 Nov '13

04 Nov '13

rdaddr was missing which is a common location for loading ramdisks to. loadaddr was higher than it needs to be, so use the same value other TI platforms use. Signed-off-by: Tom Rini <trini(a)ti.com> --- include/configs/omap5_common.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index 827eaab..c7fa37e 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -70,10 +70,11 @@ #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x82000000\0" \ - "console=" CONSOLEDEV ",115200n8\0" \ + "loadaddr=0x80200000\0" \ + "fdtaddr=0x80F80000\0" \ "fdt_high=0xffffffff\0" \ - "fdtaddr=0x80f80000\0" \ + "rdaddr=0x81000000\0" \ + "console=" CONSOLEDEV ",115200n8\0" \ "fdtfile=undefined\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ -- 1.7.9.5

1 1

[U-Boot] [PATCH V3] ARM: OMAP5: DDR3: Change io settings
by Sricharan R 04 Nov '13

04 Nov '13

The change from 0x64656465 to 0x64646464 is to remove the weak pull enabled on DQS, nDQS lines. This pulls the differential signals in the same direction which is not intended. So disabling the weak pulls improves signal integrity. On the uEVM there are 4 DDR3 devices. The VREF for 2 of the devices is powered by the OMAP's VREF_CA_OUT pins. The VREF on the other 2 devices is powered by the OMAP's VREF_DQ_OUT pins. So the net effect here is that only half of the DDR3 devices were being supplied a VREF! This was clearly a mistake. The second change improves the robustness of the interface and was specifically seen to cure corruption observed at high temperatures on some boards. With the above two changes better memory stability was observed with extended temperature ranges around 100C. Signed-off-by: Sricharan R <r.sricharan(a)ti.com> --- [V3] Added more precise change log as per Griffis Brad <bgriffis(a)ti.com> arch/arm/include/asm/arch-omap5/omap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index 414d37a..3c2306f 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -145,9 +145,9 @@ struct s32ktimer { #define DDR_IO_2_VREF_CELLS_DDR3_VALUE 0x0 #define DDR_IO_I_40OHM_SR_SLOWEST_WD_DQ_NO_PULL_DQS_NO_PULL_ES2 0x7C7C7C7C -#define DDR_IO_I_40OHM_SR_FAST_WD_DQ_NO_PULL_DQS_NO_PULL_ES2 0x64656465 +#define DDR_IO_I_40OHM_SR_FAST_WD_DQ_NO_PULL_DQS_NO_PULL_ES2 0x64646464 #define DDR_IO_0_VREF_CELLS_DDR3_VALUE_ES2 0xBAE8C631 -#define DDR_IO_1_VREF_CELLS_DDR3_VALUE_ES2 0xB46318D8 +#define DDR_IO_1_VREF_CELLS_DDR3_VALUE_ES2 0xBC6318DC #define DDR_IO_2_VREF_CELLS_DDR3_VALUE_ES2 0x84210000 #define EFUSE_1 0x45145100 -- 1.7.9.5

2 1

[U-Boot] [PATCH 0/3] cm_t35 tune up
by Nikita Kiryanov 04 Nov '13

04 Nov '13

This patchset is a collection of short cm_t35 updates. It changes some configuration parameters and turns on GPIO commands. Nikita Kiryanov (3): cm_t35: reduce default bootdelay to 3 seconds cm_t35: turn on GPIO commands cm_t35: update lcd predefines board/compulab/cm_t35/display.c | 8 +++++++- include/configs/cm_t35.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) -- 1.8.1.2

2 8

[U-Boot] [PATCH] dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 build
by Tom Rini 04 Nov '13

04 Nov '13

From: Minal Shah <minal.shah(a)ti.com> UART booting is supported on this SoC, but via UART3 rather than UART1. Because of this we must change the board to use UART3 for all console access (only one UART is exposed on this board and a slight HW mod is required to switch UARTs). Signed-off-by: Minal Shah <minal.shah(a)ti.com> [trini: Make apply to mainline, reword commit] Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/include/asm/arch-omap5/spl.h | 1 + boards.cfg | 3 ++- include/configs/dra7xx_evm.h | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h index fe8b0c0..1fdaa75 100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++ b/arch/arm/include/asm/arch-omap5/spl.h @@ -15,6 +15,7 @@ #define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC2 6 #define BOOT_DEVICE_MMC2_2 7 +#define BOOT_DEVICE_UART 0x43 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2_2 diff --git a/boards.cfg b/boards.cfg index dbd8479..57505b0 100644 --- a/boards.cfg +++ b/boards.cfg @@ -329,7 +329,8 @@ Active arm armv7 omap3 ti sdp3430 Active arm armv7 omap3 timll devkit8000 devkit8000 - Thomas Weber <weber(a)corscience.de> Active arm armv7 omap4 ti panda omap4_panda - Sricharan R <r.sricharan(a)ti.com> Active arm armv7 omap4 ti sdp4430 omap4_sdp4430 - Sricharan R <r.sricharan(a)ti.com> -Active arm armv7 omap5 ti dra7xx dra7xx_evm - Lokesh Vutla <lokeshvutla(a)ti.com> +Active arm armv7 omap5 ti dra7xx dra7xx_evm dra7xx_evm:CONS_INDEX=1 Lokesh Vutla <lokeshvutla(a)ti.com> +Active arm armv7 omap5 ti dra7xx dra7xx_evm_uart3 dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 omap5 ti omap5_uevm omap5_uevm - - Active arm armv7 rmobile atmark-techno armadillo-800eva armadillo-800eva - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Active arm armv7 rmobile kmc kzm9g kzm9g - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com>:Tetsuyuki Kobayashi <koba(a)kmckk.co.jp> diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7b120de..a0b0d3f 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -22,9 +22,14 @@ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_CMD_SAVEENV +#if (CONFIG_CONS_INDEX == 1) #define CONSOLEDEV "ttyO0" -#define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_NS16550_COM1 UART1_BASE +#elif (CONFIG_CONS_INDEX == 3) +#define CONSOLEDEV "ttyO2" +#endif +#define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ +#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ +#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_OMAP_ABE_SYSCK -- 1.7.9.5

1 1

[U-Boot] [PATCH] TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address
by Tom Rini 04 Nov '13

04 Nov '13

With changes to increase the size of the device tree (required to move more data out of the kernel and into DT), loading the args at the old address leads to us overwriting things later on. To correct this, load the args file to where we load the device tree anyhow. This is also safe for non-DT booting as in either case we use r2 to pass in the location of things. Signed-off-by: Tom Rini <trini(a)ti.com> --- include/configs/ti_armv7_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d15850b..07730c9 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -203,7 +203,7 @@ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SPL_ENV_SUPPORT /* For 'boot_os' and similar */ -#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100) +#define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000 /* FAT */ #define CONFIG_SPL_FAT_LOAD_KERNEL_NAME "uImage" -- 1.7.9.5

1 1

[U-Boot] [PATCH] am335x: Enable CONFIG_OMAP_WATCHDOG support
by Tom Rini 04 Nov '13

04 Nov '13

There is a board-specific portion for calling watchdog enable itself, in main U-Boot. Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/cpu/armv7/omap-common/boot-common.c | 4 ++++ board/ti/am335x/board.c | 5 +++++ include/configs/ti_am335x_common.h | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 6b4772b..1880e04 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -14,6 +14,7 @@ #include <asm/arch/omap.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/sys_proto.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; @@ -76,6 +77,9 @@ void spl_board_init(void) #if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT) arch_misc_init(); #endif +#if defined(CONFIG_HW_WATCHDOG) + hw_watchdog_init(); +#endif } int board_mmc_init(bd_t *bis) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 0d6912b..0986646 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -27,6 +27,7 @@ #include <miiphy.h> #include <cpsw.h> #include <environment.h> +#include <watchdog.h> #include "board.h" DECLARE_GLOBAL_DATA_PTR; @@ -354,6 +355,10 @@ int board_init(void) STNOR_GPMC_CONFIG5, STNOR_GPMC_CONFIG6, STNOR_GPMC_CONFIG7 }; #endif +#if defined(CONFIG_HW_WATCHDOG) + hw_watchdog_init(); +#endif + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; gpmc_init(); diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 59c758c..28e7a80 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -43,6 +43,10 @@ #define CONFIG_SPL_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 +/* Enable the HW watchdog, since we can use this with bootcount */ +#define CONFIG_HW_WATCHDOG +#define CONFIG_OMAP_WATCHDOG + /* * SPL related defines. The Public RAM memory map the ROM defines the * area between 0x402F0400 and 0x4030B800 as a download area and @@ -53,6 +57,9 @@ #define CONFIG_SPL_TEXT_BASE 0x402F0400 #define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) +/* Enable the watchdog inside of SPL */ +#define CONFIG_SPL_WATCHDOG_SUPPORT + /* * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. -- 1.7.9.5

1 1

[U-Boot] [PATCH v3 1/2] ARM: IGEP0033: rename config file to am335x_igep0033.h
by Javier Martinez Canillas 04 Nov '13

04 Nov '13

There seems to be a naming convention for the configuration files for boards using the same SoC family. This makes easier to do changes that affect different boards based on the same SoC. Since the IGEP COM AQUILA use TI AM335x processors, is better to rename its board config to use this naming scheme. Signed-off-by: Javier Martinez Canillas <javier.martinez(a)collabora.co.uk> Acked-by: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> --- Changes since v2: - Rebase patch to adapt to new boards.cfg file format. Changes since v1: - Fix some issues in the commit changelog pointed out by Enric Balletbo. boards.cfg | 2 +- include/configs/{igep0033.h => am335x_igep0033.h} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename include/configs/{igep0033.h => am335x_igep0033.h} (100%) diff --git a/boards.cfg b/boards.cfg index dbd8479..310c034 100644 --- a/boards.cfg +++ b/boards.cfg @@ -243,7 +243,7 @@ Active arm arm946es - armltd integrator Active arm armv7 - armltd vexpress vexpress_ca15_tc2 - - Active arm armv7 - armltd vexpress vexpress_ca5x2 - Matt Waddel <matt.waddel(a)linaro.org> Active arm armv7 - armltd vexpress vexpress_ca9x4 - Matt Waddel <matt.waddel(a)linaro.org> -Active arm armv7 am33xx isee igep0033 igep0033 - Enric Balletbo i Serra <eballetbo(a)iseebcn.com> +Active arm armv7 am33xx isee igep0033 am335x_igep0033 - Enric Balletbo i Serra <eballetbo(a)iseebcn.com> Active arm armv7 am33xx phytec pcm051 pcm051 pcm051 Lars Poeschel <poeschel(a)lemonage.de> Active arm armv7 am33xx siemens dxr2 dxr2 - Roger Meier <r.meier(a)siemens.com> Active arm armv7 am33xx siemens pxm2 pxm2 - Roger Meier <r.meier(a)siemens.com> diff --git a/include/configs/igep0033.h b/include/configs/am335x_igep0033.h similarity index 100% rename from include/configs/igep0033.h rename to include/configs/am335x_igep0033.h -- 1.8.4.rc3

2 5

[U-Boot] [PATCH 0/2] compulab: adjustments before porting more boards
by Igor Grinberg 04 Nov '13

04 Nov '13

Two more adjustments before porting more Compulab boards to mainline U-Boot. Move the eeprom code which can be used (and is suitable) by multiple Compulab boards to a common location. Move the display initialization code which can be used by multiple Compulab OMAP based boards. Igor Grinberg (2): cm-t35: move the eeprom code to common place cm-t35: move the display code to common place board/compulab/cm_t35/Makefile | 3 -- board/compulab/cm_t35/cm_t35.c | 7 ++- board/compulab/common/Makefile | 36 +++++++++++++++ board/compulab/{cm_t35 => common}/eeprom.c | 51 ++++++++++++---------- board/compulab/{cm_t35 => common}/eeprom.h | 8 ++-- .../{cm_t35/display.c => common/omap3_display.c} | 0 6 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 board/compulab/common/Makefile rename board/compulab/{cm_t35 => common}/eeprom.c (60%) rename board/compulab/{cm_t35 => common}/eeprom.h (62%) rename board/compulab/{cm_t35/display.c => common/omap3_display.c} (100%) -- 1.8.1.5

2 8

[U-Boot] [PATCH 01/13] tricorder: remove lcdmode from bootargs
by Andreas Bießmann 04 Nov '13

04 Nov '13

From: Thomas Weber <thomas.weber(a)corscience.de> Signed-off-by: Thomas Weber <thomas.weber(a)corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann(a)corscience.de> --- include/configs/tricorder.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index a9b2714..1291a08 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -147,14 +147,12 @@ "loadaddr=0x82000000\0" \ "console=ttyO2,115200n8\0" \ "mmcdev=0\0" \ - "vram=12M\0" \ - "lcdmode=800x600\0" \ + "vram=3M\0" \ "defaultdisplay=lcd\0" \ "kernelopts=rw rootwait\0" \ "commonargs=" \ "setenv bootargs console=${console} " \ "vram=${vram} " \ - "omapfb.mode=lcd:${lcdmode} " \ "omapdss.def_disp=${defaultdisplay}\0" \ "mmcargs=" \ "run commonargs; " \ @@ -164,7 +162,6 @@ "nandargs=" \ "run commonargs; " \ "setenv bootargs ${bootargs} " \ - "omapfb.mode=lcd:${lcdmode} " \ "omapdss.def_disp=${defaultdisplay} " \ "root=ubi0:root " \ "ubi.mtd=4 " \ -- 1.7.10.4

4 15