August 2011 - U-Boot

[U-Boot] [PATCH] serial: uartlite: Support for SERIAL_MULTI
by Michal Simek 06 Oct '11

06 Oct '11

Add support for SERIAL MULTI for Microblaze. It can be used by other archs too. Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- arch/microblaze/lib/board.c | 4 + common/serial.c | 14 ++++ drivers/serial/serial_xuartlite.c | 138 +++++++++++++++++++++++++++++----- include/configs/microblaze-generic.h | 2 + include/serial.h | 9 ++- 5 files changed, 148 insertions(+), 19 deletions(-) diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index c00d96b..3b671b8 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -31,6 +31,7 @@ #include <watchdog.h> #include <stdio_dev.h> #include <net.h> +#include <serial.h> DECLARE_GLOBAL_DATA_PTR; @@ -111,6 +112,9 @@ void board_init (void) monitor_flash_len = __end - __text_start; +#ifdef CONFIG_SERIAL_MULTI + serial_initialize(); +#endif /* * The Malloc area is immediately below the monitor copy in DRAM * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off diff --git a/common/serial.c b/common/serial.c index 995d268..df02fa5 100644 --- a/common/serial.c +++ b/common/serial.c @@ -108,6 +108,20 @@ void serial_initialize (void) #if defined(CONFIG_SYS_BFIN_UART) serial_register_bfin_uart(); #endif +#if defined(CONFIG_XILINX_UARTLITE) +# ifdef XILINX_UARTLITE_BASEADDR + serial_register(&uartlite_serial0_device); +# endif /* XILINX_UARTLITE_BASEADDR */ +# ifdef XILINX_UARTLITE_BASEADDR1 + serial_register(&uartlite_serial1_device); +# endif /* XILINX_UARTLITE_BASEADDR1 */ +# ifdef XILINX_UARTLITE_BASEADDR2 + serial_register(&uartlite_serial2_device); +# endif /* XILINX_UARTLITE_BASEADDR2 */ +# ifdef XILINX_UARTLITE_BASEADDR3 + serial_register(&uartlite_serial3_device); +# endif /* XILINX_UARTLITE_BASEADDR3 */ +#endif /* CONFIG_XILINX_UARTLITE */ serial_assign (default_serial_console ()->name); } diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index 00d0eaa..3e83217 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -25,20 +25,76 @@ */ #include <config.h> +#include <common.h> #include <asm/io.h> - -#define RX_FIFO_OFFSET 0 /* receive FIFO, read only */ -#define TX_FIFO_OFFSET 4 /* transmit FIFO, write only */ -#define STATUS_REG_OFFSET 8 /* status register, read only */ +#include <linux/compiler.h> +#include <serial.h> #define SR_TX_FIFO_FULL 0x08 /* transmit FIFO full */ #define SR_RX_FIFO_VALID_DATA 0x01 /* data in receive FIFO */ #define SR_RX_FIFO_FULL 0x02 /* receive FIFO full */ -#define UARTLITE_STATUS (CONFIG_SERIAL_BASE + STATUS_REG_OFFSET) -#define UARTLITE_TX_FIFO (CONFIG_SERIAL_BASE + TX_FIFO_OFFSET) -#define UARTLITE_RX_FIFO (CONFIG_SERIAL_BASE + RX_FIFO_OFFSET) +struct uartlite { + volatile u32 rx_fifo; + volatile u32 tx_fifo; + volatile u32 status; +}; + +static struct uartlite *userial_ports[4] = { +#ifdef XILINX_UARTLITE_BASEADDR + (struct uartlite *)XILINX_UARTLITE_BASEADDR, +#else + NULL, +#endif +#ifdef XILINX_UARTLITE_BASEADDR1 + (struct uartlite *)XILINX_UARTLITE_BASEADDR1, +#else + NULL, +#endif +#ifdef XILINX_UARTLITE_BASEADDR2 + (struct uartlite *)XILINX_UARTLITE_BASEADDR2, +#else + NULL, +#endif +#ifdef XILINX_UARTLITE_BASEADDR3 + (struct uartlite *)XILINX_UARTLITE_BASEADDR3 +#else + NULL +#endif +}; + +void uartlite_serial_putc(const char c, const int port) +{ + struct uartlite *regs = userial_ports[port]; + if (c == '\n') + uartlite_serial_putc('\r', port); + while (regs->status & SR_TX_FIFO_FULL) + ; + regs->tx_fifo = (unsigned char) (c & 0xff); +} + +void uartlite_serial_puts(const char * s, const int port) +{ + while (*s) { + uartlite_serial_putc(*s++, port); + } +} + +int uartlite_serial_getc(const int port) +{ + struct uartlite *regs = userial_ports[port]; + while (!(regs->status & SR_RX_FIFO_VALID_DATA)) + ; + return regs->rx_fifo & 0xff; +} + +int uartlite_serial_tstc(const int port) +{ + struct uartlite *regs = userial_ports[port]; + return regs->status & SR_RX_FIFO_VALID_DATA; +} +#if !defined(CONFIG_SERIAL_MULTI) int serial_init(void) { /* FIXME: Nothing for now. We should initialize fifo, etc */ @@ -52,26 +108,72 @@ void serial_setbrg(void) void serial_putc(const char c) { - if (c == '\n') - serial_putc('\r'); - while (in_be32((u32 *) UARTLITE_STATUS) & SR_TX_FIFO_FULL); - out_be32((u32 *) UARTLITE_TX_FIFO, (unsigned char) (c & 0xff)); + uartlite_serial_putc(c, 0); } -void serial_puts(const char * s) +void serial_puts(const char *s) { - while (*s) { - serial_putc(*s++); - } + uartlite_serial_puts(s, 0); } int serial_getc(void) { - while (!(in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA)); - return in_be32((u32 *) UARTLITE_RX_FIFO) & 0xff; + return uartlite_serial_getc(0); } int serial_tstc(void) { - return (in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA); + return uartlite_serial_tstc(0); +} +#endif + +#if defined(CONFIG_SERIAL_MULTI) +/* Multi serial device functions */ +#define DECLARE_ESERIAL_FUNCTIONS(port) \ + int userial##port##_init (void) {return(0);}\ + void userial##port##_setbrg (void) {}\ + int userial##port##_getc (void) {return uartlite_serial_getc(port);}\ + int userial##port##_tstc (void) {return uartlite_serial_tstc(port);}\ + void userial##port##_putc (const char c) {uartlite_serial_putc(c, port);}\ + void userial##port##_puts (const char *s) {uartlite_serial_puts(s, port);} + +/* Serial device descriptor */ +#define INIT_ESERIAL_STRUCTURE(port,name) {\ + name,\ + userial##port##_init,\ + NULL,\ + userial##port##_setbrg,\ + userial##port##_getc,\ + userial##port##_tstc,\ + userial##port##_putc,\ + userial##port##_puts, } + +DECLARE_ESERIAL_FUNCTIONS(0); +struct serial_device uartlite_serial0_device = + INIT_ESERIAL_STRUCTURE(0,"ttyUL0"); +DECLARE_ESERIAL_FUNCTIONS(1); +struct serial_device uartlite_serial1_device = + INIT_ESERIAL_STRUCTURE(1,"ttyUL1"); +DECLARE_ESERIAL_FUNCTIONS(2); +struct serial_device uartlite_serial2_device = + INIT_ESERIAL_STRUCTURE(2,"ttyUL2"); +DECLARE_ESERIAL_FUNCTIONS(3); +struct serial_device uartlite_serial3_device = + INIT_ESERIAL_STRUCTURE(3,"ttyUL3"); + +__weak struct serial_device *default_serial_console(void) +{ +# ifdef XILINX_UARTLITE_BASEADDR + return &uartlite_serial0_device; +# endif /* XILINX_UARTLITE_BASEADDR */ +# ifdef XILINX_UARTLITE_BASEADDR1 + return &uartlite_serial1_device; +# endif /* XILINX_UARTLITE_BASEADDR1 */ +# ifdef XILINX_UARTLITE_BASEADDR2 + return &uartlite_serial2_device; +# endif /* XILINX_UARTLITE_BASEADDR2 */ +# ifdef XILINX_UARTLITE_BASEADDR3 + return &uartlite_serial3_device; +# endif /* XILINX_UARTLITE_BASEADDR3 */ } +#endif /* CONFIG_SERIAL_MULTI */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 0f46e62..1b60bfa 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -31,6 +31,8 @@ #define CONFIG_MICROBLAZE 1 #define MICROBLAZE_V5 1 +#define CONFIG_SERIAL_MULTI 1 + /* uart */ #ifdef XILINX_UARTLITE_BASEADDR # define CONFIG_XILINX_UARTLITE diff --git a/include/serial.h b/include/serial.h index ff1ce99..f047d2f 100644 --- a/include/serial.h +++ b/include/serial.h @@ -31,7 +31,7 @@ extern struct serial_device * default_serial_console (void); defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \ defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \ - defined(CONFIG_TEGRA2) + defined(CONFIG_TEGRA2) || defined(CONFIG_MICROBLAZE) extern struct serial_device serial0_device; extern struct serial_device serial1_device; #if defined(CONFIG_SYS_NS16550_SERIAL) @@ -50,6 +50,13 @@ extern struct serial_device serial4_device; extern struct serial_device serial6_device; #endif +#if defined(CONFIG_XILINX_UARTLITE) +extern struct serial_device uartlite_serial0_device; +extern struct serial_device uartlite_serial1_device; +extern struct serial_device uartlite_serial2_device; +extern struct serial_device uartlite_serial3_device; +#endif + #if defined(CONFIG_S3C2410) extern struct serial_device s3c24xx_serial0_device; extern struct serial_device s3c24xx_serial1_device; -- 1.5.5.6

