June 2013 - U-Boot

[U-Boot] [PATCH 01/10] ARM: move interrupt_init to before relocation
by Rob Herring 11 Jun '13

11 Jun '13

From: Rob Herring <rob.herring(a)calxeda.com> interrupt_init also sets up the abort stack, but is not setup before relocation. So any aborts during relocation will hang and not print out any useful information. Fix this by moving the interrupt_init to after the stack setup in board_init_f. Signed-off-by: Rob Herring <rob.herring(a)calxeda.com> --- arch/arm/lib/board.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 09ab4ad..6dbe7e2 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -447,6 +447,7 @@ void board_init_f(ulong bootflag) addr_sp += 128; /* leave 32 words for abort-stack */ gd->irq_sp = addr_sp; #endif + interrupt_init(); debug("New Stack Pointer is: %08lx\n", addr_sp); -- 1.8.1.2

3 20

[U-Boot] [PATCH v2 16/16] sf: Add Flag status register polling support
by Jagannadha Sutradharudu Teki 11 Jun '13

11 Jun '13

Flag status register polling is required for micron 512Mb flash devices onwards, for performing erase/program operations. Like polling for WIP(Write-In-Progress) bit in read status register, spi_flash_cmd_wait_ready will poll for PEC(Program-Erase-Control) bit in flag status register. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v2: - none drivers/mtd/spi/spi_flash.c | 15 ++++++++++++--- drivers/mtd/spi/spi_flash_internal.h | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 527423d..8cd2988 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -195,25 +195,34 @@ int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) unsigned long timebase; int ret; u8 status; + u8 check_status = 0x0; u8 poll_bit = STATUS_WIP; u8 cmd = CMD_READ_STATUS; + if ((flash->idcode0 == 0x20) && + (flash->size >= SPI_FLASH_512MB_STMIC)) { + poll_bit = STATUS_PEC; + check_status = poll_bit; + cmd = CMD_FLAG_STATUS; + } + timebase = get_timer(0); do { WATCHDOG_RESET(); ret = spi_flash_read_common(flash, &cmd, 1, &status, 1); if (ret < 0) { - debug("SF: fail to read read status register\n"); + debug("SF: fail to read %s status register\n", + cmd == CMD_READ_STATUS ? "read" : "flag"); return ret; } - if ((status & poll_bit) == 0) + if ((status & poll_bit) == check_status) break; } while (get_timer(timebase) < timeout); - if ((status & poll_bit) == 0) + if ((status & poll_bit) == check_status) return 0; /* Timed out */ diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index ac4530f..cb7a505 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -13,6 +13,7 @@ #define SPI_FLASH_SECTOR_ERASE_TIMEOUT (10 * CONFIG_SYS_HZ) #define SPI_FLASH_16MB_BOUN 0x1000000 +#define SPI_FLASH_512MB_STMIC 0x4000000 /* Common commands */ #define CMD_READ_ID 0x9f @@ -24,6 +25,7 @@ #define CMD_PAGE_PROGRAM 0x02 #define CMD_WRITE_DISABLE 0x04 #define CMD_READ_STATUS 0x05 +#define CMD_FLAG_STATUS 0x70 #define CMD_WRITE_ENABLE 0x06 #define CMD_ERASE_4K 0x20 #define CMD_ERASE_32K 0x52 @@ -38,6 +40,7 @@ /* Common status */ #define STATUS_WIP 0x01 +#define STATUS_PEC 0x80 /* Send a single-byte command to the device and read the response */ int spi_flash_cmd(struct spi_slave *spi, u8 cmd, void *response, size_t len); -- 1.8.3

3 8

[U-Boot] 2013.07-rc1 plans?
by Otavio Salvador 11 Jun '13

11 Jun '13

Hello, I'd like to know what the plains regarding rc releases? Regards, -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750

3 5

[U-Boot] [PATCH] arm: fix a comment
by Masahiro Yamada 10 Jun '13

