March 2015 - U-Boot

[U-Boot] [PATCH 1/1] ARM: mxs: get boot mode from OTP
by Jörg Krause 26 Mar '15

26 Mar '15

Reading the GPIOs for getting the boot mode does not show the correct result for USB boot mode in case the recovery switch, eg. BM2 for switching from NAND to USB boot mode, is hold down while plugging in USB and released before U-Boot is loaded by mxsldr. This state is stored in the HW_OCOTP_ROM0 register. HW_OCOTP_ROM0[27:24] maps to BM3-BM0, HW_OCOTP_ROM0[28] maps to voltage selector. For using mxs_wait_mask_clr() add imx-common/misc.o to the SPL build. Signed-off-by: Jörg Krause <joerg.krause(a)embedded.rocks> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/Makefile | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 73 +++++------------------------- arch/arm/include/asm/arch-mxs/regs-ocotp.h | 2 + drivers/misc/mxs_ocotp.c | 2 - 4 files changed, 14 insertions(+), 65 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08946de..55fe509 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -37,7 +37,7 @@ libs-y += arch/arm/cpu/ libs-y += arch/arm/lib/ ifeq ($(CONFIG_SPL_BUILD),y) -ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35)) +ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs)) libs-y += arch/arm/imx-common/ endif else diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index d7956e5..c5bf3c4 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -40,73 +40,22 @@ void early_delay(int delay) ; } -#define MUX_CONFIG_BOOTMODE_PAD (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL) -static const iomux_cfg_t iomux_boot[] = { -#if defined(CONFIG_MX23) - MX23_PAD_LCD_D00__GPIO_1_0 | MUX_CONFIG_BOOTMODE_PAD, - MX23_PAD_LCD_D01__GPIO_1_1 | MUX_CONFIG_BOOTMODE_PAD, - MX23_PAD_LCD_D02__GPIO_1_2 | MUX_CONFIG_BOOTMODE_PAD, - MX23_PAD_LCD_D03__GPIO_1_3 | MUX_CONFIG_BOOTMODE_PAD, - MX23_PAD_LCD_D04__GPIO_1_4 | MUX_CONFIG_BOOTMODE_PAD, - MX23_PAD_LCD_D05__GPIO_1_5 | MUX_CONFIG_BOOTMODE_PAD, -#elif defined(CONFIG_MX28) - MX28_PAD_LCD_D00__GPIO_1_0 | MUX_CONFIG_BOOTMODE_PAD, - MX28_PAD_LCD_D01__GPIO_1_1 | MUX_CONFIG_BOOTMODE_PAD, - MX28_PAD_LCD_D02__GPIO_1_2 | MUX_CONFIG_BOOTMODE_PAD, - MX28_PAD_LCD_D03__GPIO_1_3 | MUX_CONFIG_BOOTMODE_PAD, - MX28_PAD_LCD_D04__GPIO_1_4 | MUX_CONFIG_BOOTMODE_PAD, - MX28_PAD_LCD_D05__GPIO_1_5 | MUX_CONFIG_BOOTMODE_PAD, -#endif -}; - static uint8_t mxs_get_bootmode_index(void) { - uint8_t bootmode = 0; - int i; - uint8_t masked; - - /* Setup IOMUX of bootmode pads to GPIO */ - mxs_iomux_setup_multiple_pads(iomux_boot, ARRAY_SIZE(iomux_boot)); - -#if defined(CONFIG_MX23) - /* Setup bootmode pins as GPIO input */ - gpio_direction_input(MX23_PAD_LCD_D00__GPIO_1_0); - gpio_direction_input(MX23_PAD_LCD_D01__GPIO_1_1); - gpio_direction_input(MX23_PAD_LCD_D02__GPIO_1_2); - gpio_direction_input(MX23_PAD_LCD_D03__GPIO_1_3); - gpio_direction_input(MX23_PAD_LCD_D05__GPIO_1_5); - - /* Read bootmode pads */ - bootmode |= (gpio_get_value(MX23_PAD_LCD_D00__GPIO_1_0) ? 1 : 0) << 0; - bootmode |= (gpio_get_value(MX23_PAD_LCD_D01__GPIO_1_1) ? 1 : 0) << 1; - bootmode |= (gpio_get_value(MX23_PAD_LCD_D02__GPIO_1_2) ? 1 : 0) << 2; - bootmode |= (gpio_get_value(MX23_PAD_LCD_D03__GPIO_1_3) ? 1 : 0) << 3; - bootmode |= (gpio_get_value(MX23_PAD_LCD_D05__GPIO_1_5) ? 1 : 0) << 5; -#elif defined(CONFIG_MX28) - /* Setup bootmode pins as GPIO input */ - gpio_direction_input(MX28_PAD_LCD_D00__GPIO_1_0); - gpio_direction_input(MX28_PAD_LCD_D01__GPIO_1_1); - gpio_direction_input(MX28_PAD_LCD_D02__GPIO_1_2); - gpio_direction_input(MX28_PAD_LCD_D03__GPIO_1_3); - gpio_direction_input(MX28_PAD_LCD_D04__GPIO_1_4); - gpio_direction_input(MX28_PAD_LCD_D05__GPIO_1_5); - - /* Read bootmode pads */ - bootmode |= (gpio_get_value(MX28_PAD_LCD_D00__GPIO_1_0) ? 1 : 0) << 0; - bootmode |= (gpio_get_value(MX28_PAD_LCD_D01__GPIO_1_1) ? 1 : 0) << 1; - bootmode |= (gpio_get_value(MX28_PAD_LCD_D02__GPIO_1_2) ? 1 : 0) << 2; - bootmode |= (gpio_get_value(MX28_PAD_LCD_D03__GPIO_1_3) ? 1 : 0) << 3; - bootmode |= (gpio_get_value(MX28_PAD_LCD_D04__GPIO_1_4) ? 1 : 0) << 4; - bootmode |= (gpio_get_value(MX28_PAD_LCD_D05__GPIO_1_5) ? 1 : 0) << 5; -#endif + struct mxs_ocotp_regs *ocotp_regs = + (struct mxs_ocotp_regs *)MXS_OCOTP_BASE; + uint32_t data; + + writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set); - for (i = 0; i < ARRAY_SIZE(mxs_boot_modes); i++) { - masked = bootmode & mxs_boot_modes[i].boot_mask; - if (masked == mxs_boot_modes[i].boot_pads) - break; + if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY, + MXS_OCOTP_TIMEOUT)) { + printf("MXS: Can't get boot mode from OCOTP\n"); + return 0; } - return i; + data = readl(&ocotp_regs->hw_ocotp_rom0) >> 24; + return (uint8_t) data; } static void mxs_spl_fixup_vectors(void) diff --git a/arch/arm/include/asm/arch-mxs/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h index bd80ac7..9057dc1 100644 --- a/arch/arm/include/asm/arch-mxs/regs-ocotp.h +++ b/arch/arm/include/asm/arch-mxs/regs-ocotp.h @@ -63,6 +63,8 @@ struct mxs_ocotp_regs { }; #endif +#define MXS_OCOTP_TIMEOUT 100000 + #define OCOTP_CTRL_WR_UNLOCK_MASK (0xffff << 16) #define OCOTP_CTRL_WR_UNLOCK_OFFSET 16 #define OCOTP_CTRL_WR_UNLOCK_KEY (0x3e77 << 16) diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c index 6f0a1d3..6ef4f92 100644 --- a/drivers/misc/mxs_ocotp.c +++ b/drivers/misc/mxs_ocotp.c @@ -20,8 +20,6 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> -#define MXS_OCOTP_TIMEOUT 100000 - static struct mxs_ocotp_regs *ocotp_regs = (struct mxs_ocotp_regs *)MXS_OCOTP_BASE; static struct mxs_power_regs *power_regs = -- 2.3.4