2 1

[U-Boot] [PATCH 0/7] Bootgraph.pl instrumentation support for UBoot
by Andrew Murray 06 Oct '11

06 Oct '11

This patchset introduces the CONFIG_BOOT_TRACE option which provides support for boot time instrumentation. When enabled printf output is prefixed with timing information (similar to the kernel's CONFIG_PRINTK_TIME option) and additional output is generated which instruments functions and commands called (much like the kernel's initcall_debug functionality). The kernel's bootgraph.pl script has been ported to render UBoots instrumented ouptut into a pretty SVG graph. An example of this can be found here: http://goo.gl/dX8aR - which shows the boot time of a Beagle board. The patch currently provides support for instrumentation of UBoot commands (e.g. U_BOOT_CMD) for all platforms but only when the HUSH shell is not in use. Initialisation instrumentation is only limited to the arch/arm/lib/board.c file at present but can very easily be extended to other relevant files. The patch also includes documentation. Andrew Murray (7): Add bootgraph.pl script for generating a boot graph SVG file Add macros for recording init calls during UBoot execution Add timing information to printf's for use with bootgraph.pl Add bootgraph instrumentation for ARM boards Add bootgraph instrumentation for bootm command Add bootgraph instrumentation for UBoot commands Add documentation for bootgraph.pl arch/arm/lib/board.c | 28 +++++--- common/cmd_bootm.c | 1 + common/console.c | 12 +++- common/main.c | 19 +++-- doc/README.bootgraph | 57 +++++++++++++++ include/common.h | 23 ++++++ tools/bootgraph.pl | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 312 insertions(+), 17 deletions(-) create mode 100644 doc/README.bootgraph create mode 100755 tools/bootgraph.pl -- 1.7.4.1