10 Jun '13

Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- arch/arm/lib/crt0.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index a9657d1..58fcd03 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -103,7 +103,7 @@ ENTRY(_main) sub r8, r8, #GD_SIZE /* new GD is below bd */ adr lr, here - ldr r0, [r8, #GD_RELOC_OFF] /* lr = gd->start_addr_sp */ + ldr r0, [r8, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ add lr, lr, r0 ldr r0, [r8, #GD_RELOCADDR] /* r0 = gd->relocaddr */ b relocate_code -- 1.7.9.5

4 10

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 10 Jun '13

10 Jun '13

Hello, The following changes since commit 10e167329b029890a4c704f094822da5f259b886: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-06-08 14:35:10 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to 68cd4a4c9f4d7be8dc95796fb567f6b03faf9d97: arm: da830: moved pinmux configurations to the arch tree (2013-06-10 08:54:46 -0400) ---------------------------------------------------------------- Andrii Tseglytskyi (2): OMAP3+: introduce generic ABB support OMAP5: add ABB setup for MPU voltage domain Balaji T K (1): mmc: omap_hsmmc: Update pbias programming Joel A Fernandes (1): am33xx: Board: Make CPSW section of ethernet initialization depend on CPSW driver Lokesh Vutla (10): ARM: OMAP4+: Cleanup header files ARM: OMAP2+: Rename asm/arch/clocks.h asm/arch/clock.h ARM: OMAP4+: pmic: Make generic bus init and write functions ARM: DRA7xx: Add control id code for DRA7xx ARM: DRA7xx: power Add support for tps659038 PMIC ARM: DRA7xx: clocks: Fixing i2c_init for PMIC ARM: DRA7xx: Do not enable srcomp for DRA7xx Soc's ARM: DRA7xx: Update pinmux data ARM: DRA7xx: clocks: Update PLL values ARM: DRA7: Add Maintainer Lubomir Popov (4): OMAP5: Fix bug in omap5_es1_prcm struct ARM: OMAP5: Power: Add more functionality to Palmas driver ARM: OMAP: I2C: New read, write and probe functions OMAP5: Enable access to auxclk registers Nishanth Menon (1): ARM: OMAP5: DRA7xx: support class 0 optimized voltages Sricharan R (5): ARM: OMAP5: clocks: Do not enable sgx clocks ARM: DRA7xx: Change the Debug UART to UART1 ARM: DRA7xx: Correct the SYS_CLK to 20MHZ ARM: DRA7xx: Correct SRAM END address ARM: DRA7xx: EMIF: Change settings required for EVM board Tom Rini (1): arm: Remove OMAP2420H4 and all omap24xx support Vishwanathrao Badarkhe, Manish (2): da830: add MMC support arm: da830: moved pinmux configurations to the arch tree MAINTAINERS | 8 +- arch/arm/cpu/arm1136/start.S | 18 - arch/arm/cpu/arm926ejs/davinci/Makefile | 1 + arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c | 151 ++++ arch/arm/cpu/armv7/omap-common/Makefile | 1 + arch/arm/cpu/armv7/omap-common/abb.c | 137 ++++ arch/arm/cpu/armv7/omap-common/clocks-common.c | 101 ++- arch/arm/cpu/armv7/omap-common/emif-common.c | 28 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 - arch/arm/cpu/armv7/omap-common/timer.c | 1 + arch/arm/cpu/armv7/omap-common/vc.c | 14 +- arch/arm/cpu/armv7/omap3/clock.c | 2 +- arch/arm/cpu/armv7/omap4/hw_data.c | 13 +- arch/arm/cpu/armv7/omap4/prcm-regs.c | 3 + arch/arm/cpu/armv7/omap5/Makefile | 1 + arch/arm/cpu/armv7/omap5/abb.c | 67 ++ arch/arm/cpu/armv7/omap5/hw_data.c | 167 ++-- arch/arm/cpu/armv7/omap5/hwinit.c | 24 +- arch/arm/cpu/armv7/omap5/prcm-regs.c | 20 + arch/arm/cpu/armv7/omap5/sdram.c | 170 +++- arch/arm/include/asm/arch-davinci/pinmux_defs.h | 15 +- arch/arm/include/asm/arch-omap24xx/bits.h | 48 -- arch/arm/include/asm/arch-omap24xx/clocks.h | 112 --- arch/arm/include/asm/arch-omap24xx/i2c.h | 68 -- arch/arm/include/asm/arch-omap24xx/mem.h | 156 ---- arch/arm/include/asm/arch-omap24xx/mux.h | 176 ---- arch/arm/include/asm/arch-omap24xx/omap2420.h | 236 ------ arch/arm/include/asm/arch-omap24xx/sys_info.h | 82 -- arch/arm/include/asm/arch-omap24xx/sys_proto.h | 54 -- .../include/asm/arch-omap3/{clocks.h => clock.h} | 0 arch/arm/include/asm/arch-omap3/omap3.h | 7 + .../include/asm/arch-omap4/{clocks.h => clock.h} | 34 +- arch/arm/include/asm/arch-omap4/cpu.h | 12 - arch/arm/include/asm/arch-omap4/omap.h | 22 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 5 +- .../include/asm/arch-omap5/{clocks.h => clock.h} | 91 +- arch/arm/include/asm/arch-omap5/cpu.h | 12 - arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 7 +- arch/arm/include/asm/arch-omap5/omap.h | 67 +- arch/arm/include/asm/arch-omap5/sys_proto.h | 7 +- arch/arm/include/asm/emif.h | 12 +- arch/arm/include/asm/omap_common.h | 59 +- arch/arm/lib/cache.c | 2 +- board/davinci/da8xxevm/da830evm.c | 155 +--- board/htkw/mcx/mcx.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 2 +- board/ti/am335x/board.c | 2 + board/ti/dra7xx/mux_data.h | 38 +- board/ti/omap2420h4/Makefile | 45 - board/ti/omap2420h4/config.mk | 28 - board/ti/omap2420h4/lowlevel_init.S | 185 ----- board/ti/omap2420h4/mem.c | 362 -------- board/ti/omap2420h4/omap2420h4.c | 867 -------------------- board/ti/omap2420h4/sys_info.c | 387 --------- board/ti/omap5_uevm/evm.c | 12 +- board/ti/panda/panda.c | 22 +- board/ti/sdp4430/sdp.c | 16 +- boards.cfg | 1 - doc/README.scrapyard | 1 + drivers/i2c/omap24xx_i2c.c | 490 ++++++----- drivers/mmc/omap_hsmmc.c | 20 +- drivers/power/palmas.c | 133 ++- drivers/serial/ns16550.c | 5 - drivers/serial/serial_ns16550.c | 5 - drivers/usb/musb/omap3.c | 4 +- include/configs/da830evm.h | 25 +- include/configs/dra7xx_evm.h | 8 +- include/configs/omap2420h4.h | 264 ------ include/configs/omap4_common.h | 4 - include/configs/omap5_common.h | 12 +- include/configs/omap5_uevm.h | 7 +- include/palmas.h | 90 +- 72 files changed, 1679 insertions(+), 3726 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c create mode 100644 arch/arm/cpu/armv7/omap-common/abb.c create mode 100644 arch/arm/cpu/armv7/omap5/abb.c delete mode 100644 arch/arm/include/asm/arch-omap24xx/bits.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/clocks.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/i2c.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/mem.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/mux.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/omap2420.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sys_info.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sys_proto.h rename arch/arm/include/asm/arch-omap3/{clocks.h => clock.h} (100%) rename arch/arm/include/asm/arch-omap4/{clocks.h => clock.h} (90%) rename arch/arm/include/asm/arch-omap5/{clocks.h => clock.h} (73%) delete mode 100644 board/ti/omap2420h4/Makefile delete mode 100644 board/ti/omap2420h4/config.mk delete mode 100644 board/ti/omap2420h4/lowlevel_init.S delete mode 100644 board/ti/omap2420h4/mem.c delete mode 100644 board/ti/omap2420h4/omap2420h4.c delete mode 100644 board/ti/omap2420h4/sys_info.c delete mode 100644 include/configs/omap2420h4.h This replaces the last pull request with the changes of: - Rebased to current u-boot-arm/master - Fix thinko in omap2420h4 removal - Drop ULPI patch for now, will pick up again later -- Tom