2 3

[U-Boot] [PATCH v2] ARM: tegra: update colibri_t20 configuration
by Marcel Ziswiler 26 Mar '15

26 Mar '15

Bring the Colibri T20 configuration in-line with Apalis/Colibri T30. Signed-off-by: Marcel Ziswiler <marcel(a)ziswiler.com> --- Changes in v2: - added my previously missing signed-off-by include/configs/colibri_t20.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index e80e9ed..c17f245 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -14,9 +14,12 @@ #define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20" /* Board-specific serial config */ +#define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_SDIO1 -#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE +#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE + +#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T20 /* SD/MMC support */ #define CONFIG_MMC @@ -29,17 +32,17 @@ #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_ULPI #define CONFIG_USB_ULPI_VIEWPORT -#define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 +#define CONFIG_USB_STORAGE #define CONFIG_CMD_USB /* USB networking support */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX + +/* General networking support */ #define CONFIG_CMD_NET #define CONFIG_CMD_DHCP -#define CONFIG_CMD_NFS -#define CONFIG_CMD_PING /* NAND support */ #define CONFIG_CMD_NAND @@ -56,6 +59,26 @@ #define CONFIG_CMD_BDI #define CONFIG_CMD_CACHE +/* Miscellaneous commands */ +#define CONFIG_CMD_SETEXPR +#define CONFIG_FAT_WRITE + +/* Increase console I/O buffer size */ +#undef CONFIG_SYS_CBSIZE +#define CONFIG_SYS_CBSIZE 1024 + +/* Increase arguments buffer size */ +#undef CONFIG_SYS_BARGSIZE +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +/* Increase print buffer size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) + +/* Increase maximum number of arguments */ +#undef CONFIG_SYS_MAXARGS +#define CONFIG_SYS_MAXARGS 32 + +#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ -- 1.9.3

