April 2013 - U-Boot

[U-Boot] [PATCH V3 3/3] OMAP5: I2C: Set I2C_BUS_MAX to 5 to enable I2C4 and I2C5
by Lubomir Popov 08 Apr '13

08 Apr '13

Signed-off-by: Lubomir Popov <lpopov(a)mm-sol.com> --- V3 consolidates this patch into a series. arch/arm/include/asm/arch-omap5/i2c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-omap5/i2c.h b/arch/arm/include/asm/arch-omap5/i2c.h index 68be03b..ec39a53 100644 --- a/arch/arm/include/asm/arch-omap5/i2c.h +++ b/arch/arm/include/asm/arch-omap5/i2c.h @@ -23,7 +23,7 @@ #ifndef _OMAP5_I2C_H_ #define _OMAP5_I2C_H_ -#define I2C_BUS_MAX 3 +#define I2C_BUS_MAX 5 #define I2C_DEFAULT_BASE I2C_BASE1 struct i2c { -- 1.7.9.5

1 0

[U-Boot] [PATCH V3 2/3] OMAP5: I2C: Add I2C4 and I2C5 bases
by Lubomir Popov 08 Apr '13

08 Apr '13

Signed-off-by: Lubomir Popov <lpopov(a)mm-sol.com> --- V3 consolidates this patch into a series. arch/arm/include/asm/arch-omap5/cpu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/asm/arch-omap5/cpu.h b/arch/arm/include/asm/arch-omap5/cpu.h index 5e62013..044ab55 100644 --- a/arch/arm/include/asm/arch-omap5/cpu.h +++ b/arch/arm/include/asm/arch-omap5/cpu.h @@ -142,6 +142,8 @@ struct watchdog { #define I2C_BASE1 (OMAP54XX_L4_PER_BASE + 0x70000) #define I2C_BASE2 (OMAP54XX_L4_PER_BASE + 0x72000) #define I2C_BASE3 (OMAP54XX_L4_PER_BASE + 0x60000) +#define I2C_BASE4 (OMAP54XX_L4_PER_BASE + 0x7A000) +#define I2C_BASE5 (OMAP54XX_L4_PER_BASE + 0x7C000) /* MUSB base */ #define MUSB_BASE (OMAP54XX_L4_CORE_BASE + 0xAB000) -- 1.7.9.5

1 0

[U-Boot] [PATCH] mx6: fsl_esdhc: Fix waiting for DMA operation completion
by Andrew Gabbasov 08 Apr '13

08 Apr '13

On iMX6 sometimes the Transfer Complete interrupt occurs earlier than the DMA part completes its operation. If immediately after that the read data is used for some data verification, those obtained data may be incomplete, which causes intermittent verification failures. For example, when the default environment command tries to load and run boot script from FAT partition on SD/MMC card, it sometimes fails, reporting invalid partition table, or unknown partition type, or something else of that kind. Such errors disappear if the build configuration has CONFIG_SYS_FSL_ESDHC_USE_PIO, or if some delay is added after transfer completion. Adding extra waiting for DMA completion after Transfer Complete event fixes this issue. Signed-off-by: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> --- drivers/mmc/fsl_esdhc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index d2a505e..806c6dd 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -402,6 +402,12 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) return COMM_ERR; } while (!(irqstat & IRQSTAT_TC) && (esdhc_read32(&regs->prsstat) & PRSSTAT_DLA)); +#ifdef CONFIG_MX6 + /* In imx6 TC (data end) interrupt sometimes occur earlier + than DMA completes. In this case just wait a little more. */ + while (!(irqstat & (IRQSTAT_DINT | IRQSTAT_DMAE))) + irqstat = esdhc_read32(&regs->irqstat); +#endif #endif } -- 1.7.10.4

6 18

[U-Boot] [PATCH] kirkwood_nand: allow usage of NAND_ECC_SOFT_BCH
by Holger Brunck 08 Apr '13

08 Apr '13