6 43

[U-Boot] [PATCH 0/2] console: Squelch and pre-console buffer
by Graeme Russ 05 Oct '11

05 Oct '11

This is a more complete followup patch to my original 'Pre-console buffer' patch. This series includes squelching of all console I/O if gd->have_console is 0 (console not initialised yet) unless the board is configured to use the pre-console buffer (in which case console output prior to the console being initialised is redirected to the buffer - All console input is still squelched prior to the console being initialised) If the pre-console buffer is enabled, the buffer is sent to console as soon as the console is initialised. Graeme Russ (2): console: Squelch pre-console output in console functions console: Implement pre-console buffer arch/arm/include/asm/global_data.h | 3 + arch/avr32/include/asm/global_data.h | 3 + arch/blackfin/include/asm/global_data.h | 3 + arch/m68k/include/asm/global_data.h | 3 + arch/microblaze/include/asm/global_data.h | 3 + arch/mips/include/asm/global_data.h | 3 + arch/nios2/include/asm/global_data.h | 3 + arch/powerpc/cpu/mpc5xxx/i2c.c | 30 +++++---------- arch/powerpc/cpu/mpc8xx/i2c.c | 18 +++------ arch/powerpc/include/asm/global_data.h | 3 + arch/sh/include/asm/global_data.h | 3 + arch/sparc/include/asm/global_data.h | 4 +- arch/x86/include/asm/global_data.h | 3 + common/console.c | 60 +++++++++++++++++++++++++++++ drivers/i2c/ppc4xx_i2c.c | 5 +-- drivers/i2c/soft_i2c.c | 1 - 16 files changed, 110 insertions(+), 38 deletions(-) -- 1.7.5.2.317.g391b14

