March 2013 - U-Boot

[U-Boot] [PATCH] am33xx:ddr:Fix config_sdram to work for all DDR
by Tom Rini 26 Mar '13

26 Mar '13

From: Steve Kipisz <s-kipisz2(a)ti.com> The original write to sdram_config is correct for DDR3 but incorrect for DDR2 so SPL was hanging. For DDR2, the write to sdram_config should be after the writes to ref_ctrl. This was working for DDR3 because there was a write of 0x2800 to ref_ctrl before a write to sdram_config. Tested on: GP EVM 1.1A (DDR2), GP EVM 1.5A (DDR3), Beaglebone A6 (DDR2), Beagleone Blacd A4A (DDR3) Signed-off-by: Steve Kipisz <s-kipisz2(a)ti.com> --- arch/arm/cpu/armv7/am33xx/ddr.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c index 448cc40..7932a39 100644 --- a/arch/arm/cpu/armv7/am33xx/ddr.c +++ b/arch/arm/cpu/armv7/am33xx/ddr.c @@ -54,10 +54,13 @@ void config_sdram(const struct emif_regs *regs) writel(0x2800, &emif_reg->emif_sdram_ref_ctrl); writel(regs->zq_config, &emif_reg->emif_zq_config); writel(regs->sdram_config, &cstat->secure_emif_sdram_config); + writel(regs->sdram_config, &emif_reg->emif_sdram_config); + writel(regs->ref_ctrl, &emif_reg->emif_sdram_ref_ctrl); + writel(regs->ref_ctrl, &emif_reg->emif_sdram_ref_ctrl_shdw); } - writel(regs->sdram_config, &emif_reg->emif_sdram_config); writel(regs->ref_ctrl, &emif_reg->emif_sdram_ref_ctrl); writel(regs->ref_ctrl, &emif_reg->emif_sdram_ref_ctrl_shdw); + writel(regs->sdram_config, &emif_reg->emif_sdram_config); } /** -- 1.7.2.3

1 1

[U-Boot] [PATCH] arm: Correct CONFIG_STANDALONE_LOAD_ADDR for AM33XX/OMAP* platforms
by Tom Rini 26 Mar '13

26 Mar '13

All of these platforms have memory starting at 0x80000000, so this is the correct CONFIG_STANDALONE_LOAD_ADDR for all of them. Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 24b9d7c..71035e2 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -24,7 +24,7 @@ CROSS_COMPILE ?= arm-linux- ifndef CONFIG_STANDALONE_LOAD_ADDR -ifeq ($(SOC),omap3) +ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) CONFIG_STANDALONE_LOAD_ADDR = 0x80300000 else CONFIG_STANDALONE_LOAD_ADDR = 0xc100000 -- 1.7.9.5

2 2

[U-Boot] [PATCH v3 0/3] am335x_evm: Switch to DT boot, add another platform
by Tom Rini 26 Mar '13

26 Mar '13

The following is an update to Koen Kooi's original series that updates support for the next beaglebone platform and switches to DT booting as the default. I want to spell out that part of the changes I've done here are adding two variables to make it easier to control where we load our kernel/dtb from. For example, some distributions may place these on an ext* partition while others may lump them into the FAT partition up front for "easy" updating. The first variable (bootpart) lets us control that as well as which MMC device (SD card or eMMC) they are grabbed from at all. The second variable, bootdir lets us control where we load the files from, within the device. This is needed because findfdt will tell us 'am335x-bone.dtb' but that might be /boot or it might be top level. We assume /boot but can easily override this with uEnv.txt Changes since v2: - Don't add extra line in am335x_evm.h, note why we keep CONFIG_CMD_EXT2 (Peter) - Update the dtb name for the new device (Matt, Nishanth, Koen) Changes since v1: - Add CONFIG_CMD_FS_GENERIC, use in parts 2 and 3 - As part of this, kill loaduimagefat since loaduimage uses the generic load command. - Add loadfdt command rather than a direct call to load the fdt. -- Tom

4 9

[U-Boot] [PATCH v4] Allow AM335x MPU core clock speed to be specified in the board config file
by Mark Jackson 26 Mar '13

26 Mar '13

Allow AM335x MPU core clock speed to be specified in the board config file. To use, add the following to the board's config file:- #define CONFIG_SYS_MPUCLK <desired clock freq in MHz> Signed-off-by: Mark Jackson <mpfj(a)newflow.co.uk> --- Changes in v4: - Now defined as MHz (not Hz) Changes in v3: - Changed from V_MPUCLK to CONFIG_SYS_MPUCLK - Added entry in README Changes in v2: - Tweaked after comments from Peter Korsgaard README | 4 ++++ arch/arm/include/asm/arch-am33xx/clocks_am33xx.h | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README b/README index d8cb394..ddf6df2 100644 --- a/README +++ b/README @@ -3820,6 +3820,10 @@ Low Level (hardware related) configuration options: If defined, the x86 reset vector code is included. This is not needed when U-Boot is running from Coreboot. +- CONFIG_SYS_MPUCLK + Defines the MPU clock speed (in MHz). + + NOTE : currently only supported on AM335x platforms. Freescale QE/FMAN Firmware Support: ----------------------------------- diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index d748dd2..2d96007 100644 --- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h @@ -21,8 +21,11 @@ #define OSC (V_OSCK/1000000) -/* MAIN PLL Fdll = 550 MHZ, */ -#define MPUPLL_M 550 +/* MAIN PLL Fdll = 550 MHz, by default */ +#ifndef CONFIG_SYS_MPUCLK +#define CONFIG_SYS_MPUCLK 550 +#endif +#define MPUPLL_M CONFIG_SYS_MPUCLK #define MPUPLL_N (OSC-1) #define MPUPLL_M2 1 -- 1.7.9.5