2 1

[U-Boot] [PATCH] arm/km: make local functions static
by Holger Brunck 10 Jun '13

10 Jun '13

Signed-off-by: Holger Brunck <holger.brunck(a)keymile.com> --- board/keymile/km_arm/km_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index eda9199..b944887 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -160,7 +160,7 @@ int ethernet_present(void) } #endif -int initialize_unit_leds(void) +static int initialize_unit_leds(void) { /* * Init the unit LEDs per default they all are @@ -181,7 +181,7 @@ int initialize_unit_leds(void) } #if defined(CONFIG_BOOTCOUNT_LIMIT) -void set_bootcount_addr(void) +static void set_bootcount_addr(void) { uchar buf[32]; unsigned int bootcountaddr; -- 1.8.0.1

2 1

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 10 Jun '13

10 Jun '13

Hello, The following changes since commit 3da0e5750b24a9491058df6126c7be577a276c09: arm: factorize relocate_code routine (2013-05-30 20:24:38 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to 80dd596d1b442ff53dbeb33eccdb8efd2283be79: arm: da830: moved pinmux configurations to the arch tree (2013-06-07 14:26:08 -0400) ---------------------------------------------------------------- Andrii Tseglytskyi (2): OMAP3+: introduce generic ABB support OMAP5: add ABB setup for MPU voltage domain Balaji T K (1): mmc: omap_hsmmc: Update pbias programming Joel A Fernandes (1): am33xx: Board: Make CPSW section of ethernet initialization depend on CPSW driver Lokesh Vutla (10): ARM: OMAP4+: Cleanup header files ARM: OMAP2+: Rename asm/arch/clocks.h asm/arch/clock.h ARM: OMAP4+: pmic: Make generic bus init and write functions ARM: DRA7xx: Add control id code for DRA7xx ARM: DRA7xx: power Add support for tps659038 PMIC ARM: DRA7xx: clocks: Fixing i2c_init for PMIC ARM: DRA7xx: Do not enable srcomp for DRA7xx Soc's ARM: DRA7xx: Update pinmux data ARM: DRA7xx: clocks: Update PLL values ARM: DRA7: Add Maintainer Lubomir Popov (4): OMAP5: Fix bug in omap5_es1_prcm struct ARM: OMAP5: Power: Add more functionality to Palmas driver ARM: OMAP: I2C: New read, write and probe functions OMAP5: Enable access to auxclk registers Michael Trimarchi (1): usb: omap: ulpi: fix ulpi transceiver access Nishanth Menon (1): ARM: OMAP5: DRA7xx: support class 0 optimized voltages Sricharan R (5): ARM: OMAP5: clocks: Do not enable sgx clocks ARM: DRA7xx: Change the Debug UART to UART1 ARM: DRA7xx: Correct the SYS_CLK to 20MHZ ARM: DRA7xx: Correct SRAM END address ARM: DRA7xx: EMIF: Change settings required for EVM board Tom Rini (4): omap-common/hwinit-common.c: Mark omap_rev_string as static am33xx: Correct NON_SECURE_SRAM_START/END am33xx/omap: Move save_omap_boot_params to omap-common/boot-common.c arm: Remove OMAP2420H4 and all omap24xx support Vishwanathrao Badarkhe, Manish (2): da830: add MMC support arm: da830: moved pinmux configurations to the arch tree MAINTAINERS | 8 +- arch/arm/cpu/arm1136/start.S | 18 - arch/arm/cpu/arm926ejs/davinci/Makefile | 1 + arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c | 151 ++++ arch/arm/cpu/armv7/omap-common/Makefile | 1 + arch/arm/cpu/armv7/omap-common/abb.c | 137 ++++ arch/arm/cpu/armv7/omap-common/boot-common.c | 39 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 101 ++- arch/arm/cpu/armv7/omap-common/emif-common.c | 28 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 40 +- arch/arm/cpu/armv7/omap-common/timer.c | 1 + arch/arm/cpu/armv7/omap-common/vc.c | 14 +- arch/arm/cpu/armv7/omap3/clock.c | 2 +- arch/arm/cpu/armv7/omap4/hw_data.c | 13 +- arch/arm/cpu/armv7/omap4/prcm-regs.c | 3 + arch/arm/cpu/armv7/omap5/Makefile | 1 + arch/arm/cpu/armv7/omap5/abb.c | 67 ++ arch/arm/cpu/armv7/omap5/hw_data.c | 167 ++-- arch/arm/cpu/armv7/omap5/hwinit.c | 24 +- arch/arm/cpu/armv7/omap5/prcm-regs.c | 20 + arch/arm/cpu/armv7/omap5/sdram.c | 170 +++- arch/arm/include/asm/arch-am33xx/omap.h | 4 +- arch/arm/include/asm/arch-am33xx/sys_proto.h | 1 + arch/arm/include/asm/arch-davinci/pinmux_defs.h | 15 +- arch/arm/include/asm/arch-omap24xx/bits.h | 48 -- arch/arm/include/asm/arch-omap24xx/clocks.h | 112 --- arch/arm/include/asm/arch-omap24xx/i2c.h | 68 -- arch/arm/include/asm/arch-omap24xx/mem.h | 156 ---- arch/arm/include/asm/arch-omap24xx/mux.h | 176 ---- arch/arm/include/asm/arch-omap24xx/omap2420.h | 236 ------ arch/arm/include/asm/arch-omap24xx/sys_info.h | 82 -- arch/arm/include/asm/arch-omap24xx/sys_proto.h | 54 -- .../include/asm/arch-omap3/{clocks.h => clock.h} | 0 arch/arm/include/asm/arch-omap3/omap3.h | 7 + .../include/asm/arch-omap4/{clocks.h => clock.h} | 34 +- arch/arm/include/asm/arch-omap4/cpu.h | 12 - arch/arm/include/asm/arch-omap4/omap.h | 22 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 6 +- .../include/asm/arch-omap5/{clocks.h => clock.h} | 91 +- arch/arm/include/asm/arch-omap5/cpu.h | 12 - arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 7 +- arch/arm/include/asm/arch-omap5/omap.h | 67 +- arch/arm/include/asm/arch-omap5/sys_proto.h | 8 +- arch/arm/include/asm/emif.h | 12 +- arch/arm/include/asm/omap_common.h | 59 +- arch/arm/lib/cache.c | 2 +- board/davinci/da8xxevm/da830evm.c | 155 +--- board/htkw/mcx/mcx.c | 2 +- board/isee/igep0033/board.c | 9 + board/phytec/pcm051/board.c | 9 + board/teejet/mt_ventoux/mt_ventoux.c | 2 +- board/ti/am335x/board.c | 11 + board/ti/dra7xx/mux_data.h | 38 +- board/ti/omap2420h4/Makefile | 45 - board/ti/omap2420h4/config.mk | 28 - board/ti/omap2420h4/lowlevel_init.S | 185 ----- board/ti/omap2420h4/mem.c | 362 -------- board/ti/omap2420h4/omap2420h4.c | 867 -------------------- board/ti/omap2420h4/sys_info.c | 387 --------- board/ti/omap5_uevm/evm.c | 12 +- board/ti/panda/panda.c | 22 +- board/ti/sdp4430/sdp.c | 16 +- board/ti/ti814x/evm.c | 9 + boards.cfg | 2 - doc/README.scrapyard | 1 + drivers/i2c/omap24xx_i2c.c | 490 ++++++----- drivers/mmc/omap_hsmmc.c | 20 +- drivers/power/palmas.c | 133 ++- drivers/serial/ns16550.c | 5 - drivers/serial/serial_ns16550.c | 5 - drivers/usb/musb/omap3.c | 4 +- drivers/usb/ulpi/omap-ulpi-viewport.c | 40 +- include/configs/am335x_evm.h | 10 +- include/configs/da830evm.h | 25 +- include/configs/dra7xx_evm.h | 8 +- include/configs/igep0033.h | 10 +- include/configs/omap2420h4.h | 264 ------ include/configs/omap4_common.h | 4 - include/configs/omap5_common.h | 12 +- include/configs/omap5_uevm.h | 7 +- include/configs/pcm051.h | 10 +- include/palmas.h | 90 +- 82 files changed, 1792 insertions(+), 3804 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c create mode 100644 arch/arm/cpu/armv7/omap-common/abb.c create mode 100644 arch/arm/cpu/armv7/omap5/abb.c delete mode 100644 arch/arm/include/asm/arch-omap24xx/bits.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/clocks.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/i2c.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/mem.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/mux.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/omap2420.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sys_info.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sys_proto.h rename arch/arm/include/asm/arch-omap3/{clocks.h => clock.h} (100%) rename arch/arm/include/asm/arch-omap4/{clocks.h => clock.h} (90%) rename arch/arm/include/asm/arch-omap5/{clocks.h => clock.h} (73%) delete mode 100644 board/ti/omap2420h4/Makefile delete mode 100644 board/ti/omap2420h4/config.mk delete mode 100644 board/ti/omap2420h4/lowlevel_init.S delete mode 100644 board/ti/omap2420h4/mem.c delete mode 100644 board/ti/omap2420h4/omap2420h4.c delete mode 100644 board/ti/omap2420h4/sys_info.c delete mode 100644 include/configs/omap2420h4.h -- Tom

5 10

[U-Boot] [PATCH] cfi_flash: Fix detection of 8-bit bus flash devices via address shift
by Jagannadha Sutradharudu Teki 10 Jun '13

10 Jun '13

We had a problem detecting 8/16bit flash devices connected only via 8bits to the SoC for quite a while. Commit 239cb9d9 [mtd: cfi_flash: Fix CFI flash driver for 8-bit bus support] finally fixed this 8-bit bus support. But also broke some other boards using this cfi driver. So this patch had to be reverted. I spotted a different, simpler approach for this 8-bit bus support on the barebox mailing list posted by Oleksij Rempel <bug-track(a)fisher-privat.net>: http://www.spinics.net/lists/u-boot-v2/msg14687.html Here the commit text: " Many cfi chips support 16 and 8 bit modes. Most important difference is use of so called "Q15/A-1" pin. In 16bit mode this pin is used for data IO. In 8bit mode, it is an address input which add one more least significant bit (LSB). In this case we should shift all adresses by one: For example 0xaa << 1 = 0x154 " This patch now is a port of this barebox patch to U-Boot. Along with the change w.r.t from barebox, Some flash chips can support multiple bus widths, override the interface width and limit it to the port width. Tested on 16-bit Spansion flash on sequoia. Tested 8-bit flashes like 256M29EW, 512M29EW. Signed-off-by: Stefan Roese <sr(a)denx.de> Tested-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- drivers/mtd/cfi_flash.c | 37 +++++++++++++++++++++++++++++++++---- include/flash.h | 2 ++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 22d8440..e23e394 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -212,7 +212,7 @@ flash_map (flash_info_t * info, flash_sect_t sect, uint offset) { unsigned int byte_offset = offset * info->portwidth; - return (void *)(info->start[sect] + byte_offset); + return (void *)(info->start[sect] + (byte_offset << info->chip_lsb)); } static inline void flash_unmap(flash_info_t *info, flash_sect_t sect, @@ -1892,12 +1892,27 @@ static int __flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry) flash_read_cfi(info, qry, FLASH_OFFSET_CFI_RESP, sizeof(struct cfi_qry)); info->interface = le16_to_cpu(qry->interface_desc); + /* Some flash chips can support multiple bus widths. + * In this case, override the interface width and + * limit it to the port width. + */ + if ((info->interface == FLASH_CFI_X8X16) && + (info->portwidth == FLASH_CFI_8BIT)) { + debug("Overriding 16-bit interface width to" + " 8-bit port width\n"); + info->interface = FLASH_CFI_X8; + } else if ((info->interface == FLASH_CFI_X16X32) && + (info->portwidth == FLASH_CFI_16BIT)) { + debug("Overriding 16-bit interface width to" + " 16-bit port width\n"); + info->interface = FLASH_CFI_X16; + } info->cfi_offset = flash_offset_cfi[cfi_offset]; debug ("device interface is %d\n", info->interface); - debug ("found port %d chip %d ", - info->portwidth, info->chipwidth); + debug("found port %d chip %d chip_lsb %d ", + info->portwidth, info->chipwidth, info->chip_lsb); debug ("port %d bits chip %d bits\n", info->portwidth << CFI_FLASH_SHIFT_WIDTH, info->chipwidth << CFI_FLASH_SHIFT_WIDTH); @@ -1937,9 +1952,23 @@ static int flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry) info->portwidth <= FLASH_CFI_64BIT; info->portwidth <<= 1) { for (info->chipwidth = FLASH_CFI_BY8; info->chipwidth <= info->portwidth; - info->chipwidth <<= 1) + info->chipwidth <<= 1) { + /* + * First, try detection without shifting the addresses + * for 8bit devices (16bit wide connection) + */ + info->chip_lsb = 0; + if (__flash_detect_cfi(info, qry)) + return 1; + + /* + * Not detected, so let's try with shifting + * for 8bit devices + */ + info->chip_lsb = 1; if (__flash_detect_cfi(info, qry)) return 1; + } } debug ("not found\n"); return 0; diff --git a/include/flash.h b/include/flash.h index c7acc97..af2fe41 100644 --- a/include/flash.h +++ b/include/flash.h @@ -38,6 +38,8 @@ typedef struct { #ifdef CONFIG_SYS_FLASH_CFI uchar portwidth; /* the width of the port */ uchar chipwidth; /* the width of the chip */ + uchar chip_lsb; /* extra Least Significant Bit in the */ + /* address of chip */ ushort buffer_size; /* # of bytes in write buffer */ ulong erase_blk_tout; /* maximum block erase timeout */ ulong write_tout; /* maximum write timeout */ -- 1.8.3

3 3

[U-Boot] [PATCH v3] usb: omap: ulpi: fix ulpi transceiver access
by Michael Trimarchi 10 Jun '13

10 Jun '13

This patch fix the omap access to the transceiver configuration registers using the ulpi bus. As reported by the documentation the bit31 is used only to check if the transaction is done or still running and the reading and writing operation have different offset and have different values. What we need to do at the end of a transaction is leave the bus in done state. Anyway an error using the ulpi omap register is not recoverable so any error give out the usage of this interface. Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Reviewed-by: Igor Grinberg <grinberg(a)compulab.co.il> --- - changes for V3 Fix patch subject - changes for V2 Fix commit message --- drivers/usb/ulpi/omap-ulpi-viewport.c | 40 +++++++-------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/drivers/usb/ulpi/omap-ulpi-viewport.c b/drivers/usb/ulpi/omap-ulpi-viewport.c index 3c1ea1a..2a42033 100644 --- a/drivers/usb/ulpi/omap-ulpi-viewport.c +++ b/drivers/usb/ulpi/omap-ulpi-viewport.c @@ -22,18 +22,19 @@ #include <asm/io.h> #include <usb/ulpi.h> -#define OMAP_ULPI_WR_OPSEL (3 << 21) -#define OMAP_ULPI_ACCESS (1 << 31) +#define OMAP_ULPI_WR_OPSEL (2 << 22) +#define OMAP_ULPI_RD_OPSEL (3 << 22) +#define OMAP_ULPI_START (1 << 31) /* - * Wait for the ULPI Access to complete + * Wait for having ulpi in done state */ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask) { int timeout = CONFIG_USB_ULPI_TIMEOUT; while (--timeout) { - if ((readl(ulpi_vp->viewport_addr) & mask)) + if (!(readl(ulpi_vp->viewport_addr) & mask)) return 0; udelay(1); @@ -43,40 +44,15 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask) } /* - * Wake the ULPI PHY up for communication - * - * returns 0 on success. - */ -static int ulpi_wakeup(struct ulpi_viewport *ulpi_vp) -{ - int err; - - if (readl(ulpi_vp->viewport_addr) & OMAP_ULPI_ACCESS) - return 0; /* already awake */ - - writel(OMAP_ULPI_ACCESS, ulpi_vp->viewport_addr); - - err = ulpi_wait(ulpi_vp, OMAP_ULPI_ACCESS); - if (err) - debug("ULPI wakeup timed out\n"); - - return err; -} - -/* * Issue a ULPI read/write request */ static int ulpi_request(struct ulpi_viewport *ulpi_vp, u32 value) { int err; - err = ulpi_wakeup(ulpi_vp); - if (err) - return err; - writel(value, ulpi_vp->viewport_addr); - err = ulpi_wait(ulpi_vp, OMAP_ULPI_ACCESS); + err = ulpi_wait(ulpi_vp, OMAP_ULPI_START); if (err) debug("ULPI request timed out\n"); @@ -85,7 +61,7 @@ static int ulpi_request(struct ulpi_viewport *ulpi_vp, u32 value) int ulpi_write(struct ulpi_viewport *ulpi_vp, u8 *reg, u32 value) { - u32 val = ((ulpi_vp->port_num & 0xf) << 24) | + u32 val = (OMAP_ULPI_START | (ulpi_vp->port_num & 0xf) << 24) | OMAP_ULPI_WR_OPSEL | ((u32)reg << 16) | (value & 0xff); return ulpi_request(ulpi_vp, val); @@ -95,7 +71,7 @@ u32 ulpi_read(struct ulpi_viewport *ulpi_vp, u8 *reg) { int err; u32 val = ((ulpi_vp->port_num & 0xf) << 24) | - OMAP_ULPI_WR_OPSEL | ((u32)reg << 16); + OMAP_ULPI_RD_OPSEL | ((u32)reg << 16); err = ulpi_request(ulpi_vp, val); if (err) -- 1.7.9.5

3 7

[U-Boot] [PATCH] video:lcd:cfb_console: cm_t35: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO
by Robert Winkler 10 Jun '13

10 Jun '13

Also change splash_screen_prepare to a weak function. Signed-off-by: Robert Winkler <robert.winkler(a)boundarydevices.com> --- board/compulab/cm_t35/cm_t35.c | 2 +- common/lcd.c | 10 ++++------ drivers/video/cfb_console.c | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index b0b80e5..95098af 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -120,7 +120,7 @@ static inline int splash_load_from_nand(void) } #endif /* CONFIG_CMD_NAND */ -int board_splash_screen_prepare(void) +int splash_screen_prepare(void) { char *env_splashimage_value; u32 bmp_load_addr; diff --git a/common/lcd.c b/common/lcd.c index edae835..90f1143 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -1069,15 +1069,13 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) #endif #ifdef CONFIG_SPLASH_SCREEN_PREPARE -static inline int splash_screen_prepare(void) -{ - return board_splash_screen_prepare(); -} -#else -static inline int splash_screen_prepare(void) +int __splash_screen_prepare(void) { return 0; } + +int splash_screen_prepare(void) + __attribute__ ((weak, alias("__splash_screen_prepare"))); #endif static void *lcd_logo(void) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 0793f07..9180998 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1966,6 +1966,16 @@ static void plot_logo_or_black(void *screen, int width, int x, int y, int black) #endif } +#ifdef CONFIG_SPLASH_SCREEN_PREPARE +int __splash_screen_prepare(void) +{ + return 0; +} + +int splash_screen_prepare(void) + __attribute__ ((weak, alias("__splash_screen_prepare"))); +#endif + static void *video_logo(void) { char info[128]; @@ -1996,6 +2006,10 @@ static void *video_logo(void) s = getenv("splashimage"); if (s != NULL) { +#ifdef CONFIG_SPLASH_SCREEN_PREPARE + splash_screen_prepare(); +#endif + addr = simple_strtoul(s, NULL, 16); -- 1.8.3

3 7