September 2013 - U-Boot

[U-Boot] [PATCH v6 0/3] apf27: add support of armadeus apf27
by Philippe Reynes 10 Sep '13

10 Sep '13

Difference between v6 and v5: - use generic board framework - add fpga name Difference between v5 and v4: - use spl framework - use script - use SPDX-License-Identifier - use u-boot-with-spl.bin (instead of u-boot-nand.bin) - fix some comments format issue Difference between v4 and v3: - use standard start.S - use part to know u-boot offset - fix some comments format issue Difference between v3 and v2: - rebase on imx branch - merge support and spl patch - clean code of apf27_gpio_init - clean code of start.S Difference between v1 and v2: - use spl instead of nand_spl - use gpio api - remove use of useless CONFIG_SYS - remove use of config.mk - remove dead code Philippe Reynes (3): mx27: add missing constant for mx27 apf27: add support for the armadeus APF27 board apf27: add FPGA support for the apf27 board MAINTAINERS | 5 + arch/arm/cpu/arm926ejs/mx27/asm-offsets.c | 5 + arch/arm/include/asm/arch-mx27/imx-regs.h | 6 +- board/armadeus/apf27/Makefile | 33 ++ board/armadeus/apf27/apf27.c | 263 ++++++++++++++++ board/armadeus/apf27/apf27.h | 489 +++++++++++++++++++++++++++++ board/armadeus/apf27/fpga.c | 224 +++++++++++++ board/armadeus/apf27/fpga.h | 25 ++ board/armadeus/apf27/lowlevel_init.S | 168 ++++++++++ boards.cfg | 1 + include/configs/apf27.h | 389 +++++++++++++++++++++++ 11 files changed, 1607 insertions(+), 1 deletions(-) create mode 100644 board/armadeus/apf27/Makefile create mode 100644 board/armadeus/apf27/apf27.c create mode 100644 board/armadeus/apf27/apf27.h create mode 100644 board/armadeus/apf27/fpga.c create mode 100644 board/armadeus/apf27/fpga.h create mode 100644 board/armadeus/apf27/lowlevel_init.S create mode 100644 include/configs/apf27.h -- 1.7.4.4

2 5

[U-Boot] [PATCH] mx6sabresd: Add LVDS splash screen support
by Fabio Estevam 10 Sep '13

10 Sep '13