3 2

[U-Boot] [PATCH] Initialise correct GPMC WAITx irq for AM33xx
by Mark Jackson 26 Mar '13

26 Mar '13

Currently WAIT0 irq is reset and then WAIT1 irq is enabled. Fix it such that WAIT0 irq is enabled instead. Signed-off-by: Mark Jackson <mpfj(a)newflow.co.uk> --- arch/arm/cpu/armv7/am33xx/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/am33xx/mem.c b/arch/arm/cpu/armv7/am33xx/mem.c index b8f54ab..b86b0de 100644 --- a/arch/arm/cpu/armv7/am33xx/mem.c +++ b/arch/arm/cpu/armv7/am33xx/mem.c @@ -83,7 +83,7 @@ void gpmc_init(void) /* global settings */ writel(0x00000008, &gpmc_cfg->sysconfig); writel(0x00000100, &gpmc_cfg->irqstatus); - writel(0x00000200, &gpmc_cfg->irqenable); + writel(0x00000100, &gpmc_cfg->irqenable); writel(0x00000012, &gpmc_cfg->config); /* * Disable the GPMC0 config set by ROM code -- 1.7.9.5

3 2

[U-Boot] [PATCH 0/5] Add splash screen for CM-T35
by Nikita Kiryanov 26 Mar '13

26 Mar '13

This patchset adds splash screen support for CM-T35. It includes the ability to initialize the display subsystem either using predefines (selected via env variable "displaytype"), or user supplied configuration options, also stored in an environment variables and pointed to by displaytype. The splash image data is currently read from NAND. As a preparation for the above functionality, this patch set introduces new DSS #defines and an option for board-specific splash screen preparation, which can be invoked in lcd_logo() right before displaying the splash screen (typical use case: load the image data in time for it to be displayed). Nikita Kiryanov (5): omap3: add useful dss defines lcd: add option for board specific splash screen preparation cm-t35: add support for dvi displays cm-t35: add support for user defined lcd parameters cm-t35: add support for loading splash image from NAND README | 8 + arch/arm/include/asm/arch-omap3/dss.h | 35 +++ board/cm_t35/Makefile | 1 + board/cm_t35/cm_t35.c | 64 +++++ board/cm_t35/display.c | 420 +++++++++++++++++++++++++++++++++ common/lcd.c | 15 ++ include/configs/cm_t35.h | 10 + include/lcd.h | 1 + 8 files changed, 554 insertions(+) create mode 100644 board/cm_t35/display.c -- 1.7.10.4

5 37

[U-Boot] [PATCH v4 0/9] Add TI814x EVM Support
by Matt Porter 26 Mar '13

26 Mar '13

This series adds support for the PG1.0 TI814x EVM board. TI814x fits into the existing AM33XX SoC support with some refactoring of the AM33XX-specific emif4, clock, and mux code. It has been tested booting up a Linux kernel and regression tested on BeagleBone and EVM-SK AM33XX boards. It has also been MAKEALL tested for all am33xx platforms. The series applies on top of the "add required includes patch" from Tom Rini at http://patchwork.ozlabs.org/patch/227804/ Changes since v3: - Fix pcm051 build breakage - Fix unused variable warning in emif4 support - Remove unused includes (fixed by required includes patch) - Remove unused CONFIG_FS_* options (fixed by above patch) Changes since v2: - Fix EMIF/L3F clock enable ordering issue Changes since v1: - Fix warnings in ddr.c - Split hardware.h -> hardware_am33xx.h/ti814x.h - Remove unused dmtimer support - Add register structs bit definitions - Rename soc-specific clock files for consistency - Move soc-specific defs only used in one place to clock_*.c - fix copyright dates and filenames in headers - remove clocks_*.h and go back to clock.h - Rename mux includes for consistency - Correct mmc reference clock for ti814x - Squash MAINTAINERS and build bits to board support commit - Config fixes (copyright, mtest, findfdt, fs options, cleanups) - Fix wdtimer warning Matt Porter (9): am33xx: convert defines from am33xx-specific to generic names am33xx: refactor emif4/ddr to support multiple EMIF instances am33xx: refactor am33xx clocks and add ti814x support am33xx: refactor am33xx mux support and add ti814x support am33xx: add ti814x specific register definitions am33xx: add dmm support to emif4 library am33xx: support ti814x mmc reference clock ns16550: enable quirks for ti814x ti814x_evm: add ti814x evm board support MAINTAINERS | 4 + Makefile | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 3 +- arch/arm/cpu/armv7/am33xx/board.c | 4 +- .../cpu/armv7/am33xx/{clock.c => clock_am33xx.c} | 34 +- arch/arm/cpu/armv7/am33xx/clock_ti814x.c | 406 ++++++++++++++++++++ arch/arm/cpu/armv7/am33xx/ddr.c | 99 +++-- arch/arm/cpu/armv7/am33xx/emif4.c | 57 ++- arch/arm/cpu/armv7/am33xx/sys_info.c | 3 + arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/include/asm/arch-am33xx/clock.h | 2 +- arch/arm/include/asm/arch-am33xx/clocks_am33xx.h | 33 +- arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 57 ++- arch/arm/include/asm/arch-am33xx/hardware.h | 40 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 54 +++ arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 53 +++ arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 4 + arch/arm/include/asm/arch-am33xx/mux.h | 235 +---------- arch/arm/include/asm/arch-am33xx/mux_am33xx.h | 247 ++++++++++++ arch/arm/include/asm/arch-am33xx/mux_ti814x.h | 311 +++++++++++++++ arch/arm/include/asm/arch-am33xx/omap.h | 5 + arch/arm/include/asm/arch-am33xx/spl.h | 5 + board/phytec/pcm051/board.c | 8 +- board/ti/am335x/board.c | 12 +- board/ti/ti814x/Makefile | 46 +++ board/ti/ti814x/evm.c | 198 ++++++++++ board/ti/ti814x/evm.h | 7 + board/ti/ti814x/mux.c | 51 +++ boards.cfg | 1 + drivers/serial/ns16550.c | 5 +- include/configs/ti814x_evm.h | 220 +++++++++++ spl/Makefile | 2 +- 34 files changed, 1851 insertions(+), 372 deletions(-) rename arch/arm/cpu/armv7/am33xx/{clock.c => clock_am33xx.c} (91%) create mode 100644 arch/arm/cpu/armv7/am33xx/clock_ti814x.c create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_am33xx.h create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti814x.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux_am33xx.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux_ti814x.h create mode 100644 board/ti/ti814x/Makefile create mode 100644 board/ti/ti814x/evm.c create mode 100644 board/ti/ti814x/evm.h create mode 100644 board/ti/ti814x/mux.c create mode 100644 include/configs/ti814x_evm.h -- 1.7.9.5

2 10

[U-Boot] [PATCH V2 0/9] OMAP3-5: TWL[46]03[05]: cleanup register access and misc minimal cleanups
by Nishanth Menon 26 Mar '13

26 Mar '13

V1: http://patchwork.ozlabs.org/patch/227112/ This series helps standardize register parameters for TWL4030, 6030 and 6035 used in various OMAP3,4,5 based platforms. For historical reasons, we have been following val, reg as the order of parameters while we have reg, val in every other i2c apis including i2c mw/mr command @ u-boot cmd line, with kernel APIs, i2cget, i2cset utilities. Instead of maintaining this forked implementation, it is never too late to fix them. Build tested (MAKEALL) platforms-at least these seem to be be impacted ones: cm_t35 devkit8000 dig297 igep0020 igep0020_nand igep0030 igep0030_nand nokia_rx51 omap3_beagle omap3_evm omap3_evm_quick_mmc omap3_evm_quick_nand omap3_logic omap3_mvblx omap3_overo omap3_pandora omap3_sdp3430 omap3_zoom1 omap3_zoom2 omap4_panda omap4_sdp4430 omap5_evm tricorder Boot tested platforms (upto kernel+shell with dtb): omap3_beagle - tested on beagle XM (C1), beagle(C1D) - TWL4030 omap4_panda - tested on PandaBoard(A3) and PandaBoard-ES(EB3) - TWL6030 omap5_evm - OMAP5 uEVM - TWL6035 twl4030 changes are little wider in scope, so I have split them into two patches to help review Series is based on u-boot master: master 8b906a9 Merge branch 'spi' of git://git.denx.de/u-boot-x86 (rationale being the changes if done on v2013.04-rc1 have much changes to allow this series to apply cleanly on the latest) NOTE: the series tries to maintain existing indentation style to allow the code to stay in sync with legacy code. Nishanth Menon (9): twl4030: make twl4030_i2c_write_u8 prototype consistent twl4030: make twl4030_i2c_read_u8 prototype consistent twl6030: twl6030_i2c_[read|write]_u8 prototype consistent twl6030: move twl6030 register access functions to common header file twl6030: add header guard twl6035: make twl6030_i2c_[read|write]_u8 static inline twl6035: twl6035_i2c_[read|write]_u8 prototype consistent twl6035: remove redundant palmas_[read|write]_u8 twl6035: add header guard board/cm_t35/cm_t35.c | 24 +++++++------- board/nokia/rx51/rx51.c | 52 +++++++++++++++--------------- board/pandora/pandora.c | 3 +- drivers/misc/twl4030_led.c | 4 +-- drivers/power/twl4030.c | 16 +++++----- drivers/power/twl6030.c | 75 +++++++++++++++++++------------------------- drivers/power/twl6035.c | 26 ++------------- drivers/usb/phy/twl4030.c | 48 ++++++++++++++-------------- include/twl4030.h | 4 +-- include/twl6030.h | 16 ++++++++++ include/twl6035.h | 18 +++++++++-- 11 files changed, 142 insertions(+), 144 deletions(-) Regards, Nishanth Menon -- 1.7.9.5

2 14

[U-Boot] [PATCH] cmd/gpt: Support gpt command for all devices.
by egbert.eich＠googlemail.com 26 Mar '13

26 Mar '13

From: Egbert Eich <eich(a)suse.com> The gpt command was only implemented for mmc devices. There is no reason why this command should not be generalized and be applied all other storage device classes. This change both simplifies the implementation and eliminates a build failure for systems that don't support mmcs. Signed-off-by: Egbert Eich <eich(a)suse.com> --- common/cmd_gpt.c | 43 ++++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 25 deletions(-) diff --git a/common/cmd_gpt.c b/common/cmd_gpt.c index efd7934..1a72e8e 100644 --- a/common/cmd_gpt.c +++ b/common/cmd_gpt.c @@ -23,7 +23,6 @@ #include <common.h> #include <malloc.h> #include <command.h> -#include <mmc.h> #include <part_efi.h> #include <exports.h> #include <linux/ctype.h> @@ -134,7 +133,7 @@ static int set_gpt_info(block_dev_desc_t *dev_desc, int errno = 0; uint64_t size_ll, start_ll; - debug("%s: MMC lba num: 0x%x %d\n", __func__, + debug("%s: lba num: 0x%x %d\n", __func__, (unsigned int)dev_desc->lba, (unsigned int)dev_desc->lba); if (str_part == NULL) @@ -247,25 +246,18 @@ err: return errno; } -static int gpt_mmc_default(int dev, const char *str_part) +static int gpt_default(block_dev_desc_t *blk_dev_desc, const char *str_part) { int ret; char *str_disk_guid; u8 part_count = 0; disk_partition_t *partitions = NULL; - struct mmc *mmc = find_mmc_device(dev); - - if (mmc == NULL) { - printf("%s: mmc dev %d NOT available\n", __func__, dev); - return CMD_RET_FAILURE; - } - if (!str_part) return -1; /* fill partitions */ - ret = set_gpt_info(&mmc->block_dev, str_part, + ret = set_gpt_info(blk_dev_desc, str_part, &str_disk_guid, &partitions, &part_count); if (ret) { if (ret == -1) @@ -278,7 +270,7 @@ static int gpt_mmc_default(int dev, const char *str_part) } /* save partitions layout to disk */ - gpt_restore(&mmc->block_dev, str_disk_guid, partitions, part_count); + gpt_restore(&blk_dev_desc, str_disk_guid, partitions, part_count); free(str_disk_guid); free(partitions); @@ -306,20 +298,21 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* command: 'write' */ if ((strcmp(argv[1], "write") == 0) && (argc == 5)) { - /* device: 'mmc' */ - if (strcmp(argv[2], "mmc") == 0) { - /* check if 'dev' is a number */ - for (pstr = argv[3]; *pstr != '\0'; pstr++) - if (!isdigit(*pstr)) { - printf("'%s' is not a number\n", - argv[3]); - return CMD_RET_USAGE; - } - dev = (int)simple_strtoul(argv[3], NULL, 10); - /* write to mmc */ - if (gpt_mmc_default(dev, argv[4])) - return CMD_RET_FAILURE; + char *ep; + block_dev_desc_t *blk_dev_desc; + dev = (int)simple_strtoul(argv[3], NULL, 10); + if (*ep) { + printf("'%s' is not a number\n", argv[3]); + return CMD_RET_USAGE; } + blk_dev_desc = get_dev(argv[2], dev); + if (!blk_dev_desc) { + printf("%s: %s dev %d NOT available\n", __func__, argv[2], dev); + return CMD_RET_FAILURE; + } + + if (gpt_default(blk_dev_desc, argv[4])) + return CMD_RET_FAILURE; } else { return CMD_RET_USAGE; } -- 1.7.7

3 2

[U-Boot] [PATCH] mx23_olinuxino: Fix netboot console
by Alexandre Pereira da Silva 26 Mar '13

26 Mar '13

The netargs variable was referencing the non-existing variable console_mainline. Change that to console variable instead. Signed-off-by: Alexandre Pereira da Silva <aletes.xgr(a)gmail.com> --- include/configs/mx23_olinuxino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 03893d7..3e0f784 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -227,7 +227,7 @@ "else " \ "bootm; " \ "fi;\0" \ - "netargs=setenv bootargs console=${console_mainline},${baudrate} " \ + "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ -- 1.7.10

2 1