From: Gerlando Falauto <gerlando.falauto(a)keymile.com> If CONFIG_NAND_ECC_BCH is set use 4-bit error correction code instead of the 1-bit error correction code on the NAND device. Signed-off-by: Gerlando Falauto <gerlando.falauto(a)keymile.com> Signed-off-by: Holger Brunck <holger.brunck(a)keymile.com> cc: Valentin Longchamp <valentin.longchamp(a)keymile.com> cc: Prafulla Wadaskar <prafulla(a)marvell.com> --- drivers/mtd/nand/kirkwood_nand.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/kirkwood_nand.c b/drivers/mtd/nand/kirkwood_nand.c index bdab5aa..0a99a10 100644 --- a/drivers/mtd/nand/kirkwood_nand.c +++ b/drivers/mtd/nand/kirkwood_nand.c @@ -74,7 +74,11 @@ void kw_nand_select_chip(struct mtd_info *mtd, int chip) int board_nand_init(struct nand_chip *nand) { nand->options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING; +#if defined(CONFIG_NAND_ECC_BCH) + nand->ecc.mode = NAND_ECC_SOFT_BCH; +#else nand->ecc.mode = NAND_ECC_SOFT; +#endif nand->cmd_ctrl = kw_nand_hwcontrol; nand->chip_delay = 40; nand->select_chip = kw_nand_select_chip; -- 1.7.1

4 4

[U-Boot] [PATCH 0/8] ARM: Add Seagate GoFlexHome support
by Suriyan Ramasami 08 Apr '13

08 Apr '13

Most of the files except goflexhomemenu.c are direct copies of the dockstar files with minor modifications. goflexhomemenu.c has code which uses the menu functionality of u-boot and present the user with an option to choose the various bootable options. Suriyan Ramasami (8): Add Seagate GoFlexHome support Add Seagate GoFlexHome support Add Seagate GoFlexHome support Add Seagate GoFlexHome support Add Seagate GoFlexHome support Add Seagate GoFlexHome support Add Seagate GoFlexHome support Add Seagate GoFlexHome support MAINTAINERS | 4 + board/Seagate/goflexhome/Makefile | 51 ++++ board/Seagate/goflexhome/goflexhome.c | 187 ++++++++++++++ board/Seagate/goflexhome/goflexhome.h | 50 ++++ board/Seagate/goflexhome/goflexhomemenu.c | 381 +++++++++++++++++++++++++++++ board/Seagate/goflexhome/kwbimage.cfg | 168 +++++++++++++ boards.cfg | 1 + include/configs/goflexhome.h | 140 +++++++++++ 8 files changed, 982 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/Makefile create mode 100644 board/Seagate/goflexhome/goflexhome.c create mode 100644 board/Seagate/goflexhome/goflexhome.h create mode 100644 board/Seagate/goflexhome/goflexhomemenu.c create mode 100644 board/Seagate/goflexhome/kwbimage.cfg create mode 100644 include/configs/goflexhome.h

3 10

[U-Boot] [PATCH v2 0/9] Introduce Samsung's new board Trats2
by Piotr Wilczek 08 Apr '13

08 Apr '13

This patchset add support for a new Samsung board Trats2 This patchset depends on: commit: 8faefadb7305b95d02df38bd2ea61429d59483e5 Author: Marc Dietrich <marvin24(a)gmx.de> 2013-03-29 08:57:10 disk: fix unaligned access in efi partitions Changes in v2: - removed lcd callback in panel_info - changed i2c from hardware to software - use max77693 multifunction pmic - several new patches Piotr Wilczek (9): pmic:max77686: add function to set voltage and mode drivers:power:max77693: add support for new multi function pmic max77693 arm:exynos:gpio: fix s5p_gpio_part_max for exynos4x12 i2c:multi_i2c: add new macros I2C_7 and I2C_10 power: fix pmic command drivers:video:s6e8ax0: change data_to_send array to static drivers:lcd: fix unaligned access on lcd samsung: trats2: add support for new board Trats2 Add a maintainer entry for the Trats2 board. MAINTAINERS | 4 + Makefile | 1 + arch/arm/include/asm/arch-exynos/gpio.h | 17 +- board/samsung/common/multi_i2c.c | 21 ++ board/samsung/trats2/Makefile | 50 +++ board/samsung/trats2/trats2.c | 527 +++++++++++++++++++++++++++++++ boards.cfg | 1 + common/lcd.c | 11 +- drivers/power/battery/Makefile | 1 + drivers/power/battery/bat_trats2.c | 81 +++++ drivers/power/mfd/Makefile | 49 +++ drivers/power/mfd/fg_max77693.c | 141 +++++++++ drivers/power/mfd/muic_max77693.c | 91 ++++++ drivers/power/mfd/pmic_max77693.c | 110 +++++++ drivers/power/pmic/pmic_max77686.c | 186 +++++++++++ drivers/power/power_core.c | 2 + drivers/video/s6e8ax0.c | 26 +- include/configs/trats2.h | 309 ++++++++++++++++++ include/power/max77686_pmic.h | 11 + include/power/max77693_fg.h | 65 ++++ include/power/max77693_muic.h | 90 ++++++ include/power/max77693_pmic.h | 56 ++++ 22 files changed, 1828 insertions(+), 22 deletions(-) create mode 100644 board/samsung/trats2/Makefile create mode 100644 board/samsung/trats2/trats2.c create mode 100644 drivers/power/battery/bat_trats2.c create mode 100644 drivers/power/mfd/Makefile create mode 100644 drivers/power/mfd/fg_max77693.c create mode 100644 drivers/power/mfd/muic_max77693.c create mode 100644 drivers/power/mfd/pmic_max77693.c create mode 100644 include/configs/trats2.h create mode 100644 include/power/max77693_fg.h create mode 100644 include/power/max77693_muic.h create mode 100644 include/power/max77693_pmic.h -- 1.7.9.5

4 14

[U-Boot] u-boot boot process is broken, how do i recover?
by JPT 07 Apr '13

07 Apr '13

Hi, I've got a readynas and successfully installed a recent kernel into ROM and Debian onto hard-drive. But when I tried to modify the uboot-env from uboot-console I had trouble with the ; in the vars. And did not know how to escape. So I tried to access uboot-env from linux. I applied something like this (well, not that straight forward) /etc/fw_env.config # device offset size Flash sector size Number of sectors /dev/mtd1 0x0 0x20000 0x20000 1 Maybe there is something wrong in my config? apt-get install uboot-envtools fw_printenv bootcmd fw_setenv bootcmd.bak 'nand read.e 0x1200000 0x200000 0x600000;nand read.e 0x2000000 0x800000 0x1000000;bootm 0x1200000 0x2000000' fw_setenv bootcmd 'nand read.e 0x1200000 0x200000 0x600000;bootm 0x1200000' fw_printenv bootcmd.bak bootcmd fw_printenv bootargs fw_setenv bootargs.bak 'console=ttyS0,115200 reason=normal mtdparts=nand_mtd:0x180000@0(u-boot),0x20000@0x180000(u-boot-env),0x600000@0x200000(uImage),0x1000000@0x800000(minirootfs),0x6800000@0x1800000(jffs2)' fw_setenv bootargs 'console=ttyS0,115200 root=/dev/sda3 mtdparts=nand_mtd:0x180000@0(u-boot),0x20000@0x180000(u-boot-env),0x600000@0x200000(uImage),0x1000000@0x800000(minirootfs),0x6800000@0x1800000(jffs2)' fw_printenv bootargs.bak bootargs btw, kernel said: Creating 5 MTD partitions on "nand_mtd": 0x000000000000-0x000000180000 : "u-boot" 0x000000180000-0x0000001a0000 : "u-boot-env" 0x000000200000-0x000000800000 : "uImage" 0x000000800000-0x000001800000 : "minirootfs" 0x000001800000-0x000008000000 : "jffs2" Now the boot process is broken. I don't understand why. It stops right after the network (see below). Usually the boot countdown should appear afterwards. Is there anything I can do except unsoldering the ROM? If I have to remove the chip and burn it using an external writer... Is there any way to buy similar chip which can be mounted on a socket? It's a H27U1G8F2BTR-BC (newer version of HY27UF081G2B-TCB) which is NAND flash, 2,7-3,6V, 1Gbitx8 (128 MiB), SLC Single Die + Large Block, TSOP 48 pin. There is also a FBGA 63 PIN available. are there any sockets for FBGA I can solder to TSOP? Or do other manufacturers offer compatible chips which can be applied to a socket? thanks for any help! Jan __ __ _ _ | \/ | __ _ _ ____ _____| | | | |\/| |/ _` | '__\ \ / / _ \ | | | | | | (_| | | \ V / __/ | | |_| |_|\__,_|_| \_/ \___|_|_| _ _ ____ _ | | | | | __ ) ___ ___ | |_ | | | |___| _ \ / _ \ / _ \| __| | |_| |___| |_) | (_) | (_) | |_ \___/ |____/ \___/ \___/ \__| ** MARVELL BOARD: DB-88F6282A-BP LE U-Boot 1.1.4 (Feb 6 2012 - 14:40:46) Marvell version: 3.4.27 Netgear version: Uboot-1_1_4-NetgearDUOV3-V1008 U-Boot code: 00600000 -> 0067FFF0 BSS: -> 006D0120 Soc: MV88F1155 Rev 1 (DDR3) CPU running @ 1600Mhz L2 running @ 533Mhz SysClock = 533Mhz , TClock = 200Mhz DRAM unknown CAL tRP = 8 tRAS = 20 tRCD=8 DRAM CS[0] base 0x00000000 size 256MB DRAM Total size 256MB 16bit width Addresses 8M - 0M are saved for the U-Boot usage. Mem malloc Initialization (8M - 7M): Done NAND:128 MB Flash: 0 kB CPU : Marvell Feroceon (Rev 1) Streaming disabled Write allocate disabled USB 0: host mode PEX 0: PCI Express Root Complex Interface PEX interface detected Link X1 Switch On ! Net: egiga0 [PRIME]

