February 2016 - U-Boot

[U-Boot] [PATCH] mx6qarm2: Update maintainer's emails
by Fabio Estevam 22 Feb '16

22 Feb '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> Use the new NXP emails. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- board/freescale/mx6qarm2/MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/mx6qarm2/MAINTAINERS b/board/freescale/mx6qarm2/MAINTAINERS index 52cf7f9..fdbc7fa 100644 --- a/board/freescale/mx6qarm2/MAINTAINERS +++ b/board/freescale/mx6qarm2/MAINTAINERS @@ -1,6 +1,6 @@ MX6QARM2 BOARD -M: Jason Liu <r64343(a)freescale.com> -M: Ye Li <b37916(a)freescale.com> +M: Jason Liu <jason.hui.liu(a)nxp.com> +M: Ye Li <ye.li(a)nxp.com> S: Maintained F: board/freescale/mx6qarm2/ F: include/configs/mx6qarm2.h -- 1.9.1

1 0

[U-Boot] [RFC PATCH v1 0/2] Convert ls1021aqds to use driver model for serial ports
by York Sun 22 Feb '16

22 Feb '16

Since a recent merge 5160def "dm: lpuart: Drop the legacy code", ls1021aqds_ddr4_nor_lpuart and ls1021aqds_nor_lpuart failed to compile because they are using legacy driver for lpuart. Following ls1021atwr, ls1021aqds should be converted as well. Not tested on boards yet. Serial DM driver is not enabled for SD and QSPI configuration. York Sun (2): arm: ls1021aqds: Convert to driver model and enable serial support arm: ls1021aqds: Enable driver model lpuart serial driver arch/arm/dts/Makefile | 3 ++- arch/arm/dts/ls1021a-qds-duart.dts | 16 ++++++++++++++++ arch/arm/dts/ls1021a-qds-lpuart.dts | 16 ++++++++++++++++ arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} | 3 +-- configs/ls1021aqds_ddr4_nor_defconfig | 4 ++++ configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_nor_defconfig | 4 ++++ configs/ls1021aqds_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021aqds_sdcard_defconfig | 3 +++ include/configs/ls1021aqds.h | 2 ++ 11 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/ls1021a-qds-duart.dts create mode 100644 arch/arm/dts/ls1021a-qds-lpuart.dts rename arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} (98%) -- 1.7.9.5

4 9

[U-Boot] [PATCH 01/10] video: Add S3C24xx framebuffer support
by Marek Vasut 22 Feb '16

22 Feb '16