2 2

[U-Boot] [PATCH v2 0/4] common/lcd_console: introduce display/framebuffer rotation
by Hannes Petermaier 26 Mar '15

26 Mar '15

Sometimes, for example if the display is mounted in portrait mode or even if it mounted landscape but rotated by 180 degree, we need to rotate our content of the display respectively the framebuffer, so that user can read the messages who are printed out. For this we introduce the feature called "CONFIG_LCD_ROTATION", this may be defined in the board-configuration if needed. After this the lcd_console will be initialized with a given rotation from "vl_rot" out of "vidinfo_t" which is provided by the board specific code. The value for vl_rot is coded as following (matching to fbcon=rotate:<n> linux- kernel commandline): 0 = no rotation respectively 0 degree 1 = 90 degree rotation 2 = 180 degree rotation 3 = 270 degree rotation If CONFIG_LCD_ROTATION is not defined, the console will be initialized with 0 degrees rotation. Patch 1-3 make preparations to the code. Patch 4 implements the new feature Changes in v2: - cleanup README text for feature - don't make code cleanups (lcd_console.c) within this patch - remove (unnary) comment in lcd_console.h - update year to 2015 within copyright in lcd_console.c - move rotation related code into separate file lcd_console_rotation.c - rework rotation code - change meaning of vl_rot to match fbcon=rotate:<n> from the linux-kernel Hannes Petermaier (4): common/lcd_console: cleanup lcd_drawchars/lcd_putc_xy common/lcd_console: ask only one-time for bg/fg-color per call common/lcd_console: move single static variables into common (static) structure common/lcd_console: introduce display/framebuffer rotation README | 22 +++++ common/Makefile | 1 + common/lcd.c | 15 ++- common/lcd_console.c | 208 +++++++++++++++++++++------------------ common/lcd_console_rotation.c | 216 +++++++++++++++++++++++++++++++++++++++++ include/lcd.h | 1 + include/lcd_console.h | 18 +++- 7 files changed, 371 insertions(+), 110 deletions(-) create mode 100644 common/lcd_console_rotation.c -- 1.7.9.5

5 20

Re: [U-Boot] {PATH] Arcturus Networks Inc. new board support (uCP1020) patches.
by York Sun 26 Mar '15

26 Mar '15