5 49

[U-Boot] [PATCH 1/2] Makefile: drop imx31_phycore from general Makefile
by Stefano Babic 05 Oct '11

05 Oct '11

Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- Makefile | 8 -------- boards.cfg | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 3b52c68..fec662b 100644 --- a/Makefile +++ b/Makefile @@ -896,14 +896,6 @@ apollon_config : unconfig @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk @$(MKCONFIG) $@ arm arm1136 apollon - omap24xx -imx31_phycore_eet_config \ -imx31_phycore_config : unconfig - @mkdir -p $(obj)include - @if [ -n "$(findstring _eet_,$@)" ]; then \ - echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h; \ - fi - @$(MKCONFIG) -n $@ -a imx31_phycore arm arm1136 imx31_phycore - mx31 - mx31pdk_config \ mx31pdk_nand_config : unconfig @mkdir -p $(obj)include diff --git a/boards.cfg b/boards.cfg index 3cd35d7..fc8ca0a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -39,6 +39,8 @@ integratorcp_cm1136 arm arm1136 integrator armltd qong arm arm1136 - davedenx mx31 mx31ads arm arm1136 - freescale mx31 imx31_litekit arm arm1136 - logicpd mx31 +imx31_phycore arm arm1136 - - mx31 +imx31_phycore_eet arm arm1136 imx31_phycore - mx31 imx31_phycore:IMX31_PHYCORE_EET mx35pdk arm arm1136 - freescale mx35 omap2420h4 arm arm1136 - ti omap24xx tnetv107x_evm arm arm1176 tnetv107xevm ti tnetv107x -- 1.7.1

3 4

[U-Boot] [PATCH] Makefile: remove tx25 exception
by Stefano Babic 05 Oct '11

05 Oct '11

An entry in the main Makefile for the tx25 board is not necessary, and the board is added to boards.cfg as all other targets. Signed-off-by: Stefano Babic <sbabic(a)denx.de> CC: Wolfgang Denk <wd(a)denx.de> --- Makefile | 4 ---- boards.cfg | 1 + 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 676dc29..2166644 100644 --- a/Makefile +++ b/Makefile @@ -847,10 +847,6 @@ SX1_config: unconfig fi; @$(MKCONFIG) -n $@ SX1 arm arm925t sx1 -tx25_config : unconfig - @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk - @$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25 - edb9301_config \ edb9302_config \ edb9302a_config \ diff --git a/boards.cfg b/boards.cfg index c31114d..6585163 100644 --- a/boards.cfg +++ b/boards.cfg @@ -162,6 +162,7 @@ rd6281a arm arm926ejs - Marvell sheevaplug arm arm926ejs - Marvell kirkwood dockstar arm arm926ejs - Seagate kirkwood jadecpu arm arm926ejs jadecpu syteco mb86r0x +tx25 arm arm926ejs tx25 karo mx25 zmx25 arm arm926ejs zmx25 syteco mx25 imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 -- 1.7.1