Add basic framebuffer driver for the S3C24xx family of CPUs. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Kyungmin Park <kyungmin.park(a)samsung.com> Cc: Lukasz Majewski <l.majewski(a)samsung.com> Cc: Minkyu Kang <mk7.kang(a)samsung.com> Cc: Vladimir Zapolskiy <vz(a)mleia.com> V2: Keep the Makefile sorted. --- drivers/video/Makefile | 1 + drivers/video/cfb_console.c | 2 +- drivers/video/s3c-fb.c | 172 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 drivers/video/s3c-fb.c diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 14a6781..0e407d0 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_VIDEO_MX3) += mx3fb.o videomodes.o obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o +obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o obj-$(CONFIG_VIDEO_SED13806) += sed13806.o obj-$(CONFIG_VIDEO_SM501) += sm501.o diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 9231927..98d10e3 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -135,7 +135,7 @@ #endif #endif -#ifdef CONFIG_VIDEO_MXS +#if defined(CONFIG_VIDEO_MXS) || defined(CONFIG_VIDEO_S3C) #define VIDEO_FB_16BPP_WORD_SWAP #endif diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c new file mode 100644 index 0000000..521eb75 --- /dev/null +++ b/drivers/video/s3c-fb.c @@ -0,0 +1,172 @@ +/* + * S3C24x0 LCD driver + * + * NOTE: Only 16/24 bpp operation with TFT LCD is supported. + * + * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <common.h> +#include <malloc.h> +#include <video_fb.h> + +#include <asm/errno.h> +#include <asm/io.h> +#include <asm/arch/s3c24x0_cpu.h> + +#include "videomodes.h" + +static GraphicDevice panel; + +/* S3C requires the FB to be 4MiB aligned. */ +#define S3CFB_ALIGN (4 << 20) + +#define S3CFB_LCDCON1_CLKVAL(x) ((x) << 8) +#define S3CFB_LCDCON1_PNRMODE_TFT (0x3 << 5) +#define S3CFB_LCDCON1_BPPMODE_TFT_16BPP (0xc << 1) +#define S3CFB_LCDCON1_BPPMODE_TFT_24BPP (0xd << 1) + +#define S3CFB_LCDCON2_VBPD(x) ((x) << 24) +#define S3CFB_LCDCON2_LINEVAL(x) ((x) << 14) +#define S3CFB_LCDCON2_VFPD(x) ((x) << 6) +#define S3CFB_LCDCON2_VSPW(x) ((x) << 0) + +#define S3CFB_LCDCON3_HBPD(x) ((x) << 19) +#define S3CFB_LCDCON3_HOZVAL(x) ((x) << 8) +#define S3CFB_LCDCON3_HFPD(x) ((x) << 0) + +#define S3CFB_LCDCON4_HSPW(x) ((x) << 0) + +#define S3CFB_LCDCON5_BPP24BL (1 << 12) +#define S3CFB_LCDCON5_FRM565 (1 << 11) +#define S3CFB_LCDCON5_HWSWP (1 << 0) + +#define PS2KHZ(ps) (1000000000UL / (ps)) + +/* + * Example: + * setenv videomode video=ctfb:x:800,y:480,depth:16,mode:0,\ + * pclk:30066,le:41,ri:89,up:45,lo:12, + * hs:1,vs:1,sync:100663296,vmode:0 + */ +static void s3c_lcd_init(GraphicDevice *panel, + struct ctfb_res_modes *mode, int bpp) +{ + uint32_t clk_divider; + struct s3c24x0_lcd *regs = s3c24x0_get_base_lcd(); + + /* Stop the controller. */ + clrbits_le32(&regs->lcdcon1, 1); + + /* Calculate clock divider. */ + clk_divider = (get_HCLK() / PS2KHZ(mode->pixclock)) / 1000; + clk_divider = DIV_ROUND_UP(clk_divider, 2); + if (clk_divider) + clk_divider -= 1; + + /* Program LCD configuration. */ + switch (bpp) { + case 16: + writel(S3CFB_LCDCON1_BPPMODE_TFT_16BPP | + S3CFB_LCDCON1_PNRMODE_TFT | + S3CFB_LCDCON1_CLKVAL(clk_divider), + &regs->lcdcon1); + writel(S3CFB_LCDCON5_HWSWP | S3CFB_LCDCON5_FRM565, + &regs->lcdcon5); + break; + case 24: + writel(S3CFB_LCDCON1_BPPMODE_TFT_24BPP | + S3CFB_LCDCON1_PNRMODE_TFT | + S3CFB_LCDCON1_CLKVAL(clk_divider), + &regs->lcdcon1); + writel(S3CFB_LCDCON5_BPP24BL, &regs->lcdcon5); + break; + } + + writel(S3CFB_LCDCON2_LINEVAL(mode->yres - 1) | + S3CFB_LCDCON2_VBPD(mode->upper_margin - 1) | + S3CFB_LCDCON2_VFPD(mode->lower_margin - 1) | + S3CFB_LCDCON2_VSPW(mode->vsync_len - 1), + &regs->lcdcon2); + + writel(S3CFB_LCDCON3_HBPD(mode->right_margin - 1) | + S3CFB_LCDCON3_HFPD(mode->left_margin - 1) | + S3CFB_LCDCON3_HOZVAL(mode->xres - 1), + &regs->lcdcon3); + + writel(S3CFB_LCDCON4_HSPW(mode->hsync_len - 1), + &regs->lcdcon4); + + /* Write FB address. */ + writel(panel->frameAdrs >> 1, &regs->lcdsaddr1); + writel((panel->frameAdrs + + (mode->xres * mode->yres * panel->gdfBytesPP)) >> 1, + &regs->lcdsaddr2); + writel(mode->xres * bpp / 16, &regs->lcdsaddr3); + + /* Start the controller. */ + setbits_le32(&regs->lcdcon1, 1); +} + +void *video_hw_init(void) +{ + int bpp = -1; + char *penv; + void *fb; + struct ctfb_res_modes mode; + + puts("Video: "); + + /* Suck display configuration from "videomode" variable */ + penv = getenv("videomode"); + if (!penv) { + puts("S3CFB: 'videomode' variable not set!\n"); + return NULL; + } + + bpp = video_get_params(&mode, penv); + + /* fill in Graphic device struct */ + sprintf(panel.modeIdent, "%dx%dx%d", mode.xres, mode.yres, bpp); + + panel.winSizeX = mode.xres; + panel.winSizeY = mode.yres; + panel.plnSizeX = mode.xres; + panel.plnSizeY = mode.yres; + + switch (bpp) { + case 24: + panel.gdfBytesPP = 4; + panel.gdfIndex = GDF_32BIT_X888RGB; + break; + case 16: + panel.gdfBytesPP = 2; + panel.gdfIndex = GDF_16BIT_565RGB; + break; + default: + printf("S3CFB: Invalid BPP specified! (bpp = %i)\n", bpp); + return NULL; + } + + panel.memSize = mode.xres * mode.yres * panel.gdfBytesPP; + + /* Allocate framebuffer */ + fb = memalign(S3CFB_ALIGN, roundup(panel.memSize, S3CFB_ALIGN)); + if (!fb) { + printf("S3CFB: Error allocating framebuffer!\n"); + return NULL; + } + + /* Wipe framebuffer */ + memset(fb, 0, panel.memSize); + + panel.frameAdrs = (u32)fb; + + printf("%s\n", panel.modeIdent); + + /* Start framebuffer */ + s3c_lcd_init(&panel, &mode, bpp); + + return (void *)&panel; +} -- 2.1.1