mx6sabresd boards can be connected to a Hannstar XGA LVDS panel. Add support for displaying U-boot splashscreen on it. By default, HDMI splash is selected. In order to use splash via LVDS, do the following in the U-boot prompt: setenv panel Hannstar-XGA save and reboot. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx6sabresd/mx6sabresd.c | 166 ++++++++++++++++++++++++++++---- 1 file changed, 145 insertions(+), 21 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 5db516d..f3ccc7b 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -234,47 +234,171 @@ int board_phy_config(struct phy_device *phydev) } #if defined(CONFIG_VIDEO_IPUV3) -static struct fb_videomode const hdmi = { - .name = "HDMI", - .refresh = 60, - .xres = 1024, - .yres = 768, - .pixclock = 15385, - .left_margin = 220, - .right_margin = 40, - .upper_margin = 21, - .lower_margin = 7, - .hsync_len = 60, - .vsync_len = 10, - .sync = FB_SYNC_EXT, - .vmode = FB_VMODE_NONINTERLACED +struct display_info_t { + int bus; + int addr; + int pixfmt; + int (*detect)(struct display_info_t const *dev); + void (*enable)(struct display_info_t const *dev); + struct fb_videomode mode; }; -int board_video_skip(void) +static int detect_hdmi(struct display_info_t const *dev) { - int ret; + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; + return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT; +} - ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24); +static void do_enable_hdmi(struct display_info_t const *dev) +{ + imx_enable_hdmi_phy(); +} - if (ret) - printf("HDMI cannot be configured: %d\n", ret); +static void enable_lvds(struct display_info_t const *dev) +{ + struct iomuxc *iomux = (struct iomuxc *) + IOMUXC_BASE_ADDR; + u32 reg = readl(&iomux->gpr[2]); + reg |= IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT | + IOMUXC_GPR2_DATA_WIDTH_CH1_24BIT; + writel(reg, &iomux->gpr[2]); +} +static struct display_info_t const displays[] = {{ + .bus = -1, + .addr = 0, + .pixfmt = IPU_PIX_FMT_RGB24, + .detect = detect_hdmi, + .enable = do_enable_hdmi, + .mode = { + .name = "HDMI", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +} }, { + .bus = -1, + .addr = 0, + .pixfmt = IPU_PIX_FMT_LVDS666, + .detect = NULL, + .enable = enable_lvds, + .mode = { + .name = "Hannstar-XGA", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +} } }; - imx_enable_hdmi_phy(); - return ret; +int board_video_skip(void) +{ + int i; + int ret; + char const *panel = getenv("panel"); + if (!panel) { + for (i = 0; i < ARRAY_SIZE(displays); i++) { + struct display_info_t const *dev = displays+i; + if (dev->detect(dev)) { + panel = dev->mode.name; + printf("auto-detected panel %s\n", panel); + break; + } + } + if (!panel) { + panel = displays[0].mode.name; + printf("No panel detected: default to %s\n", panel); + } + } else { + for (i = 0; i < ARRAY_SIZE(displays); i++) { + if (!strcmp(panel, displays[i].mode.name)) + break; + } + } + if (i < ARRAY_SIZE(displays)) { + ret = ipuv3_fb_init(&displays[i].mode, 0, + displays[i].pixfmt); + if (!ret) { + displays[i].enable(displays+i); + printf("Display: %s (%ux%u)\n", + displays[i].mode.name, + displays[i].mode.xres, + displays[i].mode.yres); + } else + printf("LCD %s cannot be configured: %d\n", + displays[i].mode.name, ret); + } else { + printf("unsupported panel %s\n", panel); + return -EINVAL; + } + + return 0; } static void setup_display(void) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; int reg; enable_ipu_clock(); imx_setup_hdmi(); + /* Turn on LDB0, LDB1, IPU,IPU DI0 clocks */ + reg = __raw_readl(&mxc_ccm->CCGR3); + reg |= MXC_CCM_CCGR3_LDB_DI0_MASK | MXC_CCM_CCGR3_LDB_DI1_MASK; + writel(reg, &mxc_ccm->CCGR3); + + /* set LDB0, LDB1 clk select to 011/011 */ + reg = readl(&mxc_ccm->cs2cdr); + reg &= ~(MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK + | MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK); + reg |= (3 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET) + | (3 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET); + writel(reg, &mxc_ccm->cs2cdr); + + reg = readl(&mxc_ccm->cscmr2); + reg |= MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV | MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV; + writel(reg, &mxc_ccm->cscmr2); + reg = readl(&mxc_ccm->chsccdr); reg |= (CHSCCDR_CLK_SEL_LDB_DI0 << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + << MXC_CCM_CHSCCDR_IPU1_DI1_CLK_SEL_OFFSET); writel(reg, &mxc_ccm->chsccdr); + + reg = IOMUXC_GPR2_BGREF_RRMODE_EXTERNAL_RES + | IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_LOW + | IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW + | IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG + | IOMUXC_GPR2_DATA_WIDTH_CH1_18BIT + | IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG + | IOMUXC_GPR2_DATA_WIDTH_CH0_18BIT + | IOMUXC_GPR2_LVDS_CH0_MODE_DISABLED + | IOMUXC_GPR2_LVDS_CH1_MODE_ENABLED_DI0; + writel(reg, &iomux->gpr[2]); + + reg = readl(&iomux->gpr[3]); + reg = (reg & ~(IOMUXC_GPR3_LVDS1_MUX_CTL_MASK + | IOMUXC_GPR3_HDMI_MUX_CTL_MASK)) + | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 + << IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET); + writel(reg, &iomux->gpr[3]); } #endif /* CONFIG_VIDEO_IPUV3 */ -- 1.8.1.2

2 1

[U-Boot] [PATCH] mx6: Fix calculation of emi_slow clock rate
by Andrew Gabbasov 10 Sep '13

10 Sep '13