2 4

[U-Boot] [PATCH 0/9] arm, davinci: add support for dm368 based cam_enc_4xx board
by Heiko Schocher 05 Oct '11

05 Oct '11

- DM368 SOC - booting with nand_spl not with UBL from TI - before loading u-boot from NAND into RAM, test the RAM with the post memory test. If error is found, switch all LEDs on and halt system. - SPI Flash Dataflash Typ: M25PE80 - Ethernet DM9161BI following patches posted on this list are needed for this board support: - get CONFIG_POST working for arm boards: [PATCH] post, memorytest: fix if vstart is not = 0x0 http://patchwork.ozlabs.org/patch/98127/ [PATCH v2] post, memorytest: add support for none powerpc archs http://patchwork.ozlabs.org/patch/98522/ [PATCH] post, memory test: add memory_post_test() to include file http://patchwork.ozlabs.org/patch/98126/ [PATCH 1/2] arm, lib/board.c: Coding Style cleanup http://patchwork.ozlabs.org/patch/98532/ update: http://patchwork.ozlabs.org/patch/104755/ http://patchwork.ozlabs.org/patch/104932/ [PATCH 2/2] arm, lib/board.c: use gd->ram_size instead of bd->bi_memsize http://patchwork.ozlabs.org/patch/98531/ Patches based on: commit 68d4230c3ccce96a72c5b99e48399bf1796fe3c6 Author: Ramneek Mehresh <ramneek.mehresh(a)freescale.com> Date: Tue Jun 7 10:10:43 2011 +0000 powerpc/85xx: Add default usb mode and phy type to hwconfig "MAKEALL arm" looks good, checkpatch says: total: 0 errors, 0 warnings, 585 lines checked 20110715_ml/0001-mkimage-add-UBL-header-support-for-booting-davinci-c.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 12 lines checked 20110715_ml/0002-arm-arm926-fix-missing-symbols-in-NAND_SPL-mode.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 37 lines checked 20110715_ml/0003-nand-add-a-hw-specific-subcommand-to-the-nand-comman.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 485 lines checked 20110715_ml/0004-arm-davinci-add-header-files-for-dm365.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 505 lines checked 20110715_ml/0005-arm-davinci-add-lowlevel-function-for-dm365-soc.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 91 lines checked 20110715_ml/0006-arm926ejs-davinci-add-cpuinfo-for-dm365.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 15 lines checked 20110715_ml/0007-arm926ejs-davinci-add-missing-spi-defines-for-dm365.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 54 lines checked 20110715_ml/0008-spl-nand-add-4bit-HW-ecc-oob-first-nand_read_page-fu.patch has no obvious style problems and is ready for submission. WARNING: Use #include <linux/io.h> instead of <asm/io.h> #153: FILE: board/ait/cam_enc_4xx/cam_enc_4xx.c:26: +#include <asm/io.h> WARNING: Use #include <linux/errno.h> instead of <asm/errno.h> #491: FILE: board/ait/cam_enc_4xx/cam_enc_4xx_nand_spl.c:27: +#include <asm/errno.h> WARNING: Use #include <linux/io.h> instead of <asm/io.h> #493: FILE: board/ait/cam_enc_4xx/cam_enc_4xx_nand_spl.c:29: +#include <asm/io.h> total: 0 errors, 3 warnings, 1377 lines checked 20110715_ml/0009-arm-davinci-add-cam_enc_4xx-support.patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. @Sandeep Paulraj: I try to find time to switch to the new spl framework from Daniel Schwierzeck, so arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c could be moved to arch/arm/cpu/arm926ejs/davinci/spl.c but I don;t know (at the moment), if this code is valid for all davinci cpus ... maybe you can give a comment on this? Heiko Schocher (9): mkimage: add UBL header support for booting davinci cpus arm, arm926: fix missing symbols in NAND_SPL mode nand: add a hw specific subcommand to the nand command. arm, davinci: add header files for dm365 arm, davinci: add lowlevel function for dm365 soc arm926ejs, davinci: add cpuinfo for dm365 arm926ejs, davinci: add missing spi defines for dm365 spl, nand: add 4bit HW ecc oob first nand_read_page function arm, davinci: add cam_enc_4xx support .gitignore | 1 + MAINTAINERS | 1 + MAKEALL | 1 + Makefile | 5 + README | 2 + arch/arm/cpu/arm926ejs/davinci/cpu.c | 34 ++- arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c | 463 ++++++++++++++++++++ arch/arm/cpu/arm926ejs/start.S | 6 + arch/arm/include/asm/arch-davinci/aintc_defs.h | 50 +++ arch/arm/include/asm/arch-davinci/ddr2_defs.h | 92 ++++ arch/arm/include/asm/arch-davinci/dm365_lowlevel.h | 42 ++ arch/arm/include/asm/arch-davinci/hardware.h | 13 + arch/arm/include/asm/arch-davinci/pll_defs.h | 84 ++++ arch/arm/include/asm/arch-davinci/psc_defs.h | 129 ++++++ arch/arm/include/asm/arch-davinci/syscfg_defs.h | 66 +++ arch/arm/include/asm/arch-davinci/timer_defs.h | 48 ++ board/ait/cam_enc_4xx/Makefile | 52 +++ board/ait/cam_enc_4xx/cam_enc_4xx.c | 331 ++++++++++++++ board/ait/cam_enc_4xx/cam_enc_4xx_nand_spl.c | 115 +++++ board/ait/cam_enc_4xx/config.mk | 19 + board/ait/cam_enc_4xx/ublimage.cfg | 48 ++ boards.cfg | 1 + common/cmd_nand.c | 8 + common/image.c | 1 + doc/README.davinci.nand_spl | 141 ++++++ doc/README.ublimage | 141 ++++++ include/configs/cam_enc_4xx.h | 423 ++++++++++++++++++ include/image.h | 1 + include/nand.h | 3 + nand_spl/board/ait/cam_enc_4xx/Makefile | 152 +++++++ nand_spl/board/ait/cam_enc_4xx/u-boot.lds | 75 ++++ nand_spl/nand_boot.c | 42 ++ tools/Makefile | 2 + tools/mkimage.c | 2 + tools/mkimage.h | 1 + tools/ublimage.c | 275 ++++++++++++ tools/ublimage.h | 103 +++++ 37 files changed, 2969 insertions(+), 4 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c create mode 100644 arch/arm/include/asm/arch-davinci/aintc_defs.h create mode 100644 arch/arm/include/asm/arch-davinci/ddr2_defs.h create mode 100644 arch/arm/include/asm/arch-davinci/dm365_lowlevel.h create mode 100644 arch/arm/include/asm/arch-davinci/pll_defs.h create mode 100644 arch/arm/include/asm/arch-davinci/psc_defs.h create mode 100644 arch/arm/include/asm/arch-davinci/syscfg_defs.h create mode 100644 arch/arm/include/asm/arch-davinci/timer_defs.h create mode 100644 board/ait/cam_enc_4xx/Makefile create mode 100644 board/ait/cam_enc_4xx/cam_enc_4xx.c create mode 100644 board/ait/cam_enc_4xx/cam_enc_4xx_nand_spl.c create mode 100644 board/ait/cam_enc_4xx/config.mk create mode 100644 board/ait/cam_enc_4xx/ublimage.cfg create mode 100644 doc/README.davinci.nand_spl create mode 100644 doc/README.ublimage create mode 100644 include/configs/cam_enc_4xx.h create mode 100644 nand_spl/board/ait/cam_enc_4xx/Makefile create mode 100644 nand_spl/board/ait/cam_enc_4xx/u-boot.lds create mode 100644 tools/ublimage.c create mode 100644 tools/ublimage.h -- 1.7.6

