May 2016 - U-Boot

[U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice
by Marek Vasut 26 Jun '16

26 Jun '16

Since the spl_boot_mode() is now passed the boot device to boot from, make use of it instead of inquiring for the boot device again. This allows board_boot_order() to function correctly. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Andreas Bießmann <andreas.devel(a)googlemail.com> --- arch/arm/mach-at91/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 561cf5f..236c8ec 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -72,7 +72,7 @@ u32 spl_boot_device(void) u32 spl_boot_mode(const u32 boot_device) { - switch (spl_boot_device()) { + switch (boot_device) { #ifdef CONFIG_SYS_USE_MMC case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC2: -- 2.7.0

2 3

[U-Boot] [PATCH] common: Pass the boot device into spl_boot_mode()
by Marek Vasut 26 Jun '16

26 Jun '16

The SPL code already knows which boot device it calls the spl_boot_mode() on, so pass that information into the function. This allows the code of spl_boot_mode() avoid invokind spl_boot_device() again, but it also lets board_boot_order() correctly alter the behavior of the boot process. The later one is important, since in certain cases, it is desired that spl_boot_device() return value be overriden using board_boot_order(). Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Andreas Bießmann <andreas.devel(a)googlemail.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Tom Rini <trini(a)konsulko.com> --- arch/arm/cpu/arm1136/mx35/generic.c | 2 +- arch/arm/cpu/armv7/ls102xa/spl.c | 2 +- arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +- arch/arm/imx-common/spl.c | 2 +- arch/arm/mach-at91/spl.c | 2 +- arch/arm/mach-davinci/spl.c | 2 +- arch/arm/mach-mvebu/spl.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 2 +- arch/arm/mach-socfpga/spl.c | 2 +- arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 2 +- arch/arm/mach-zynq/spl.c | 2 +- common/spl/spl_mmc.c | 2 +- include/spl.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index bc98edd..068d93e 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -526,7 +526,7 @@ u32 spl_boot_device(void) } #ifdef CONFIG_SPL_BUILD -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c index 1dfbf548..be5b6b8 100644 --- a/arch/arm/cpu/armv7/ls102xa/spl.c +++ b/arch/arm/cpu/armv7/ls102xa/spl.c @@ -15,7 +15,7 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NAND; } -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 0456263..5479204 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -166,7 +166,7 @@ u32 spl_boot_device(void) return gd->arch.omap_boot_device; } -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { return gd->arch.omap_boot_mode; } diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index c1229c8..c1b9aef 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -24,7 +24,7 @@ u32 spl_boot_device(void) return 0; } -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index caa45cf..bdcda7d 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -70,7 +70,7 @@ u32 spl_boot_device(void) #if defined(CONFIG_SPL_MMC_SUPPORT) /* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { /* for MMC return either RAW or FAT mode */ diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index c4ed224..561cf5f 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -70,7 +70,7 @@ u32 spl_boot_device(void) } #endif -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { #ifdef CONFIG_SYS_USE_MMC diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 49349da..0aeaa7d 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -45,7 +45,7 @@ void spl_board_init(void) preloader_console_init(); } -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { return MMCSD_MODE_RAW; } diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index ac5bb2c..e1c9cdb 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -57,7 +57,7 @@ u32 spl_boot_device(void) } #ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { return MMCSD_MODE_RAW; } diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index e133cca..15f1266 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -66,7 +66,7 @@ fallback: return BOOT_DEVICE_MMC1; } -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { return MMCSD_MODE_RAW; } diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index 98c16a0..fec4c7a 100644 --- a/arch/arm/mach-socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c @@ -58,7 +58,7 @@ u32 spl_boot_device(void) } #ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) return MMCSD_MODE_FS; diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 20149da..28016ba 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -248,7 +248,7 @@ u32 spl_boot_device(void) } /* No confirmation data available in SPL yet. Hardcode bootmode */ -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { return MMCSD_MODE_RAW; } diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c index b180f44..3cdc360 100644 --- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c +++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c @@ -57,7 +57,7 @@ u32 spl_boot_device(void) return ret == BOOT_DEVICE_USB ? BOOT_DEVICE_NOR : ret; } -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { struct mmc *mmc; diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index 723019d..6c3be14 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -69,7 +69,7 @@ u32 spl_boot_device(void) } #ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { return MMCSD_MODE_FS; } diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 360c754..4811435 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -286,7 +286,7 @@ int spl_mmc_load_image(u32 boot_device) return err; } - boot_mode = spl_boot_mode(); + boot_mode = spl_boot_mode(boot_device); err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: diff --git a/include/spl.h b/include/spl.h index 7edfab4..af85706 100644 --- a/include/spl.h +++ b/include/spl.h @@ -54,7 +54,7 @@ extern struct spl_image_info spl_image; /* SPL common functions */ void preloader_console_init(void); u32 spl_boot_device(void); -u32 spl_boot_mode(void); +u32 spl_boot_mode(const u32 boot_device); void spl_set_header_raw_uboot(void); int spl_parse_image_header(const struct image_header *header); void spl_board_prepare_for_linux(void); -- 2.7.0

3 3

[U-Boot] [PATCH] net: phy: micrel: add support for KSZ886x switches in MIIM mode
by Alexey Firago 22 Jun '16

22 Jun '16

This patch adds a phy driver for the Micrel KSZ886x switches. Similarly to the KSZ8895, SoC MAC is directly connected to the switch MAC on the switch CPU port, so the link to the switch is always up. KSZ886x switches can be used in the following configuration modes: - Unmanaged mode with config stored in external EEPROM - Managed mode over SPI - Managed mode over I2C - Managed mode over mdio/mdc (aka MIIM or SMI) This patch supports only unmanaged and MIIM modes. Based on Micrel KSZ886x driver from Linux kernel and Micrel KSZ8895 driver from U-Boot. Verified with the KSZ8863MLL. Signed-off-by: Alexey Firago <alexey_firago(a)mentor.com> --- drivers/net/phy/micrel.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 8fcf737..58891f8 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -482,6 +482,31 @@ static struct phy_driver ksz9031_driver = { .readext = &ksz9031_phy_extread, }; +int ksz886x_config(struct phy_device *phydev) +{ + /* we are connected directly to the switch without + * dedicated PHY. */ + phydev->link = 1; + phydev->duplex = DUPLEX_FULL; + phydev->speed = SPEED_100; + return 0; +} + +static int ksz886x_startup(struct phy_device *phydev) +{ + return 0; +} + +static struct phy_driver ksz886x_driver = { + .name = "Micrel KSZ886x Switch", + .uid = 0x00221430, + .mask = 0xfffff0, + .features = PHY_BASIC_FEATURES, + .config = &ksz886x_config, + .startup = &ksz886x_startup, + .shutdown = &genphy_shutdown, +}; + int phy_micrel_init(void) { phy_register(&KSZ804_driver); @@ -495,5 +520,6 @@ int phy_micrel_init(void) #endif phy_register(&ksz9031_driver); phy_register(&ksz8895_driver); + phy_register(&ksz886x_driver); return 0; } -- 1.9.1

3 2

[U-Boot] [PATCH] net: rtl8169: fix switching between adapters
by Stephen Warren 22 Jun '16

22 Jun '16

From: Stephen Warren <swarren(a)nvidia.com> The rtl8169 driver uses a global variable to store the register address of the adapter being operated upon. This is updated to point at the correct adapter when sending or receiving a packet, or shutting down the adapter, but not when initializing the adapter. Consequently, switching between different adapters within the same U-Boot runtime does not work correctly since the driver programs the wrong registers during rtl8169_eth_start() -> rtl8169_common_start() -> rtl8169_hw_start(). Note that since rtl8169_eth_stop() does set the global variable, the second consecutive attempt to use the "new" adapter did work even before this patch, because each time network usage is shut down, the network core calls stop, which sets the variable so that the next start does actually initialize the hardware, and the adapter works. Equally, rtl8169_eth_probe() calls rtl_init() which sets the global, so if using only a single device, or if picking the "right" device (based on probe order) when multiple devices are present, ioaddr will already be set correctly from the get-go, so the issue does not occur. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Note that as with almost any patch, I believe NVIDIA copyright applies to the submission. However, I don't want to block all my work based on that other conversion, so I'm just going to deliberately ignore our policy of adding/updating copyright headers to files when editing them. Hopefully doing so deliberately (rather than the usual case of just forgetting) doesn't get me fired. --- drivers/net/rtl8169.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 163b9df55c9b..843b083f8f90 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -850,9 +850,11 @@ static void rtl8169_init_ring(pci_dev_t dev) } #ifdef CONFIG_DM_ETH -static void rtl8169_common_start(struct udevice *dev, unsigned char *enetaddr) +static void rtl8169_common_start(struct udevice *dev, unsigned char *enetaddr, + unsigned long dev_iobase) #else -static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr) +static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr, + unsigned long dev_iobase) #endif { int i; @@ -862,6 +864,8 @@ static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr) printf ("%s\n", __FUNCTION__); #endif + ioaddr = dev_iobase; + rtl8169_init_ring(dev); rtl8169_hw_start(dev); /* Construct a perfect filter frame with the mac address as first match @@ -885,8 +889,9 @@ static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr) static int rtl8169_eth_start(struct udevice *dev) { struct eth_pdata *plat = dev_get_platdata(dev); + struct rtl8169_private *priv = dev_get_priv(dev); - rtl8169_common_start(dev, plat->enetaddr); + rtl8169_common_start(dev, plat->enetaddr, priv->iobase); return 0; } @@ -897,7 +902,7 @@ RESET - Finish setting up the ethernet interface static int rtl_reset(struct eth_device *dev, bd_t *bis) { rtl8169_common_start((pci_dev_t)(unsigned long)dev->priv, - dev->enetaddr); + dev->enetaddr, dev->iobase); return 0; } -- 2.8.1

3 5

[U-Boot] [PATCH 0/5] LS2080ARDB: Enable EFI boot support
by Alexander Graf 20 Jun '16

20 Jun '16

We now have EFI support in U-Boot which worked out of the box on all systems that I tried it on so far. Except for the LS2080ARDB. With this patch set I can successfully boot grub2 and Linux from there on such a system - even using PXE. Alexander Graf (5): ls2080: Exit dpaa only right before exiting U-Boot ls2080: Disable dcache during ddr init efi_loader: AArch64: Run EFI payloads in EL2 if U-Boot runs in EL3 ls2080ardb: Reserve DP-DDR RAM ls2080ardb: Convert to distro boot arch/arm/include/asm/armv8/mmu.h | 19 ++++++++++++------- arch/arm/lib/bootm.c | 11 +++++++++++ board/freescale/ls2080a/ddr.c | 2 ++ board/freescale/ls2080a/ls2080a.c | 1 - board/freescale/ls2080aqds/ddr.c | 2 ++ board/freescale/ls2080aqds/ls2080aqds.c | 4 ---- board/freescale/ls2080ardb/ddr.c | 2 ++ board/freescale/ls2080ardb/ls2080ardb.c | 13 +++++++++---- cmd/bootefi.c | 11 +++++++++++ drivers/net/fsl-mc/mc.c | 22 ++++++++++++++++++++-- include/configs/ls2080ardb.h | 24 +++++++++++++++++++++++- lib/efi_loader/efi_boottime.c | 10 ++++++++++ 12 files changed, 102 insertions(+), 19 deletions(-) -- 1.8.5.6

7 29

[U-Boot] [PATCH v2 00/18] at91: Convert Ethernet and LCD to driver model
by Simon Glass 20 Jun '16

20 Jun '16

This series is mainly designed to move the macb Ethernet to driver model, along with the LCD controller. It also includes a few fixes: - NAND with ECC doesn't build properly - The instruction cache is off by default - Ethernet macb doesn't send packets when the cache is enabled A Snapper 9G45-based board is used for this work. It includes an AT91SAM9G45 CPU so is a good test of driver model on this chip. Changes in v2: - Correct commit author in several cases - Rebase to master Andre Renaud (7): at91: Add support for the AT91 slow clock controller net: Handle an empty bootp extension section arm: at91: Add a header file for the real-time clock at91: Correct NAND ECC register access at91: nand: Set up the ECC strength correctly mtd: nand: Drop a blank line in nand_wait() arm: at91: Add support for gurnard Simon Glass (11): arm: Allow skipping of low-level init with I-cache on bootm: Align cache flush end address correctly net: macb: Prepare for driver-model conversion net: macb: Flush correct cache portion when sending net: macb: Convert to driver model arm: at91: dts: Bring in device tree file for AT91SAM9G45 at91: Add driver-model GPIO devices for AT91SAM9G45 at91: mtd: nand: Add dev_warn() to correct build error in driver at91: video: Prepare for driver-model conversion at91: video: Support driver-model for the LCD driver fdt: Correct return value in fdtdec_decode_display_timing() README | 5 + arch/arm/cpu/arm1136/start.S | 2 + arch/arm/cpu/arm920t/start.S | 3 +- arch/arm/cpu/arm926ejs/start.S | 2 + arch/arm/cpu/arm946es/start.S | 2 + arch/arm/cpu/armv7/start.S | 5 +- arch/arm/cpu/sa1100/start.S | 2 + arch/arm/dts/Makefile | 1 + arch/arm/dts/at91sam9g45-gurnard.dts | 157 ++ arch/arm/dts/at91sam9g45.dtsi | 1335 ++++++++++ arch/arm/mach-at91/Kconfig | 9 + .../mach-at91/arm926ejs/at91sam9m10g45_devices.c | 18 + arch/arm/mach-at91/include/mach/at91_rtc.h | 71 + arch/arm/mach-at91/include/mach/at91_sck.h | 21 + arch/arm/mach-at91/include/mach/at91sam9g45.h | 1 + board/bluewater/gurnard/Kconfig | 12 + board/bluewater/gurnard/MAINTAINERS | 6 + board/bluewater/gurnard/Makefile | 11 + board/bluewater/gurnard/gurnard.c | 449 ++++ board/bluewater/gurnard/splash_logo.h | 2619 ++++++++++++++++++++ common/bootm.c | 2 +- configs/gurnard_defconfig | 19 + drivers/mtd/nand/atmel_nand.c | 7 +- drivers/mtd/nand/nand_base.c | 1 - drivers/net/macb.c | 320 ++- drivers/video/atmel_lcdfb.c | 197 +- include/atmel_lcd.h | 9 + include/configs/snapper9g45.h | 156 ++ include/dt-bindings/clock/at91.h | 23 + include/dt-bindings/dma/at91.h | 52 + include/dt-bindings/pinctrl/at91.h | 40 + lib/fdtdec.c | 2 +- net/bootp.c | 9 + 33 files changed, 5449 insertions(+), 119 deletions(-) create mode 100644 arch/arm/dts/at91sam9g45-gurnard.dts create mode 100644 arch/arm/dts/at91sam9g45.dtsi create mode 100644 arch/arm/mach-at91/include/mach/at91_rtc.h create mode 100644 arch/arm/mach-at91/include/mach/at91_sck.h create mode 100644 board/bluewater/gurnard/Kconfig create mode 100644 board/bluewater/gurnard/MAINTAINERS create mode 100644 board/bluewater/gurnard/Makefile create mode 100644 board/bluewater/gurnard/gurnard.c create mode 100644 board/bluewater/gurnard/splash_logo.h create mode 100644 configs/gurnard_defconfig create mode 100644 include/configs/snapper9g45.h create mode 100644 include/dt-bindings/clock/at91.h create mode 100644 include/dt-bindings/dma/at91.h create mode 100644 include/dt-bindings/pinctrl/at91.h -- 2.8.0.rc3.226.g39d4020

4 55

[U-Boot] [PATCH 1/2] serial: Introduce linflex uart support
by Eddy Petrișor 19 Jun '16

19 Jun '16

From: Stoica Cosmin-Stefan <cosminstefan.stoica(a)freescale.com> The Linflex module is integrated on some NXP automotive SoCs part of the former Freescale portfolio, like S32V234, an SoC for Advanced Driver Assistance Systems. Signed-off-by: Stoica Cosmin-Stefan <cosminstefan.stoica(a)freescale.com> Signed-off-by: Chircu Bogdan <Bogdan.Chircu(a)freescale.com> Signed-off-by: Depons Eric <eric.depons(a)freescale.com> Signed-off-by: Eddy Petrișor <eddy.petrisor(a)gmail.com> --- drivers/serial/Makefile | 1 + drivers/serial/serial_linflexuart.c | 147 ++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 drivers/serial/serial_linflexuart.c diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index ee7147a..b009478 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_SCIF_CONSOLE) += serial_sh.o obj-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o obj-$(CONFIG_BFIN_SERIAL) += serial_bfin.o obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o +obj-$(CONFIG_FSL_LINFLEXUART) += serial_linflexuart.o obj-$(CONFIG_ARC_SERIAL) += serial_arc.o obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c new file mode 100644 index 0000000..3c619ce --- /dev/null +++ b/drivers/serial/serial_linflexuart.c @@ -0,0 +1,147 @@ +/* + * (C) Copyright 2013-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <watchdog.h> +#include <asm/io.h> +#include <serial.h> +#include <linux/compiler.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/clock.h> + +#define US1_TDRE (1 << 7) +#define US1_RDRF (1 << 5) +#define UC2_TE (1 << 3) +#define LINCR1_INIT (1 << 0) +#define LINCR1_MME (1 << 4) +#define LINCR1_BF (1 << 7) +#define LINSR_LINS_INITMODE (0x00001000) +#define LINSR_LINS_MASK (0x0000F000) +#define UARTCR_UART (1 << 0) +#define UARTCR_WL0 (1 << 1) +#define UARTCR_PCE (1 << 2) +#define UARTCR_PC0 (1 << 3) +#define UARTCR_TXEN (1 << 4) +#define UARTCR_RXEN (1 << 5) +#define UARTCR_PC1 (1 << 6) +#define UARTSR_DTF (1 << 1) +#define UARTSR_DRF (1 << 2) +#define UARTSR_RMB (1 << 9) + +DECLARE_GLOBAL_DATA_PTR; + +struct linflex_fsl *base = (struct linflex_fsl *)LINFLEXUART_BASE; + +static void linflex_serial_setbrg(void) +{ + u32 clk = mxc_get_clock(MXC_UART_CLK); + u32 ibr, fbr; + + if (!gd->baudrate) + gd->baudrate = CONFIG_BAUDRATE; + + ibr = (u32) (clk / (16 * gd->baudrate)); + fbr = (u32) (clk % (16 * gd->baudrate)) * 16; + + __raw_writel(ibr, &base->linibrr); + __raw_writel(fbr, &base->linfbrr); +} + +static int linflex_serial_getc(void) +{ + char c; + + /* waiting for data reception complete - TODO: add a timeout */ + while ((__raw_readb(&base->uartsr) & UARTSR_DRF) != UARTSR_DRF); + + /* waiting for data buffer to be ready - TODO: add a timeout */ + + while ((__raw_readl(&base->uartsr) & UARTSR_RMB) != UARTSR_RMB); + + c = __raw_readl(&base->bdrm); + __raw_writeb((__raw_readb(&base->uartsr) | (UARTSR_DRF | UARTSR_RMB)), + &base->uartsr); + return c; +} + +static void linflex_serial_putc(const char c) +{ + if (c == '\n') + serial_putc('\r'); + + __raw_writeb(c, &base->bdrl); + + /* waiting for data transmission completed - TODO: add a timeout */ + while ((__raw_readb(&base->uartsr) & UARTSR_DTF) != UARTSR_DTF); + + __raw_writeb((__raw_readb(&base->uartsr) | UARTSR_DTF), &base->uartsr); +} + +/* + * Test whether a character is in the RX buffer + */ +static int linflex_serial_tstc(void) +{ + return 0; +} + +/* + * Initialise the serial port with the given baudrate. The settings + * are always 8 data bits, no parity, 1 stop bit, no start bits. + */ +static int linflex_serial_init(void) +{ + volatile u32 ctrl; + + /* set the Linflex in master mode amd activate by-pass filter */ + ctrl = LINCR1_BF | LINCR1_MME; + __raw_writel(ctrl, &base->lincr1); + + /* init mode */ + ctrl |= LINCR1_INIT; + __raw_writel(ctrl, &base->lincr1); + + /* waiting for init mode entry - TODO: add a timeout */ + while ((__raw_readl(&base->linsr) & LINSR_LINS_MASK) != + LINSR_LINS_INITMODE); + + /* set UART bit to allow writing other bits */ + __raw_writel(UARTCR_UART, &base->uartcr); + + /* provide data bits, parity, stop bit, etc */ + serial_setbrg(); + + /* 8 bit data, no parity, Tx and Rx enabled, UART mode */ + __raw_writel(UARTCR_PC1 | UARTCR_RXEN | UARTCR_TXEN | UARTCR_PC0 + | UARTCR_WL0 | UARTCR_UART, &base->uartcr); + + ctrl = __raw_readl(&base->lincr1); + ctrl &= ~LINCR1_INIT; + __raw_writel(ctrl, &base->lincr1); /* end init mode */ + + return 0; +} + +static struct serial_device linflex_serial_drv = { + .name = "linflex_serial", + .start = linflex_serial_init, + .stop = NULL, + .setbrg = linflex_serial_setbrg, + .putc = linflex_serial_putc, + .puts = default_serial_puts, + .getc = linflex_serial_getc, + .tstc = linflex_serial_tstc, +}; + +void linflex_serial_initialize(void) +{ + serial_register(&linflex_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &linflex_serial_drv; +} -- 2.1.4

6 39

[U-Boot] [PATCH] SPL: fat: Fix spl_parse_image_header() return value handling
by Marek Vasut 19 Jun '16

19 Jun '16

The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Peng Fan <van.freenix(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- common/spl/spl_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 338ea2f..5b0d969 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -58,7 +58,7 @@ int spl_load_image_fat(struct blk_desc *block_dev, goto end; err = spl_parse_image_header(header); - if (err <= 0) + if (err) goto end; err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0); -- 2.7.0

6 9

[U-Boot] RFC, dm: devices and device_info platdata manual relocation
by Angelo Dureghello 17 Jun '16

17 Jun '16

Hi all, i have seen, updating u-boot in NOR parallel flash, that the U_BOOT_DEVICE structure "platdata" ptr is still pointing to flash, so the update (rewriting flash) die silently and fails. I have found a workaround using misc_init_r that works in my board.c, as below, but i don't like too much the solution: ... #include <dm/platform_data/serial_coldfire.h> ... DECLARE_GLOBAL_DATA_PTR; .... int misc_init_r(void) { /* * FIXME: relocation seems not working properly on m68k, * so relocating manually */ struct udevice *dev; int retval; printf("misc_init_r(): entering\n"); retval = uclass_find_device(UCLASS_SERIAL, 0, &dev); if (!retval) { printf("misc_init_r(): relocating serial device\n"); dev->platdata += gd->reloc_off; } return 0; } static struct coldfire_serial_platdata mcf5307_serial_plat = { .base = CONFIG_SYS_UART_BASE, .port = 0, .baudrate = CONFIG_BAUDRATE, }; U_BOOT_DEVICE(coldfire_serial) = { .name = "serial_coldfire", .platdata = &mcf5307_serial_plat, }; So, i can keep this changes in my board, but, i am wondering if manual-reloc of devices structures is maybe responsibility of drivers/core/root.c, something like int dm_init(void) { ..... #if defined(CONFIG_NEEDS_MANUAL_RELOC) fix_drivers(); fix_uclass(); fix_devices(); <------------- #endif ..... Every comment is welcome. Regards, Angelo Dureghello

2 2

[U-Boot] [PATCH v3 00/12] Convert davinci_spi to DM
by Vignesh R 17 Jun '16

17 Jun '16

This series converts davinci_spi driver to adapt to driver model framework. And enables the driver on k2l, k2e, k2hk evms. Also, added support for davinci_spi on k2g evm. Tested on k2l, k2e, k2hk and k2g evms. Rebased on top of v2016.05-rc3 Vignesh R (12): dm: core: implement dev_map_phsymem() spi: davinci_spi: Convert to driver to adapt to DM keystone2: spi: do not define DM_SPI and DM_SPI_FLASH for SPL build ARM: dts: keystone2: add SPI aliases for davinci SPI nodes ARM: dts: k2hk: Enable Davinci SPI controller defconfig: k2hk_evm_defconfig: enable SPI driver model ARM: dts: k2e: Enable Davinci SPI controller defconfig: k2e_evm_defconfig: enable SPI driver model ARM: dts: k2l: Enable Davinci SPI controller defconfig: k2l_evm_defconfig: enable SPI driver model ARM: dts: k2g: add support for Davinci SPI controller defconfig: k2g_evm_defconfig: enable SPI driver model arch/arm/dts/k2e-evm.dts | 3 +- arch/arm/dts/k2g-evm.dts | 24 +++ arch/arm/dts/k2g.dtsi | 47 +++++ arch/arm/dts/k2hk-evm.dts | 3 +- arch/arm/dts/k2l-evm.dts | 3 +- arch/arm/dts/keystone.dtsi | 3 + configs/k2e_evm_defconfig | 2 + configs/k2g_evm_defconfig | 2 + configs/k2hk_evm_defconfig | 2 + configs/k2l_evm_defconfig | 2 + drivers/core/device.c | 6 + drivers/spi/davinci_spi.c | 327 +++++++++++++++++++++++++---------- include/configs/ti_armv7_keystone2.h | 4 + include/dm/device.h | 9 + 14 files changed, 344 insertions(+), 93 deletions(-) -- 2.8.2

5 33