3 9

Re: [U-Boot] [PATCH] VGA text console support
by Wolfgang Denk 07 Apr '13

07 Apr '13

Dear Vladimir 'φ-coder/phcoder' Serbinenko, I wrote: > I cannot comment on the actual technical content of your patches, but > here are a few formal comments; I highly recommend to study > http://www.denx.de/wiki/U-Boot/Patches ... Oops. Sent to quickly. Please ALWAYS make sure to run your patches through checkpatch - ther are a number of issues with your coding style: ERROR: that open brace { should be on the previous line #147: FILE: drivers/video/cfb_console.c:453: + if (vga_text) + { ERROR: that open brace { should be on the previous line #151: FILE: drivers/video/cfb_console.c:457: + while (count--) + { WARNING: line over 80 characters #153: FILE: drivers/video/cfb_console.c:459: + ((uint16_t *)video_fb_address) [yy * 80 + xx] = 0x700 | *s++; ERROR: space prohibited before open square bracket '[' #153: FILE: drivers/video/cfb_console.c:459: + ((uint16_t *)video_fb_address) [yy * 80 + xx] = 0x700 | *s++; WARNING: space prohibited between function name and open parenthesis '(' #167: FILE: drivers/video/cfb_console.c:660: +cr_write (uint8_t val, uint8_t addr) WARNING: please, no spaces at the start of a line #169: FILE: drivers/video/cfb_console.c:662: + outb (addr, 0x3d4);$ WARNING: space prohibited between function name and open parenthesis '(' #169: FILE: drivers/video/cfb_console.c:662: + outb (addr, 0x3d4); WARNING: please, no spaces at the start of a line #170: FILE: drivers/video/cfb_console.c:663: + outb (val, 0x3d5);$ WARNING: space prohibited between function name and open parenthesis '(' #170: FILE: drivers/video/cfb_console.c:663: + outb (val, 0x3d5); WARNING: space prohibited between function name and open parenthesis '(' #174: FILE: drivers/video/cfb_console.c:667: +cr_read (uint8_t addr) WARNING: please, no spaces at the start of a line #176: FILE: drivers/video/cfb_console.c:669: + outb (addr, 0x3d4);$ WARNING: space prohibited between function name and open parenthesis '(' #176: FILE: drivers/video/cfb_console.c:669: + outb (addr, 0x3d4); WARNING: please, no spaces at the start of a line #177: FILE: drivers/video/cfb_console.c:670: + return inb (0x3d5);$ WARNING: space prohibited between function name and open parenthesis '(' #177: FILE: drivers/video/cfb_console.c:670: + return inb (0x3d5); ERROR: that open brace { should be on the previous line #187: FILE: drivers/video/cfb_console.c:696: + if (vga_text) + { WARNING: space prohibited between function name and open parenthesis '(' #191: FILE: drivers/video/cfb_console.c:700: + old = cr_read (0x0a); WARNING: space prohibited between function name and open parenthesis '(' #193: FILE: drivers/video/cfb_console.c:702: + cr_write (old & ~0x20, 0x0a); WARNING: space prohibited between function name and open parenthesis '(' #195: FILE: drivers/video/cfb_console.c:704: + cr_write (old | 0x20, 0x0a); WARNING: space prohibited between function name and open parenthesis '(' #197: FILE: drivers/video/cfb_console.c:706: + cr_write (pos >> 8, 0x0e); WARNING: space prohibited between function name and open parenthesis '(' #198: FILE: drivers/video/cfb_console.c:707: + cr_write (pos & 0xFF, 0x0f); ERROR: that open brace { should be on the previous line #210: FILE: drivers/video/cfb_console.c:749: + if (vga_text) + { ERROR: that open brace { should be on the previous line #215: FILE: drivers/video/cfb_console.c:754: + for (; begin < end; begin++) + { WARNING: line over 80 characters #217: FILE: drivers/video/cfb_console.c:756: + ((uint16_t *)video_fb_address) [line * 80 + begin] = 0x700 | ' '; ERROR: space prohibited before open square bracket '[' #217: FILE: drivers/video/cfb_console.c:756: + ((uint16_t *)video_fb_address) [line * 80 + begin] = 0x700 | ' '; ERROR: that open brace { should be on the previous line #229: FILE: drivers/video/cfb_console.c:799: + if (vga_text) + { WARNING: line over 80 characters #232: FILE: drivers/video/cfb_console.c:802: + memcpyl(video_fb_address, ((int32_t *)video_fb_address) + 80 / 2, WARNING: line over 80 characters #235: FILE: drivers/video/cfb_console.c:805: + ((uint16_t *)video_fb_address) [24 * 80 + i] = 0x700 | ' '; ERROR: space prohibited before open square bracket '[' #235: FILE: drivers/video/cfb_console.c:805: + ((uint16_t *)video_fb_address) [24 * 80 + i] = 0x700 | ' '; ERROR: that open brace { should be on the previous line #245: FILE: drivers/video/cfb_console.c:845: + if (vga_text) + { ERROR: space prohibited before open square bracket '[' #249: FILE: drivers/video/cfb_console.c:849: + ((uint16_t *)video_fb_address) [i] = 0x700 | ' '; ERROR: that open brace { should be on the previous line #280: FILE: drivers/video/cfb_console.c:2193: if (pGD == NULL) + { WARNING: Avoid CamelCase: <pGD->frameAdrs> #295: FILE: drivers/video/cfb_console.c:2207: + video_fb_address = (void *) pGD->frameAdrs; WARNING: Avoid CamelCase: <pGD->winSizeY> #296: FILE: drivers/video/cfb_console.c:2208: + VIDEO_VISIBLE_ROWS = pGD->winSizeY; WARNING: Avoid CamelCase: <pGD->winSizeX> #297: FILE: drivers/video/cfb_console.c:2209: + VIDEO_VISIBLE_COLS = pGD->winSizeX; WARNING: Avoid CamelCase: <pGD->gdfBytesPP> #298: FILE: drivers/video/cfb_console.c:2210: + VIDEO_PIXEL_SIZE = (pGD->gdfBytesPP); ERROR: that open brace { should be on the previous line #309: FILE: drivers/video/cfb_console.c:2392: + if (vga_text) + { ERROR: space prohibited before open square bracket '[' #313: FILE: drivers/video/cfb_console.c:2396: + ((uint16_t *)video_fb_address) [i] = 0x700 | ' '; ERROR: Missing Signed-off-by: line(s) total: 15 errors, 23 warnings, 188 lines checked /tmp/patch has style problems, please review. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de It took him several minutes to understand any new idea put to him, and this is a very valuable trait in a leader, because anything any- one is still trying to explain to you after two minutes is probably important and anything they give up after a mere minute or so is al- most certainly something they shouldn't have been bothering you with in the first place. - Terry Pratchett, _Reaper Man_