6 33

[U-Boot] [PATCH] ARM: zynq: Wire-up saving environment to QSPI
by Michal Simek 22 Feb '16

22 Feb '16

Extend options for saving variables to QSPI. Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- include/configs/zynq-common.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 73b7f2072bc6..1eee8a0667dc 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -198,7 +198,11 @@ /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE # ifndef CONFIG_SYS_NO_FLASH +/* Environment in NOR flash */ # define CONFIG_ENV_IS_IN_FLASH +# elif defined(CONFIG_ZYNQ_QSPI) +/* Environment in Serial Flash */ +# define CONFIG_ENV_IS_IN_SPI_FLASH # elif defined(CONFIG_SYS_NO_FLASH) # define CONFIG_ENV_IS_NOWHERE # endif -- 1.9.1

2 4

[U-Boot] [PATCH 1/6] net: gem: Add support for reading MAC from I2C EEPROM
by Michal Simek 22 Feb '16

22 Feb '16

Add support for reading MAC address from I2C EEPROM. Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- drivers/net/zynq_gem.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index b3821c31a91d..ace60c901cb5 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -627,6 +627,21 @@ static int zynq_gem_remove(struct udevice *dev) return 0; } +static int zynq_gem_read_rom_hwaddr(struct udevice *dev) +{ +#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \ + defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET) + struct eth_pdata *pdata = dev_get_platdata(dev); + + if (eeprom_read(CONFIG_ZYNQ_GEM_EEPROM_ADDR, + CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET, + pdata->enetaddr, ARRAY_SIZE(pdata->enetaddr))) + printf("EEPROM MAC address read failed\n"); +#endif + return 0; +} + + static const struct eth_ops zynq_gem_ops = { .start = zynq_gem_init, .send = zynq_gem_send, @@ -634,6 +649,7 @@ static const struct eth_ops zynq_gem_ops = { .free_pkt = zynq_gem_free_pkt, .stop = zynq_gem_halt, .write_hwaddr = zynq_gem_setup_mac, + .read_rom_hwaddr = zynq_gem_read_rom_hwaddr, }; static int zynq_gem_ofdata_to_platdata(struct udevice *dev) -- 1.9.1

4 24

[U-Boot] [PATCH 1/2] video: truetype: Fix a memory leak on error
by Simon Glass 22 Feb '16

22 Feb '16

When the resolution is not supported we should free the memory we don't plan to use. Reported-by: Coverity (CID: 135127) Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/video/console_truetype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index c249f04..e16f95a 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -289,6 +289,7 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y, } #endif default: + free(data); return -ENOSYS; } -- 2.7.0.rc3.207.g0ac5344

2 3

[U-Boot] [PATCH] zynq-common: Fix usbboot env variable
by Jason Wu 22 Feb '16

22 Feb '16

Remove the miss-placed \0 and add missing ; for usbboot env variable. Signed-off-by: Jason Wu <jason.wu.misc(a)gmail.com> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index e8c3ef0..98c8313 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -227,8 +227,7 @@ "usbboot=if usb start; then " \ "echo Copying FIT from USB to RAM... && " \ "load usb 0 ${load_addr} ${fit_image} && " \ - "bootm ${load_addr}\0" \ - "fi\0" \ + "bootm ${load_addr}; fi\0" \ DFU_ALT_INFO #define CONFIG_BOOTCOMMAND "run $modeboot" -- 1.9.1

2 1

[U-Boot] ls1021aqds_nor_lpuart_ boards
by Stefano Babic 22 Feb '16

22 Feb '16

Hi Bhuvanchandra, your applied patch: commit 5160def267739518950e8e3bb78e0e6c3941cb3e Author: Bhuvanchandra DV <bhuvanchandra.dv(a)toradex.com> Date: Wed Jan 27 10:31:52 2016 +0530 dm: lpuart: Drop the legacy code braks ls1021aqds_*nor_lpuart. Tom has gently merged my PR, but this should be fixed. In fact, CONFIG_DM and CONFIG_DM_SERIAL are not set for these boards (setting them, build is fine): For example, for ls1021aqds_nor_lpuart: diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig index 1186af2..d8d77c2 100644 --- a/configs/ls1021aqds_nor_lpuart_defconfig +++ b/configs/ls1021aqds_nor_lpuart_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" # CONFIG_CMD_SETEXPR is not set +CONFIG_DM=y +CONFIG_DM_SERIAL=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_FSL_LPUART=y Can you provide a formal patch and resubmit ? I have no way to test the result on the board. Thanks, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

5 5

[U-Boot] [PATCH 00/26] spl: Support loading a FIT image containing U-Boot
by Simon Glass 22 Feb '16

22 Feb '16

7 42

[U-Boot] [PATCH] MAINTAINERS: Remove no longer valid maintainers' email addresses
by Bin Meng 22 Feb '16

22 Feb '16

The following maintainers' email addresses are no longer valid. vipin.kumar(a)st.com martin.krause(a)tq-systems.de kim.phillips(a)freescale.com fgretief(a)spaceteq.co.za Remove them. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- MAINTAINERS | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b387207..31137eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -125,13 +125,6 @@ F: arch/arm/mach-s5pc1xx/ F: arch/arm/cpu/armv7/s5p-common/ F: arch/arm/include/asm/arch-s3c24x0/ -ARM STM SPEAR -M: Vipin Kumar <vipin.kumar(a)st.com> -S: Maintained -T: git git://git.denx.de/u-boot-stm.git -F: arch/arm/cpu/arm926ejs/spear/ -F: arch/arm/include/asm/arch-spear/ - ARM STM STV0991 M: Vikas Manocha <vikas.manocha(a)st.com> S: Maintained @@ -308,13 +301,6 @@ S: Maintained T: git git://git.denx.de/u-boot-mpc82xx.git F: arch/powerpc/cpu/mpc82*/ -POWERPC MPC83XX -M: Kim Phillips <kim.phillips(a)freescale.com> -S: Maintained -T: git git://git.denx.de/u-boot-mpc83xx.git -F: arch/powerpc/cpu/mpc83xx/ -F: arch/powerpc/include/asm/arch-mpc83xx/ - POWERPC MPC85XX M: York Sun <york.sun(a)nxp.com> S: Maintained @@ -375,12 +361,6 @@ S: Maintained T: git git://git.denx.de/u-boot-sh.git F: arch/sh/ -SPARC -M: Francois Retief <fgretief(a)spaceteq.co.za> -S: Maintained -T: git git://git.denx.de/u-boot-sparc.git -F: arch/sparc/ - SPI M: Jagan Teki <jteki(a)openedev.com> S: Maintained @@ -389,11 +369,6 @@ F: drivers/mtd/spi/ F: drivers/spi/ F: include/spi* -TQ GROUP -M: Martin Krause <martin.krause(a)tq-systems.de> -S: Maintained -T: git git://git.denx.de/u-boot-tq-group.git - UBI M: Kyungmin Park <kmpark(a)infradead.org> M: Heiko Schocher <hs(a)denx.de> -- 1.8.2.1

2 1