Oleks, Each patch should be sent as a separated plain text email, not an attachment. without MIME encoding. The point is reviewers can reply and comment in line. You see when I reply your email, the attachment is lost. Try to use git send-email utility. It would be a good idea to send to yourself for testing, without flooding mailing list. York On 03/26/2015 08:58 AM, Oleksandr G Zhadan wrote: > Hi York, > > Thanks, Sorry didn't check my account preferences. > I hope now it's in plain. > > Oleks > > > > On 03/26/2015 11:50 AM, York Sun wrote: >> Oleks, >> >> Please resend the patches in plain text to the mailing list so reviewers can >> comment inline. >> >> Thanks. >> >> York >> >> >> On 03/26/2015 07:58 AM, Oleksandr G Zhadan wrote: >>> Hi, >>> >>> Please review and add next patches: >>> >>> [PATCH 1/2] Modify MPC85XX gpio related header files to fix common/cmd_gpio.c compilation errors. >>> [PATCH 2/2] Add new Arcturus Networks industrial board (http://www.arcturusnetworks.com/products/ucp1020) support based on QorIQ p1020 processor. >>> >>> Thank you, >>> >>> Oleks >>> >> >> > >

1 0

Re: [U-Boot] Arcturus Networks Inc. new board support (uCP1020) patches.
by York Sun 26 Mar '15

26 Mar '15

Oleks, Please resend the patches in plain text to the mailing list so reviewers can comment inline. Thanks. York On 03/26/2015 07:58 AM, Oleksandr G Zhadan wrote: > Hi, > > Please review and add next patches: > > [PATCH 1/2] Modify MPC85XX gpio related header files to fix common/cmd_gpio.c compilation errors. > [PATCH 2/2] Add new Arcturus Networks industrial board (http://www.arcturusnetworks.com/products/ucp1020) support based on QorIQ p1020 processor. > > Thank you, > > Oleks >

1 0

[U-Boot] [PATCH v2] ARM: tegra: fix colibri_t20 asix reset
by Marcel Ziswiler 26 Mar '15

26 Mar '15

Fix ASIX USB to Ethernet chip reset. Signed-off-by: Marcel Ziswiler <marcel(a)ziswiler.com> --- Changes in v2: - added my previously missing signed-off-by board/toradex/colibri_t20/colibri_t20.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index 4656094..5d8bdec 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -46,7 +46,14 @@ void pin_mux_usb(void) /* VBus GPIO */ pinmux_tristate_disable(PMUX_PINGRP_DTE); - /* USB 1 aka Tegra USB port 3 VBus */ + /* Reset ASIX using LAN_RESET */ + gpio_request(GPIO_PV4, "LAN_RESET"); + gpio_direction_output(GPIO_PV4, 0); + pinmux_tristate_disable(PMUX_PINGRP_GPV); + udelay(5); + gpio_set_value(GPIO_PV4, 1); + + /* USBH_PEN: USB 1 aka Tegra USB port 3 VBus */ pinmux_tristate_disable(PMUX_PINGRP_SPIG); } #endif -- 1.9.3

2 1

[U-Boot] [PATCH] sunxi: set GMAC TX delay = 0x1 on Cubietruck.
by Ian Campbell 26 Mar '15

26 Mar '15

Of 4 boards in our automated test system 2 do not have reliable networking with the default TX delay of 0x0. Increasing to 0x1 seems to make things reliable on all 4 boards. Some previous ad-hpoc tests with tx delay set to 0, 1, 2 and 3 on one of the problematic boards showed: 0: mw.l 0x1c20164 0x006 1 -- t/o in 4/5 tftp runs 1: mw.l 0x1c20164 0x406 1 -- t/o in 1/5 tftp runs 2: mw.l 0x1c20164 0x806 1 -- t/o in 1/5 tftp runs 3: mw.l 0x1c20164 0xc06 1 -- t/o many times in first tftp run For 0, 1 and 2 "t/o" means one or two "T" glitches in the download, but it did complete. For 3 those were basically continuous and it couldn't complete. tftp was of a 16M initrd. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- NB, Unlike the normal typo I actually mean to use my citrix address here, since this was done for/at work. Actual testing was done on v2014.10 with the same direct write hack as BananaPi had in that release (but with value == 1), I can't easily upgrade the remove machines to something newer. The affect of this patch is the same and has been tested on a local board, which didn't have problems to start with however. --- configs/Cubietruck_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 5c23bc7..fa48331 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -1,6 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb" +CONFIG_GMAC_TX_DELAY=1 CONFIG_VIDEO_VGA=y CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -- 2.1.4

2 1

[U-Boot] [PATCH] sunxi: axp209: fix incorrect limits on ldo3
by Iain Paton 26 Mar '15

26 Mar '15

board/sunxi/board.c tries to set ldo3 to 2.8v however drivers/power/axp209.c contains an incorrect limit on ldo3 of 2.275v The origin of the incorrect limit seems likely due to some inconsistencies in the axp209 datasheet. ldo3 is described with different limits in different sections. register 0x29 uses 7 bits for voltage configuration while the 2.275v limit would apply if only 6 bits were used. Probably this is a cut&paste error from register 0x23 The linux kernel driver has the correct limit and operation up to the 2.8v required by my board has been physically verified with a multimeter. Signed-off-by: Iain Paton <ipaton0(a)gmail.com> --- drivers/power/axp209.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index 4565398..f8c9b77 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -119,7 +119,7 @@ int axp209_set_ldo3(int mvolt) if (mvolt == -1) cfg = 0x80; /* determined by LDO3IN pin */ else - cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25); + cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25); return axp209_write(AXP209_LDO3_VOLTAGE, cfg); } -- 2.1.3