3 23

[U-Boot] [PATCH] net, davinci_emac: make clock divider in MDIO control register configurable
by Heiko Schocher 05 Oct '11

05 Oct '11

Define CONFIG_SYS_EMAC_TI_CLKDIV for setting the clkdiv value in the MDIO control register. Signed-off-by: Heiko Schocher <hs(a)denx.de> cc: Sandeep Paulraj <s-paulraj(a)ti.com> cc: Wolfgang Denk <wd(a)denx.de> --- drivers/net/davinci_emac.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 66c0d13..c911b64 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -53,6 +53,11 @@ unsigned int emac_dbg = 0; #define emac_gigabit_enable() /* no gigabit to enable */ #endif +#if !defined(CONFIG_SYS_EMAC_TI_CLKDIV) +#define CONFIG_SYS_EMAC_TI_CLKDIV ((EMAC_MDIO_BUS_FREQ / \ + EMAC_MDIO_CLOCK_FREQ) - 1) +#endif + static void davinci_eth_mdio_enable(void); static int gen_init_phy(int phy_addr); @@ -126,7 +131,7 @@ static void davinci_eth_mdio_enable(void) { u_int32_t clkdiv; - clkdiv = (EMAC_MDIO_BUS_FREQ / EMAC_MDIO_CLOCK_FREQ) - 1; + clkdiv = CONFIG_SYS_EMAC_TI_CLKDIV; writel((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | @@ -427,7 +432,7 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) #endif /* Init MDIO & get link state */ - clkdiv = (EMAC_MDIO_BUS_FREQ / EMAC_MDIO_CLOCK_FREQ) - 1; + clkdiv = CONFIG_SYS_EMAC_TI_CLKDIV; writel((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | MDIO_CONTROL_FAULT, &adap_mdio->CONTROL); -- 1.7.6