This is porting of Freescale's patch from version imx_v2009.08_3.0.35_4.0.0, that fixes the obvious mistype of bits offset macro name (ACLK_EMI_PODF_OFFSET was used instead of ACLK_EMI_SLOW_PODF_OFFSET). Using the occasion, change the variable name 'emi_slow_pof' to more consistent 'emi_slow_podf'. Signed-off-by: Jason Liu <r64343(a)freescale.com> Signed-off-by: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> --- arch/arm/cpu/armv7/mx6/clock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 3c0d908..064f8c8 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -244,13 +244,13 @@ static u32 get_axi_clk(void) static u32 get_emi_slow_clk(void) { - u32 emi_clk_sel, emi_slow_pof, cscmr1, root_freq = 0; + u32 emi_clk_sel, emi_slow_podf, cscmr1, root_freq = 0; cscmr1 = __raw_readl(&imx_ccm->cscmr1); emi_clk_sel = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_MASK; emi_clk_sel >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_OFFSET; - emi_slow_pof = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK; - emi_slow_pof >>= MXC_CCM_CSCMR1_ACLK_EMI_PODF_OFFSET; + emi_slow_podf = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK; + emi_slow_podf >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_OFFSET; switch (emi_clk_sel) { case 0: @@ -267,7 +267,7 @@ static u32 get_emi_slow_clk(void) break; } - return root_freq / (emi_slow_pof + 1); + return root_freq / (emi_slow_podf + 1); } #ifdef CONFIG_MX6SL -- 1.7.10.4

3 2

[U-Boot] [PATCH v2 1/3] dfu: unify mmc/nand read/write ops enum
by Afzal Mohammed 10 Sep '13

10 Sep '13

MMC and NAND independently defines same enumerators for read/write. Unify them by defining enum in dfu header. RAM support that is being added newly also can make use of it. Signed-off-by: Afzal Mohammed <afzal.mohd.ma(a)gmail.com> Cc: Lukasz Majewski <l.majewski(a)samsung.com> Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> --- v2: new drivers/dfu/dfu_mmc.c | 9 ++------- drivers/dfu/dfu_nand.c | 7 +------ include/dfu.h | 5 +++++ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 0871a77..f942758 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -13,16 +13,11 @@ #include <div64.h> #include <dfu.h> -enum dfu_mmc_op { - DFU_OP_READ = 1, - DFU_OP_WRITE, -}; - static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE) dfu_file_buf[CONFIG_SYS_DFU_MAX_FILE_SIZE]; static long dfu_file_buf_len; -static int mmc_block_op(enum dfu_mmc_op op, struct dfu_entity *dfu, +static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, u64 offset, void *buf, long *len) { char cmd_buf[DFU_CMD_BUF_SIZE]; @@ -65,7 +60,7 @@ static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len) return 0; } -static int mmc_file_op(enum dfu_mmc_op op, struct dfu_entity *dfu, +static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, void *buf, long *len) { char cmd_buf[DFU_CMD_BUF_SIZE]; diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c index 0ec12cf..edbf5a9 100644 --- a/drivers/dfu/dfu_nand.c +++ b/drivers/dfu/dfu_nand.c @@ -19,12 +19,7 @@ #include <jffs2/load_kernel.h> #include <nand.h> -enum dfu_nand_op { - DFU_OP_READ = 1, - DFU_OP_WRITE, -}; - -static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu, +static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu, u64 offset, void *buf, long *len) { loff_t start, lim; diff --git a/include/dfu.h b/include/dfu.h index 47b9055..6115d90 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -29,6 +29,11 @@ enum dfu_layout { DFU_FS_EXT4, }; +enum dfu_op { + DFU_OP_READ = 1, + DFU_OP_WRITE, +}; + struct mmc_internal_data { /* RAW programming */ unsigned int lba_start; -- 1.8.2.135.g7b592fa

2 6

[U-Boot] [PATCH 0/3] net: tsec: Fixes for mcast() in the tsec driver
by Claudiu Manoil 10 Sep '13

10 Sep '13

Though this patchset fixes tsec's driver mcast() instance primarily, the fix from net.h was propagated to other drivers too, as appropriate. Notably, these fixes also end up in removal of some unwanted global static vars from the tsec driver. Thanks. Claudiu Cc: Joe Hershberger <joe.hershberger(a)gmail.com> Claudiu Manoil (3): net: Fix mcast function pointer prototype net: tsec: Fix and cleanup tsec_mcast_addr() net: tsec: Fix priv pointer in tsec_mcast_addr() drivers/net/rtl8139.c | 2 +- drivers/net/tsec.c | 47 ++++++++++++++++++++--------------------------- include/net.h | 2 +- 3 files changed, 22 insertions(+), 29 deletions(-) -- 1.7.11.7

1 3

[U-Boot] standalone-examples: support custom GCC lib
by Jack Mitchell 10 Sep '13

10 Sep '13