1 0

[U-Boot] [PATCH v1] blackfin: Move blackfin serial driver out of blackfin arch folder.
by Sonic Zhang 07 Apr '13

07 Apr '13

From: Sonic Zhang <sonic.zhang(a)analog.com> - Move blackfin serial driver to the generic driver folder. - Move blackfin serial headers to blackfin arch head folder. - Update the include path to blackfin serial header in start up code. Signed-off-by: Sonic Zhang <sonic.zhang(a)analog.com> --- arch/blackfin/cpu/Makefile | 1 - arch/blackfin/cpu/cpu.c | 2 +- arch/blackfin/cpu/initcode.c | 5 ++--- arch/blackfin/cpu/start.S | 3 +-- arch/blackfin/{cpu => include/asm}/serial.h | 0 arch/blackfin/{cpu => include/asm}/serial1.h | 0 arch/blackfin/{cpu => include/asm}/serial4.h | 0 drivers/serial/Makefile | 1 + .../cpu/serial.c => drivers/serial/serial_bfin.c | 3 +-- include/configs/bfin_adi_common.h | 3 +++ 10 files changed, 9 insertions(+), 9 deletions(-) rename arch/blackfin/{cpu => include/asm}/serial.h (100%) rename arch/blackfin/{cpu => include/asm}/serial1.h (100%) rename arch/blackfin/{cpu => include/asm}/serial4.h (100%) rename arch/blackfin/cpu/serial.c => drivers/serial/serial_bfin.c (99%) diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index 145f63e..929fc8b 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -23,7 +23,6 @@ COBJS-y += interrupts.o COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o COBJS-y += os_log.o COBJS-y += reset.o -COBJS-y += serial.o COBJS-y += traps.o SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c) diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c index d841f64..218f57e 100644 --- a/arch/blackfin/cpu/cpu.c +++ b/arch/blackfin/cpu/cpu.c @@ -16,9 +16,9 @@ #include <asm/mach-common/bits/core.h> #include <asm/mach-common/bits/ebiu.h> #include <asm/mach-common/bits/trace.h> +#include <asm/serial.h> #include "cpu.h" -#include "serial.h" #include "initcode.h" ulong bfin_poweron_retx; diff --git a/arch/blackfin/cpu/initcode.c b/arch/blackfin/cpu/initcode.c index 8ef0b92..8147943 100644 --- a/arch/blackfin/cpu/initcode.c +++ b/arch/blackfin/cpu/initcode.c @@ -15,10 +15,9 @@ #include <asm/blackfin.h> #include <asm/mach-common/bits/bootrom.h> #include <asm/mach-common/bits/core.h> +#include <asm/serial.h> -#define BUG() while (1) { asm volatile("emuexcpt;"); } - -#include "serial.h" +#define BUG() while (1) asm volatile("emuexcpt;"); #ifndef __ADSPBF60x__ #include <asm/mach-common/bits/ebiu.h> diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S index 32b3ec7..63bffb4 100644 --- a/arch/blackfin/cpu/start.S +++ b/arch/blackfin/cpu/start.S @@ -34,8 +34,7 @@ #include <asm/blackfin.h> #include <asm/mach-common/bits/core.h> #include <asm/mach-common/bits/pll.h> - -#include "serial.h" +#include <asm/serial.h> /* It may seem odd that we make calls to functions even though we haven't * relocated ourselves yet out of {flash,ram,wherever}. This is OK because diff --git a/arch/blackfin/cpu/serial.h b/arch/blackfin/include/asm/serial.h similarity index 100% rename from arch/blackfin/cpu/serial.h rename to arch/blackfin/include/asm/serial.h diff --git a/arch/blackfin/cpu/serial1.h b/arch/blackfin/include/asm/serial1.h similarity index 100% rename from arch/blackfin/cpu/serial1.h rename to arch/blackfin/include/asm/serial1.h diff --git a/arch/blackfin/cpu/serial4.h b/arch/blackfin/include/asm/serial4.h similarity index 100% rename from arch/blackfin/cpu/serial4.h rename to arch/blackfin/include/asm/serial4.h diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 5e8b648..f56fcd9 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -54,6 +54,7 @@ COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o COBJS-$(CONFIG_SANDBOX_SERIAL) += sandbox.o COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o COBJS-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o +COBJS-$(CONFIG_BFIN_SERIAL) += serial_bfin.o ifndef CONFIG_SPL_BUILD COBJS-$(CONFIG_USB_TTY) += usbtty.o diff --git a/arch/blackfin/cpu/serial.c b/drivers/serial/serial_bfin.c similarity index 99% rename from arch/blackfin/cpu/serial.c rename to drivers/serial/serial_bfin.c index c453a03..0443b84 100644 --- a/arch/blackfin/cpu/serial.c +++ b/drivers/serial/serial_bfin.c @@ -43,13 +43,12 @@ #include <serial.h> #include <linux/compiler.h> #include <asm/blackfin.h> +#include <asm/serial.h> DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_UART_CONSOLE -#include "serial.h" - #ifdef CONFIG_DEBUG_SERIAL static uart_lsr_t cached_lsr[256]; static uart_lsr_t cached_rbr[256]; diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 0bcccf8..c751dd7 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -111,6 +111,9 @@ #ifndef CONFIG_BAUDRATE # define CONFIG_BAUDRATE 57600 #endif +#ifdef CONFIG_UART_CONSOLE +# define CONFIG_BFIN_SERIAL +#endif /* * Debug Settings -- 1.7.0.4