1 1

[U-Boot] [PATCH] arm, usb, davinci: make USBPHY_CTL register configurable
by Heiko Schocher 05 Oct '11

05 Oct '11

Define CONFIG_DV_USBPHY_CTL for setting the USB PHY control register. Signed-off-by: Heiko Schocher <hs(a)denx.de> cc: Sandeep Paulraj <s-paulraj(a)ti.com> cc: Remy Bohmer <linux(a)bohmer.net> --- drivers/usb/musb/davinci.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index f56f2df..98c2c62 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -26,6 +26,10 @@ #include "davinci.h" #include <asm/arch/hardware.h> +#if !defined(CONFIG_DV_USBPHY_CTL) +#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN) +#endif + /* MUSB platform configuration */ struct musb_config musb_cfg = { .regs = (struct musb_regs *)MENTOR_USB0_BASE, @@ -50,7 +54,7 @@ static u8 phy_on(void) writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); #else - writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); + writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR); #endif timeout = musb_cfg.timeout; -- 1.7.6

3 6

[U-Boot] [PATCH] video: update the Freescale DIU driver to use linux/fb.h
by Timur Tabi 01 Oct '11

01 Oct '11

Update the Freescale DIU video driver (fsl_diu_fb.c) to use linux/fb.h. Some data structures from this header file were just copied into fsl_diu_fb.c. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- drivers/video/fsl_diu_fb.c | 54 ++++--------------------------------------- 1 files changed, 5 insertions(+), 49 deletions(-) diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c index e1d6c26..cb43904 100644 --- a/drivers/video/fsl_diu_fb.c +++ b/drivers/video/fsl_diu_fb.c @@ -31,52 +31,8 @@ #include "videomodes.h" #include <video_fb.h> #include <fsl_diu_fb.h> - -struct fb_var_screeninfo { - unsigned int xres; /* visible resolution */ - unsigned int yres; - - unsigned int bits_per_pixel; /* guess what */ - - /* Timing: All values in pixclocks, except pixclock (of course) */ - unsigned int pixclock; /* pixel clock in ps (pico seconds) */ - unsigned int left_margin; /* time from sync to picture */ - unsigned int right_margin; /* time from picture to sync */ - unsigned int upper_margin; /* time from sync to picture */ - unsigned int lower_margin; - unsigned int hsync_len; /* length of horizontal sync */ - unsigned int vsync_len; /* length of vertical sync */ - unsigned int sync; /* see FB_SYNC_* */ - unsigned int vmode; /* see FB_VMODE_* */ - unsigned int rotate; /* angle we rotate counter clockwise */ -}; - -struct fb_info { - struct fb_var_screeninfo var; /* Current var */ - unsigned int smem_len; /* Length of frame buffer mem */ - unsigned int type; /* see FB_TYPE_* */ - unsigned int line_length; /* length of a line in bytes */ - - void *screen_base; - unsigned long screen_size; -}; - -struct fb_videomode { - const char *name; /* optional */ - unsigned int refresh; /* optional */ - unsigned int xres; - unsigned int yres; - unsigned int pixclock; - unsigned int left_margin; - unsigned int right_margin; - unsigned int upper_margin; - unsigned int lower_margin; - unsigned int hsync_len; - unsigned int vsync_len; - unsigned int sync; - unsigned int vmode; - unsigned int flag; -}; +#include <linux/list.h> +#include <linux/fb.h> /* This setting is used for the ifm pdm360ng with PRIMEVIEW PM070WL3 */ static struct fb_videomode fsl_diu_mode_800_480 = { @@ -248,7 +204,7 @@ static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align) * point to the framebuffer memory. Memory is aligned as needed. */ static struct diu_ad *allocate_fb(unsigned int xres, unsigned int yres, - unsigned int depth, void **fb) + unsigned int depth, char **fb) { unsigned long size = xres * yres * depth; struct diu_addr addr; @@ -327,10 +283,10 @@ int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix) info.var.vsync_len = fsl_diu_mode_db->vsync_len; info.var.sync = fsl_diu_mode_db->sync; info.var.vmode = fsl_diu_mode_db->vmode; - info.line_length = info.var.xres * info.var.bits_per_pixel / 8; + info.fix.line_length = info.var.xres * info.var.bits_per_pixel / 8; /* Memory allocation for framebuffer */ - info.smem_len = + info.screen_size = info.var.xres * info.var.yres * (info.var.bits_per_pixel / 8); ad = allocate_fb(info.var.xres, info.var.yres, info.var.bits_per_pixel / 8, &info.screen_base); -- 1.7.3.4