Fighting with compiling u-boot today and dealing with problems related to using a custom built openembedded toolchain, I found the need to specify a custom location for the GCC lib. This is well supported when building u-boot, but my compile was failing in the standalone examples, as there was no support for a custom GCC lib in the standalone examples Makefile. I am no toolchain or u-boot expert, and as such to avoid the firey pits of flamewar hell, this is an RFC ;) -- Jack Mitchell (jack(a)embed.me.uk) Embedded Systems Engineer http://www.embed.me.uk --

3 5

[U-Boot] actux2 build error due to commit 4412db46
by Axel Lin 10 Sep '13

10 Sep '13

Hi Jack, I hit below build error, revert commit 4412db464 "standalone-examples: support custom GCC lib" fixes the build error. $ ./MAKEALL actux2 Configuring for actux2 board... make[1]: *** [hello_world] Error 1 make: *** [examples/standalone] Error 2 text data bss dec hex filename 226235 4912 543728 774875 bd2db ./u-boot /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_llsl': /home/axel/repos/git/u-boot/arch/arm/lib/_ashldi3.S:20: multiple definition of `__ashldi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_ashldi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__lshrdi3': /home/axel/repos/git/u-boot/arch/arm/lib/_lshrdi3.S:20: multiple definition of `__aeabi_llsr' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_lshrdi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_uidiv': /home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:20: multiple definition of `__udivsi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__lshrdi3': /home/axel/repos/git/u-boot/arch/arm/lib/_lshrdi3.S:20: multiple definition of `__lshrdi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_lshrdi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__umodsi3': /home/axel/repos/git/u-boot/arch/arm/lib/_umodsi3.S:18: multiple definition of `__umodsi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_umodsi3.S:18: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__divsi3': /home/axel/repos/git/u-boot/arch/arm/lib/_divsi3.S:83: multiple definition of `__aeabi_idiv' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_divsi3.S:83: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_lasr': /home/axel/repos/git/u-boot/arch/arm/lib/_ashrdi3.S:20: multiple definition of `__ashrdi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_ashrdi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_lasr': /home/axel/repos/git/u-boot/arch/arm/lib/_ashrdi3.S:20: multiple definition of `__aeabi_lasr' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_ashrdi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__div0': /home/axel/repos/git/u-boot/arch/arm/lib/div0.c:13: multiple definition of `__div0' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/div0.c:13: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_uidiv': /home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:20: multiple definition of `__aeabi_uidiv' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__divsi3': /home/axel/repos/git/u-boot/arch/arm/lib/_divsi3.S:83: multiple definition of `__divsi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_divsi3.S:83: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_llsl': /home/axel/repos/git/u-boot/arch/arm/lib/_ashldi3.S:20: multiple definition of `__aeabi_llsl' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_ashldi3.S:20: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_uidivmod': /home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:78: multiple definition of `__aeabi_uidivmod' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:78: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__modsi3': /home/axel/repos/git/u-boot/arch/arm/lib/_modsi3.S:66: multiple definition of `__modsi3' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_modsi3.S:66: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__aeabi_idivmod': /home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:88: multiple definition of `__aeabi_idivmod' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o:/home/axel/repos/git/u-boot/arch/arm/lib/_udivsi3.S:88: first defined here /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__div0': div0.c:(.text.__div0+0x0): undefined reference to `hang' /home/axel/repos/git/u-boot/arch/arm/lib/libgcc.o: In function `__div0': div0.c:(.text.__div0+0x0): undefined reference to `hang' make[1]: *** [hello_world] Error 1 make: *** [examples/standalone] Error 2 --------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with errors: 1 ( actux2 ) ----------------------------------------------------------

3 3

[U-Boot] [PATCH 1/3] video, cfb_console: make background and foreground color configurable
by Heiko Schocher 10 Sep '13

10 Sep '13

make CONSOLE_BG_COL/CONSOLE_FG_COL configurable through board config file. Clear video screen in video_init(). Signed-off-by: Heiko Schocher <hs(a)denx.de> Cc: Anatolij Gustschin <agust(a)denx.de> --- README | 5 +++++ drivers/video/cfb_console.c | 38 ++++++++++++++++++++------------------ include/video_fb.h | 5 +++++ 3 Dateien geändert, 30 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) diff --git a/README b/README index a30ea31..f3aaffc 100644 --- a/README +++ b/README @@ -691,6 +691,11 @@ The following options need to be configured: the "silent" environment variable. See doc/README.silent for more information. + CONFIG_SYS_CONSOLE_BG_COL: define the backgroundcolor, default + is 0x00. + CONFIG_SYS_CONSOLE_FG_COL: define the foregroundcolor, default + is 0xa0. + - Console Baudrate: CONFIG_BAUDRATE - in bps Select one of the baudrates listed in diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 822ed28..289c487 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2091,6 +2091,24 @@ defined(CONFIG_SANDBOX) || defined(CONFIG_X86) return 0; } +void video_clear(void) +{ + if (!video_fb_address) + return; +#ifdef VIDEO_HW_RECTFILL + video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */ + 0, /* dest pos x */ + 0, /* dest pos y */ + VIDEO_VISIBLE_COLS, /* frame width */ + VIDEO_VISIBLE_ROWS, /* frame height */ + bgx /* fill color */ + ); +#else + memsetl(video_fb_address, + (VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx); +#endif +} + static int video_init(void) { unsigned char color8; @@ -2177,6 +2195,8 @@ static int video_init(void) } eorx = fgx ^ bgx; + video_clear(); + #ifdef CONFIG_VIDEO_LOGO /* Plot the logo and get start point of console */ debug("Video: Drawing the logo ...\n"); @@ -2280,21 +2300,3 @@ int video_get_screen_columns(void) { return CONSOLE_COLS; } - -void video_clear(void) -{ - if (!video_fb_address) - return; -#ifdef VIDEO_HW_RECTFILL - video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */ - 0, /* dest pos x */ - 0, /* dest pos y */ - VIDEO_VISIBLE_COLS, /* frame width */ - VIDEO_VISIBLE_ROWS, /* frame height */ - bgx /* fill color */ - ); -#else - memsetl(video_fb_address, - (VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx); -#endif -} diff --git a/include/video_fb.h b/include/video_fb.h index 028e2a6..6cd4e37 100644 --- a/include/video_fb.h +++ b/include/video_fb.h @@ -18,8 +18,13 @@ #ifndef _VIDEO_FB_H_ #define _VIDEO_FB_H_ +#if defined(CONFIG_SYS_CONSOLE_FG_COL) && defined(CONFIG_SYS_CONSOLE_BG_COL) +#define CONSOLE_BG_COL CONFIG_SYS_CONSOLE_BG_COL +#define CONSOLE_FG_COL CONFIG_SYS_CONSOLE_FG_COL +#else #define CONSOLE_BG_COL 0x00 #define CONSOLE_FG_COL 0xa0 +#endif /* * Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT -- 1.7.11.7

1 0

[U-Boot] [PATCH] board/bsc9131rdb: Update IFC timings for NAND flash
by Prabhakar Kushwaha 10 Sep '13

10 Sep '13

Current IFC timings for NAND flash are too strict. Relaxing it to support existing K9F1G08U0B and new K9F1G08U0D flash Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- include/configs/BSC9131RDB.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 948394e..1d06c50 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -181,18 +181,18 @@ extern unsigned long get_sdram_size(void); | CSOR_NAND_PB(64)) /*Pages Per Block = 64*/ /* NAND Flash Timing Params */ -#define CONFIG_SYS_NAND_FTIM0 (FTIM0_NAND_TCCST(0x08) \ - | FTIM0_NAND_TWP(0x06) \ - | FTIM0_NAND_TWCHT(0x03) \ +#define CONFIG_SYS_NAND_FTIM0 (FTIM0_NAND_TCCST(0x03) \ + | FTIM0_NAND_TWP(0x05) \ + | FTIM0_NAND_TWCHT(0x02) \ | FTIM0_NAND_TWH(0x04)) -#define CONFIG_SYS_NAND_FTIM1 (FTIM1_NAND_TADLE(0x18) \ - | FTIM1_NAND_TWBE(0x23) \ - | FTIM1_NAND_TRR(0x08) \ +#define CONFIG_SYS_NAND_FTIM1 (FTIM1_NAND_TADLE(0x1C) \ + | FTIM1_NAND_TWBE(0x1E) \ + | FTIM1_NAND_TRR(0x07) \ | FTIM1_NAND_TRP(0x05)) #define CONFIG_SYS_NAND_FTIM2 (FTIM2_NAND_TRAD(0x08) \ | FTIM2_NAND_TREH(0x04) \ - | FTIM2_NAND_TWHRE(0x3f)) -#define CONFIG_SYS_NAND_FTIM3 FTIM3_NAND_TWW(0x22) + | FTIM2_NAND_TWHRE(0x11)) +#define CONFIG_SYS_NAND_FTIM3 FTIM3_NAND_TWW(0x04) #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -- 1.7.9.5

1 0

[U-Boot] [PATCH 1/1] m28evk board config
by lothar＠denx.de 10 Sep '13

10 Sep '13

From 24b6381162b4569ab86b481b8714d81877231f22 Mon Sep 17 00:00:00 2001 From: Lothar Rubusch <lothar(a)denx.de> Date: Fri, 6 Sep 2013 15:01:39 +0200 Subject: [PATCH] m28evk board specific configurations for setup with ext boot partition and separate ext rootfs Signed-off-by: Lothar Rubusch <lothar(a)denx.de> --- include/configs/m28evk.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index eba8759..b65456e 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -150,15 +150,25 @@ #endif /* Booting Linux */ -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " -#define CONFIG_BOOTCOMMAND "run bootcmd_net" +#define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ + "fdtfile=imx28-m28evk.dtb\0" \ + "consdev=ttyAMA0\0" \ + "baudrate=115200\0" \ + "bootdev=/dev/mmcblk0p2\0" \ + "rootdev=/dev/mmcblk0p3\0" \ + "netdev=eth0\0" \ + "hostname=m28evk\0" \ + "rootpath=/opt/eldk-5.3/armv5te/rootfs-qte-sdk\0" \ + "kernel_addr_r=0x42000000\0" \ + "fdt_addr_r=0x41000000\0" \ "update_nand_full_filename=u-boot.nand\0" \ "update_nand_firmware_filename=u-boot.sb\0" \ "update_sd_firmware_filename=u-boot.sd\0" \ @@ -196,7 +206,69 @@ "setexpr fw_sz ${fw_sz} + 1 ; " \ "mmc write ${loadaddr} 0x800 ${fw_sz} ; " \ "fi ; " \ - "fi\0" + "fi\0" \ + "addcons=setenv bootargs ${bootargs} console=${consdev},${baudrate}\0" \ + "addip=" \ + "setenv bootargs ${bootargs} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \ + "${hostname}:${netdev}:off\0" \ + "addmisc=setenv bootargs ${bootargs} ${miscargs}\0" \ + "adddfltmtd=" \ + "if test \"x${mtdparts}\" == \"x\" ; " \ + "then mtdparts default ; " \ + "fi\0" \ + "addmtd=" \ + "run adddfltmtd ; " \ + "setenv bootargs ${bootargs} ${mtdparts}\0" \ + "addargs=run addcons addmtd addmisc\0" \ + "kernel_mmcload=" \ + "mmc rescan ; " \ + "ext2load mmc 0:2 ${kernel_addr_r} ${bootfile}\0" \ + "kernel_nandload=nand read ${kernel_addr_r} kernel\0" \ + "kernel_netload=tftp ${kernel_addr_r} ${bootfile}\0" \ + "fdt_mmcload=" \ + "mmc rescan ; " \ + "ext2load mmc 0:2 ${fdt_addr_r} ${fdtfile}\0" \ + "fdt_nandload=nand read ${fdt_addr_r} fdt\0" \ + "fdt_netload=tftp ${fdt_addr_r} ${fdtfile}\0" \ + "miscargs=nohlt panic=1\0" \ + "mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \ + "nandargs=" \ + "setenv bootargs ubi.mtd=6 root=ubi0:rootfs " \ + "rootfstype=ubifs\0" \ + "nfsargs=" \ + "setenv bootargs root=/dev/nfs rw " \ + "nfsroot=${serverip}:${rootpath},v3,tcp\0" \ + "mmcload=run kernel_mmcload fdt_mmcload\0" \ + "nandload=run kernel_nandload fdt_nandload\0" \ + "netload=run kernel_netload fdt_netload\0" \ + "mmc_nfs=" \ + "run mmcload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "mmc_mmc=" \ + "run mmcload mmcargs addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "mmc_nand=" \ + "run mmcload nandargs addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "nand_mmc=" \ + "run nandload mmcargs addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "nand_nfs=" \ + "run nandload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "nand_nand=" \ + "run nandload nandargs addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "net_mmc=" \ + "run netload mmcargs addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "net_nfs=" \ + "run netload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "net_nand=" \ + "run netload nandargs addargs ; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" /* The rest of the configuration is shared */ #include <configs/mxs.h> -- 1.7.11.7

4 4