1 0

[U-Boot] [PATCH v1] blackfin: Move blackfin watchdog driver out of the blackfin arch folder.
by Sonic Zhang 07 Apr '13

07 Apr '13

From: Sonic Zhang <sonic.zhang(a)analog.com> - Enable hw_watchdog_init() in watchdog.h if CONFIG_HW_WATCHDOG is defined. - Move blackfin hw watchdog driver to the generic driver folder. - Call hw_watchdog_init() from blackfin board init code. - Reuse macro CONFIG_WATCHDOG_TIMEOUT_MSECS - Update README.watchdog accordingly Signed-off-by: Sonic Zhang <sonic.zhang(a)analog.com> --- arch/blackfin/cpu/Makefile | 1 - arch/blackfin/cpu/start.S | 13 ++++++------- arch/blackfin/lib/board.c | 4 ++-- doc/README.watchdog | 3 +++ drivers/watchdog/Makefile | 1 + .../cpu/watchdog.c => drivers/watchdog/bfin_wdt.c | 2 +- include/configs/bfin_adi_common.h | 6 ++++++ include/watchdog.h | 3 +-- 8 files changed, 20 insertions(+), 13 deletions(-) rename arch/blackfin/cpu/watchdog.c => drivers/watchdog/bfin_wdt.c (83%) diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index 0a72ec5..145f63e 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -25,7 +25,6 @@ COBJS-y += os_log.o COBJS-y += reset.o COBJS-y += serial.o COBJS-y += traps.o -COBJS-$(CONFIG_HW_WATCHDOG) += watchdog.o SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS)) diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S index 7155fc8..32b3ec7 100644 --- a/arch/blackfin/cpu/start.S +++ b/arch/blackfin/cpu/start.S @@ -65,20 +65,19 @@ ENTRY(_start) p5.h = HI(COREMMR_BASE); #ifdef CONFIG_HW_WATCHDOG -#ifndef __ADSPBF60x__ -# ifndef CONFIG_HW_WATCHDOG_TIMEOUT_START -# define CONFIG_HW_WATCHDOG_TIMEOUT_START 5000 -# endif - /* Program the watchdog with an initial timeout of ~5 seconds. + /* Program the watchdog with default timeout of ~5 seconds. * That should be long enough to bootstrap ourselves up and * then the common u-boot code can take over. */ r0 = 0; - r0.h = HI(MSEC_TO_SCLK(CONFIG_HW_WATCHDOG_TIMEOUT_START)); + r0.h = HI(MSEC_TO_SCLK(CONFIG_WATCHDOG_TIMEOUT_MSECS)); [p4 + (WDOG_CNT - SYSMMR_BASE)] = r0; /* fire up the watchdog - R0.L above needs to be 0x0000 */ +# ifdef __ADSPBF60x__ + [p4 + (WDOG_CTL - SYSMMR_BASE)] = r0; +# else W[p4 + (WDOG_CTL - SYSMMR_BASE)] = r0; -#endif +# endif #endif /* Turn on the serial for debugging the init process */ diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index c1e14e2..99970e1 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -279,9 +279,9 @@ void board_init_f(ulong bootflag) dcache_enable(); #endif -#ifdef CONFIG_WATCHDOG +#ifdef CONFIG_HW_WATCHDOG serial_early_puts("Setting up external watchdog\n"); - watchdog_init(); + hw_watchdog_init(); #endif #ifdef DEBUG diff --git a/doc/README.watchdog b/doc/README.watchdog index ee65008..f2a9d26 100644 --- a/doc/README.watchdog +++ b/doc/README.watchdog @@ -27,3 +27,6 @@ CONFIG_IMX_WATCHDOG Available for i.mx31/35/5x/6x to service the watchdog. This is not automatically set because some boards (vision2) still need to define their own hw_watchdog_reset routine. + +CONFIG_BFIN_WATCHDOG + Available for bf5xx and bf6xx to service the watchdog. diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index b1f4e0f..1da3d75 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -32,6 +32,7 @@ COBJS-y += imx_watchdog.o endif COBJS-$(CONFIG_TNETV107X_WATCHDOG) += tnetv107x_wdt.o COBJS-$(CONFIG_S5P) += s5p_wdt.o +COBJS-$(CONFIG_BFIN_WATCHDOG) += bfin_wdt.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/arch/blackfin/cpu/watchdog.c b/drivers/watchdog/bfin_wdt.c similarity index 83% rename from arch/blackfin/cpu/watchdog.c rename to drivers/watchdog/bfin_wdt.c index 1886bda..2101f6e 100644 --- a/arch/blackfin/cpu/watchdog.c +++ b/drivers/watchdog/bfin_wdt.c @@ -17,7 +17,7 @@ void hw_watchdog_reset(void) void hw_watchdog_init(void) { - bfin_write_WDOG_CNT(5 * get_sclk()); /* 5 second timeout */ + bfin_write_WDOG_CNT(CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000 * get_sclk()); hw_watchdog_reset(); bfin_write_WDOG_CTL(0x0); } diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index c986ba3..0bcccf8 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -314,5 +314,11 @@ #define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */ #define CONFIG_LZMA #define CONFIG_MONITOR_IS_IN_RAM +#ifdef CONFIG_HW_WATCHDOG +# define CONFIG_BFIN_WATCHDOG +# ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS +# define CONFIG_WATCHDOG_TIMEOUT_MSECS 5000 +# endif +#endif #endif diff --git a/include/watchdog.h b/include/watchdog.h index 8c92a0b..f821edc 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -90,8 +90,7 @@ void reset_4xx_watchdog(void); #endif -/* Freescale i.MX */ -#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__) +#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__) void hw_watchdog_init(void); #endif #endif /* _WATCHDOG_H_ */ -- 1.7.0.4

1 0