2 1

[U-Boot] [PATCH 1/2 v1] sf: probe: Add support Atmel AT45DB series devices special commands
by Haikun Wang 26 Mar '15

26 Mar '15

From: Haikun Wang <Haikun.Wang(a)freescale.com> Atmel AT45DB series devices commands is different from common spi flash commands. This patch add support for AT45DB special commands. Add a flag AT45DB_CMD to control whether use those commands. Signed-off-by: Haikun Wang <Haikun.Wang(a)freescale.com> --- Changes in v1: None drivers/mtd/spi/sf_internal.h | 7 +++++++ drivers/mtd/spi/sf_ops.c | 2 +- drivers/mtd/spi/sf_probe.c | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 785f7a9..234af21 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -43,6 +43,7 @@ enum { SST_BP = 1 << 3, SST_WP = 1 << 4, WR_QPP = 1 << 5, + AT45DB_CMD = 1 << 6, }; #define SST_WR (SST_BP | SST_WP) @@ -106,6 +107,12 @@ enum { #define SPI_FLASH_PAGE_ERASE_TIMEOUT (5 * CONFIG_SYS_HZ) #define SPI_FLASH_SECTOR_ERASE_TIMEOUT (10 * CONFIG_SYS_HZ) +/* Atmel AT45DB specific */ +#define CMD_ATMEL_PAGE_PROGRAM 0x82 +#define CMD_ATMEL_READ_STATUS 0xd7 +#define CMD_ATMEL_FLAG_STATUS 0xd7 +#define CMD_ATMEL_BLK_ERASE 0x50 + /* SST specific */ #ifdef CONFIG_SPI_FLASH_SST # define CMD_SST_BP 0x02 /* Byte Program */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 34bc54e..27ce5f9 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -165,7 +165,7 @@ int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) u8 poll_bit = STATUS_WIP; u8 cmd = flash->poll_cmd; - if (cmd == CMD_FLAG_STATUS) { + if (cmd == CMD_FLAG_STATUS || cmd == CMD_ATMEL_FLAG_STATUS) { poll_bit = STATUS_PEC; check_status = poll_bit; } diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 4103723..2ccddf2 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -226,6 +226,16 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, flash->poll_cmd = CMD_FLAG_STATUS; #endif +#ifdef CONFIG_SPI_FLASH_ATMEL + if (params->flags & AT45DB_CMD) { + flash->poll_cmd = CMD_ATMEL_READ_STATUS; + flash->write_cmd = CMD_ATMEL_PAGE_PROGRAM; + /* use block-erase command, eight pages */ + flash->erase_cmd = CMD_ATMEL_BLK_ERASE; + flash->erase_size = flash->page_size * 8; + } +#endif + /* Configure the BAR - discover bank cmds and read current bank */ #ifdef CONFIG_SPI_FLASH_BAR u8 curr_bank = 0; -- 1.9.1

3 5

[U-Boot] [PATCH] watchdog/imx_watchdog: do not set WCR_WDW
by Sebastian Andrzej Siewior 26 Mar '15

26 Mar '15

with WCR_WDW set, the watchdog won't trigger if we bootet linux and idle around while the watchdog is not triggered. It seems the timer makes progress very slowly if at all. I managed to remain 20minutes alive while the timeout was set to 60secs. It reboots within 60secs if I start a busyloop in userland (something like "while (1) { }"). While I don't see a reason why the WDT should not be running while the CPU is in idle, I'm dropping this bit. Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> --- drivers/watchdog/imx_watchdog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index d5993b4d26d6..1d18d4b269f8 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -20,7 +20,6 @@ struct watchdog_regs { #define WCR_WDE 0x04 /* WDOG enable */ #define WCR_WDT 0x08 #define WCR_SRS 0x10 -#define WCR_WDW 0x80 #define SET_WCR_WT(x) (x << 8) #ifdef CONFIG_IMX_WATCHDOG @@ -47,7 +46,7 @@ void hw_watchdog_init(void) #endif timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1; writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT | WCR_SRS | - WCR_WDW | SET_WCR_WT(timeout), &wdog->wcr); + SET_WCR_WT(timeout), &wdog->wcr); hw_watchdog_reset(); } #endif -- 2.1.4

2 6