2 1

[U-Boot] [PATCH] Small refactor to remove duplicate serial code
by Simon Glass 01 Oct '11

01 Oct '11

This tidies up duplicate code, and checks that default_serial_console() does in fact produce a device. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/serial.c | 64 +++++++++++++++++------------------------------------- 1 files changed, 20 insertions(+), 44 deletions(-) diff --git a/common/serial.c b/common/serial.c index 995d268..7bfc861 100644 --- a/common/serial.c +++ b/common/serial.c @@ -158,73 +158,49 @@ void serial_reinit_all (void) } } -int serial_init (void) +static struct serial_device *get_current(void) { - if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { - struct serial_device *dev = default_serial_console (); + struct serial_device *dev; - return dev->init (); - } + if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { + dev = default_serial_console(); + + /* We must have a console device */ + if (!dev) + panic("Cannot find console"); + } else + dev = serial_current; + return dev; +} - return serial_current->init (); +int serial_init(void) +{ + return get_current()->init(); } void serial_setbrg (void) { - if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { - struct serial_device *dev = default_serial_console (); - - dev->setbrg (); - return; - } - - serial_current->setbrg (); + get_current()->setbrg(); } int serial_getc (void) { - if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { - struct serial_device *dev = default_serial_console (); - - return dev->getc (); - } - - return serial_current->getc (); + return get_current()->getc(); } int serial_tstc (void) { - if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { - struct serial_device *dev = default_serial_console (); - - return dev->tstc (); - } - - return serial_current->tstc (); + return get_current()->tstc(); } void serial_putc (const char c) { - if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { - struct serial_device *dev = default_serial_console (); - - dev->putc (c); - return; - } - - serial_current->putc (c); + get_current()->putc(c); } void serial_puts (const char *s) { - if (!(gd->flags & GD_FLG_RELOC) || !serial_current) { - struct serial_device *dev = default_serial_console (); - - dev->puts (s); - return; - } - - serial_current->puts (s); + get_current()->puts(s); } #if CONFIG_POST & CONFIG_SYS_POST_UART -- 1.7.3.1

3 3