June 2009 - U-Boot

[U-Boot] [PATCH 1/7] eSPI: add the eSPI register support
by Mingkai Hu 27 Aug '09

27 Aug '09

Signed-off-by: Mingkai Hu <Mingkai.hu(a)freescale.com> --- include/asm-ppc/immap_85xx.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 094fb9c..f3ab750 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -258,6 +258,21 @@ typedef struct ccsr_lbc { } ccsr_lbc_t; /* + * eSPI Registers(0x7000-0x8000) + */ +typedef struct ccsr_espi { + uint mode; /* 0x00 - eSPI mode register */ + uint event; /* 0x04 - eSPI event register */ + uint mask; /* 0x08 - eSPI mask register */ + uint com; /* 0x0c - eSPI command register */ + uint tx; /* 0x10 - eSPI transmit FIFO access register */ + uint rx; /* 0x14 - eSPI receive FIFO access register */ + char res1[8]; /* reserved */ + uint csmode[4]; /* 0x20 - 0x2c: sSPI CS0/1/2/3 mode register */ + char res2[4048]; /* fill up to 0x1000 */ +} ccsr_espi_t; + +/* * PCI Registers(0x8000-0x9000) */ typedef struct ccsr_pcix { @@ -1682,6 +1697,8 @@ typedef struct ccsr_gur { #define CONFIG_SYS_MPC85xx_DDR2_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_DDR2_OFFSET) #define CONFIG_SYS_MPC85xx_LBC_OFFSET (0x5000) #define CONFIG_SYS_MPC85xx_LBC_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_LBC_OFFSET) +#define CONFIG_SYS_MPC85xx_ESPI_OFFSET (0x7000) +#define CONFIG_SYS_MPC85xx_ESPI_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_ESPI_OFFSET) #define CONFIG_SYS_MPC85xx_PCIX_OFFSET (0x8000) #define CONFIG_SYS_MPC85xx_PCIX_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PCIX_OFFSET) #define CONFIG_SYS_MPC85xx_PCIX2_OFFSET (0x9000) -- 1.5.4

7 35

[U-Boot] ENV_IS_EMBEDDED vs CONFIG_ENV_IS_EMBEDDED
by Mike Frysinger 25 Aug '09

25 Aug '09

is there a reason to keep ENV_IS_EMBEDDED around ? i see a few places that use CONFIG_ENV_IS_EMBEDDED, but it seems to be largely useless at the moment as the define doesn't really do anything without ENV_IS_EMBEDDED. in other words, i'd like to just do a sed on the tree to convert all ENV_IS_EMBEDDED instances to CONFIG_ENV_IS_EMBEDDED. -mike

3 12

[U-Boot] [PATCH] tsec: Wait for auto-negotiation to complete without link
by Peter Tyser 21 Aug '09

21 Aug '09

Previously, waiting for auto-negotiation would only occur if a valid link had been detected. Problems arose when attempting to use a tsec immediately after bootup but before link was achieved, eg: => dhcp Auto-neg error, defaulting to 10BT/HD eTSEC1: No link. Auto-neg error, defaulting to 10BT/HD eTSEC2: No link. => With this patch applied the same operation as above resulted in: => dhcp Waiting for PHY auto negotiation to complete. done Enet starting in 1000BT/FD Speed: 1000, full duplex Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- drivers/net/tsec.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index dc90f23..2e30fe9 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -352,8 +352,8 @@ uint mii_cr_init(uint mii_reg, struct tsec_private * priv) return MIIM_CR_INIT; } -/* Parse the status register for link, and then do - * auto-negotiation +/* + * Wait for auto-negotiation to complete, then determine link */ uint mii_parse_sr(uint mii_reg, struct tsec_private * priv) { @@ -362,8 +362,7 @@ uint mii_parse_sr(uint mii_reg, struct tsec_private * priv) * (ie - we're capable and it's not done) */ mii_reg = read_phy_reg(priv, MIIM_STATUS); - if ((mii_reg & MIIM_STATUS_LINK) && (mii_reg & PHY_BMSR_AUTN_ABLE) - && !(mii_reg & PHY_BMSR_AUTN_COMP)) { + if ((mii_reg & PHY_BMSR_AUTN_ABLE) && !(mii_reg & PHY_BMSR_AUTN_COMP)) { int i = 0; puts("Waiting for PHY auto negotiation to complete"); @@ -384,15 +383,15 @@ uint mii_parse_sr(uint mii_reg, struct tsec_private * priv) mii_reg = read_phy_reg(priv, MIIM_STATUS); } puts(" done\n"); - priv->link = 1; + + /* Link status bit is latched low, read it again */ + mii_reg = read_phy_reg(priv, MIIM_STATUS); + udelay(500000); /* another 500 ms (results in faster booting) */ - } else { - if (mii_reg & MIIM_STATUS_LINK) - priv->link = 1; - else - priv->link = 0; } + priv->link = mii_reg & MIIM_STATUS_LINK ? 1 : 0; + return 0; } -- 1.6.0.2.GIT

6 22

[U-Boot] [PATCH] Fix Freescale link scripts for newer GCCs
by Matthew L. Creech 17 Aug '09

17 Aug '09

This addresses the problem described here: http://lists.denx.de/pipermail/u-boot/2008-December/045029.html This changes the link scripts of several of the mpcXXX CPUs to include everything from '.rodata'. Without this, using a recent powerpc-linux-gnu toolchain (e.g. from CodeSourcery) to build U-Boot fails, often producing a multi-GB binary file. Signed-off-by: Matthew Creech <mlcreech(a)gmail.com> --- mpc5xx/u-boot.lds | 4 +--- mpc5xxx/u-boot-customlayout.lds | 4 +--- mpc5xxx/u-boot.lds | 4 +--- mpc8220/u-boot.lds | 4 +--- mpc824x/u-boot.lds | 4 +--- mpc8260/u-boot.lds | 4 +--- mpc83xx/u-boot.lds | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) diff -purN orig/cpu/mpc5xx/u-boot.lds u-boot/cpu/mpc5xx/u-boot.lds --- orig/cpu/mpc5xx/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc5xx/u-boot.lds 2009-01-07 17:59:25.000000000 -0500 @@ -65,9 +65,7 @@ SECTIONS PROVIDE (etext = .); .rodata : { - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc5xxx/u-boot-customlayout.lds u-boot/cpu/mpc5xxx/u-boot-customlayout.lds --- orig/cpu/mpc5xxx/u-boot-customlayout.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc5xxx/u-boot-customlayout.lds 2009-01-07 18:00:33.000000000 -0500 @@ -68,9 +68,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc5xxx/u-boot.lds u-boot/cpu/mpc5xxx/u-boot.lds --- orig/cpu/mpc5xxx/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc5xxx/u-boot.lds 2009-01-07 17:59:01.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc8220/u-boot.lds u-boot/cpu/mpc8220/u-boot.lds --- orig/cpu/mpc8220/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc8220/u-boot.lds 2009-01-07 17:59:41.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc824x/u-boot.lds u-boot/cpu/mpc824x/u-boot.lds --- orig/cpu/mpc824x/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc824x/u-boot.lds 2009-01-07 17:58:45.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc8260/u-boot.lds u-boot/cpu/mpc8260/u-boot.lds --- orig/cpu/mpc8260/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc8260/u-boot.lds 2009-01-07 17:58:27.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc83xx/u-boot.lds u-boot/cpu/mpc83xx/u-boot.lds --- orig/cpu/mpc83xx/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc83xx/u-boot.lds 2009-01-07 17:58:11.000000000 -0500 @@ -55,9 +55,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 -- Matthew L. Creech

7 19

[U-Boot] USB EHCI driver
by FrancescoVT 16 Aug '09

16 Aug '09

Hi, I'm developing an USB EHCI driver for ADS5121e. Now , I completed initialization sequence for my SOC EHCI Controller. My scope is to use with mass storage, but I think that ehci core layer don't work correctly. Do somebody use EHCI CORE layer for Mass storage and it was ok? Thank you. -- View this message in context: http://www.nabble.com/USB-EHCI-driver-tp22598488p22598488.html Sent from the Uboot - Users mailing list archive at Nabble.com.

8 18

[U-Boot] [Bug] IXP425 and e1000 network driver
by Stefan Althoefer 10 Aug '09

10 Aug '09

Hi, I found that IXP425 (big endian ARM) did not work with e1000 network driver. The reason is broken access to controller registers. I get it working with this patch: -------- --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -105,12 +105,15 @@ static void e1000_phy_hw_reset(struct e1000_hw *hw); static int e1000_phy_reset(struct e1000_hw *hw); static int e1000_detect_gig_phy(struct e1000_hw *hw); -#define E1000_WRITE_REG(a, reg, value) (writel((value), ((a)->hw_addr + E1000_##reg))) -#define E1000_READ_REG(a, reg) (readl((a)->hw_addr + E1000_##reg)) -#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) (\ - writel((value), ((a)->hw_addr + E1000_##reg + ((offset) << 2)))) -#define E1000_READ_REG_ARRAY(a, reg, offset) ( \ - readl((a)->hw_addr + E1000_##reg + ((offset) << 2))) +#define E1000_WRITE_REG(a, reg, value) \ + (writel(cpu_to_le32(value), ((a)->hw_addr + E1000_##reg))) +#define E1000_READ_REG(a, reg) \ + (le32_to_cpu(readl((a)->hw_addr + E1000_##reg))) +#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) \ + (writel(cpu_to_le32(value),\ + ((a)->hw_addr + E1000_##reg + ((offset) << 2)))) +#define E1000_READ_REG_ARRAY(a, reg, offset) \ + (le32_to_cpu(readl((a)->hw_addr + E1000_##reg + ((offset) << 2)))) #define E1000_WRITE_FLUSH(a) {uint32_t x; x = E1000_READ_REG(a, STATUS);} #ifndef CONFIG_AP1000 /* remove for warnings */ --------- However, I'm not sure it this is the correct fix. Is readl supposed to read raw data? Is le32_to_cpu/cpu_to_le32 a function or a macro? In the later case the code is not save or slow due to multiple argument expansion. -- Stefan

4 9

[U-Boot] [PATCH 1/2] new video driver for bus vcxk framebuffers
by Jens Scharsig 09 Aug '09

09 Aug '09

This patch adds a new video driver * adds common bus_vcxk framebuffer driver Signed-off-by: Jens Scharsig <esw(a)bus-elektronik.de> --- diff --git a/doc/README.bus_vcxk b/doc/README.bus_vcxk new file mode 100644 index 0000000..44e1238 --- /dev/null +++ b/doc/README.bus_vcxk @@ -0,0 +1,95 @@ +/* + * (C) Copyright 2008-2009 + * BuS Elektronik GmbH & Co. KG <www.bus-elektronik.de> + * Jens Scharsig <esw(a)bus-elektronik.de> + * + * Configuation settings for the EB+CPUx9K2 board. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +U-Boot vcxk video controller driver +====================================== + +The driver can use with VC2K, VC4K and VC8K devices on following boards: + +board | ARCH | Vendor +----------------------------------------------------------------------- +EB+CPU5282-T1 | MCF5282 | BuS Elektronik GmbH & Co. KG +EB+MCF-EVB123 | MCF5282 | BuS Elektronik GmbH & Co. KG +EB+CPUx9K2 | AT91RM9200 | BuS Elektronik GmbH & Co. KG +ZLSA | AT91RM9200 | Ruf Telematik AG + +by define CONFIG_VIDEO_VCXK + +Driver configuration +-------------------- + +The driver needs some defines to descrip the target hardware: + +CONFIG_SYS_VCXK_BASE + +base address of VCxK hardware memory + +CONFIG_SYS_VCXK_DEFAULT_LINEALIGN + +defines the physical alignment of a pixel row + +CONFIG_SYS_VCXK_DOUBLEBUFFERED + +some boards that use vcxk prevent read from framebuffer memory. +define this option to enable double buffering (needs 16KiB RAM) + +CONFIG_SYS_VCXK_ACKNOWLEDGE_INIT + +initialize the acknowledge line from vcxk hardware + +#define CONFIG_SYS_VCXK_ACKNOWLEDGE + +should return true (1), if vcxk hardware acknowledges a viewing reqest + +CONFIG_SYS_VCXK_ENABLE_INIT + +initialize the enable line to vcxk hardware + +CONFIG_SYS_VCXK_DISABLE + +set vcxk enable line to disable level / display off + +CONFIG_SYS_VCXK_ENABLE + +set vcxk enable line enable level / display on + +CONFIG_SYS_VCXK_REQUEST_INIT + +initialize the request line to vcxk hardware + +CONFIG_SYS_VCXK_REQUEST + +should be send an request impulse to vcxk hardware + +CONFIG_SYS_VCXK_INVERT_INIT + +should initialize the invert line to vcxk hardware and set it to +non invers mode + +CONFIG_SYS_VCXK_RESET_INIT + +initialize the reset line to vcxk hardware and release it from reset + diff --git a/drivers/video/Makefile b/drivers/video/Makefile index bc00852..bb6b5a0 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -36,6 +36,7 @@ COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o +COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o COBJS-y += videomodes.o COBJS := $(COBJS-y) diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c new file mode 100644 index 0000000..db49c83 --- /dev/null +++ b/drivers/video/bus_vcxk.c @@ -0,0 +1,469 @@ +/* + * (C) Copyright 2005-2009 + * Jens Scharsig @ BuS Elektronik GmbH & Co. KG, <esw(a)bus-elektronik.de> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <bmp_layout.h> +#include <asm/io.h> + +vu_char *vcxk_bws = ((vu_char *) (CONFIG_SYS_VCXK_BASE)); +vu_short *vcxk_bws_word = ((vu_short *)(CONFIG_SYS_VCXK_BASE)); +vu_long *vcxk_bws_long = ((vu_long *) (CONFIG_SYS_VCXK_BASE)); + +#ifdef CONFIG_AT91RM9200 + #include <asm/arch/hardware.h> + #ifndef VCBITMASK + #define VCBITMASK(bitno) (0x0001 << (bitno % 16)) + #endif +#elif defined(CONFIG_MCF52x2) + #include <asm/m5282.h> + #ifndef VCBITMASK + #define VCBITMASK(bitno) (0x8000 >> (bitno % 16)) + #endif +#else + #error not vcxk support for selected ARCH +#endif + +#ifndef CONFIG_SYS_VCXK_DOUBLEBUFFERED + #define VCXK_BWS(x,data) vcxk_bws[x] = data; + #define VCXK_BWS_WORD_SET(x,mask) vcxk_bws_word[x] |= mask; + #define VCXK_BWS_WORD_CLEAR(x,mask) vcxk_bws_word[x] &= ~mask; + #define VCXK_BWS_LONG(x,data) vcxk_bws_long[x] = data; +#else + u_char double_bws[16384]; + u_short *double_bws_word; + u_long *double_bws_long; + #define VCXK_BWS(x,data) \ + double_bws[x] = data; vcxk_bws[x] = data; + #define VCXK_BWS_WORD_SET(x,mask) \ + double_bws_word[x] |= mask; vcxk_bws_word[x] = double_bws_word[x]; + #define VCXK_BWS_WORD_CLEAR(x,mask) \ + double_bws_word[x] &= ~mask; vcxk_bws_word[x] = double_bws_word[x]; + #define VCXK_BWS_LONG(x,data) \ + double_bws_long[x] = data; vcxk_bws_long[x] = data; +#endif + +#define VC4K16_Bright1 vcxk_bws_word[0x20004 / 2] +#define VC4K16_Bright2 vcxk_bws_word[0x20006 / 2] +#define VC2K_Bright vcxk_bws[0x8000] +#define VC8K_BrightH vcxk_bws[0xC000] +#define VC8K_BrightL vcxk_bws[0xC001] + +static vu_long vcxk_driver; +vu_char VC4K16; + +u_long display_width; +u_long display_height; +u_long display_bwidth; + +ulong search_vcxk_driver(void); +void vcxk_cls(void); +void vcxk_setbrightness(unsigned int side, short brightness); +int vcxk_request(void); +int vcxk_acknowledge_wait(void); +void vcxk_clear(void); + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_init + * FUNCTION + * initialalize Video Controller + * PARAMETERS + * width visible display width in pixel + * height visible display height in pixel + *** +----------------------------------------------------------------------------*/ + +int vcxk_init(unsigned long width, unsigned long height) +{ + CONFIG_SYS_VCXK_RESET_INIT; + +#ifdef CONFIG_SYS_VCXK_DOUBLEBUFFERED + double_bws_word = (u_short *) double_bws; + double_bws_long = (u_long *)double_bws; + debug("%lx %lx %lx \n",double_bws,double_bws_word,double_bws_long); +#endif + + display_width = width; + display_height = height; + #if (CONFIG_SYS_VCXK_DEFAULT_LINEALIGN==4) + display_bwidth =((width+31) / 8) & ~0x3; + #elif (CONFIG_SYS_VCXK_DEFAULT_LINEALIGN==2) + display_bwidth =((width+15) / 8) & ~0x1; + #else + #error CONFIG_SYS_VCXK_DEFAULT_LINEALIGN is invalid + #endif + debug("linesize ((%d + 15)/8 & ~0x1) = %d\n",display_width,display_bwidth); + + #ifdef CONFIG_SYS_VCXK_AUTODETECT + VC4K16 = 0; + vcxk_bws_long[1] = 0x0; + vcxk_bws_long[1] = 0x55AAAA55; + vcxk_bws_long[5] = 0x0; + if (vcxk_bws_long[1] == 0x55AAAA55) + { + VC4K16 = 1; + } + #else + VC4K16 = 1; + debug("No autodetect: use vc4k\n"); + #endif + + CONFIG_SYS_VCXK_INVERT_INIT; + + CONFIG_SYS_VCXK_REQUEST_INIT; + + CONFIG_SYS_VCXK_ACKNOWLEDGE_INIT; + + CONFIG_SYS_VCXK_DISABLE; + CONFIG_SYS_VCXK_ENABLE_INIT; + + vcxk_driver = search_vcxk_driver(); + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + vcxk_cls(); + vcxk_cls(); + } + + vcxk_setbrightness(3,1000); + CONFIG_SYS_VCXK_ENABLE; + return 1; +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_setpixel + * FUNCTION + * set the pixel[x,y] with the given color + * PARAMETER + * x pixel colum + * y pixel row + * color <0x40 off/black + * >0x40 on + *** +----------------------------------------------------------------------------*/ + +void vcxk_setpixel (int x, int y, unsigned long color) +{ + vu_short dataptr; + + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + if ((x<display_width) && (y<display_height)) + { + + dataptr = ((x / 16)) + (y * (display_bwidth>>1)); + + color = ((color >> 16) & 0xFF) | + ((color >> 8) & 0xFF) | (color & 0xFF); + + if (color > 0x40) + { + VCXK_BWS_WORD_SET(dataptr,VCBITMASK(x)); + } + else + { + VCXK_BWS_WORD_CLEAR(dataptr,VCBITMASK(x)); + } + } + } +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_loadimage + * FUNCTION + * copies a binary image to display memory + *** +----------------------------------------------------------------------------*/ + +void vcxk_loadimage(ulong source) +{ + int cnt; + vcxk_acknowledge_wait(); + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + if (VC4K16) + { + for (cnt=0; cnt< (16384/4); cnt++) + { + VCXK_BWS_LONG(cnt,(*(ulong*) source)); + source = source + 4; + } + } + else + { + for (cnt=0; cnt<16384; cnt++) + { + VCXK_BWS_LONG(cnt*2,(*(vu_char*) source)); + source++; + } + } + } + vcxk_request(); +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_cls + * FUNCTION + * clear the display + *** +----------------------------------------------------------------------------*/ + +void vcxk_cls(void) +{ + vcxk_acknowledge_wait(); + vcxk_clear(); + vcxk_request(); +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_clear(void) + * FUNCTION + * clear the display memory + *** +----------------------------------------------------------------------------*/ + +void vcxk_clear(void) +{ + int cnt; + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + for (cnt=0; cnt< (16384/4); cnt++) + { + VCXK_BWS_LONG(cnt,0); + } + } +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_setbrightness + * FUNCTION + * set the display brightness + * PARAMETER + * side 1 set front side brightness + * 2 set back side brightness + * 3 set brightness for both sides + * brightness 0..1000 + *** +----------------------------------------------------------------------------*/ + +void vcxk_setbrightness(unsigned int side, short brightness) +{ + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + if (VC4K16) + { + if ((side==0) || (side & 0x1)) VC4K16_Bright1 = brightness + 23; + if ((side==0) || (side & 0x2)) VC4K16_Bright2 = brightness + 23; + } + else + { + VC2K_Bright = (brightness >> 4) +2; + VC8K_BrightH = (brightness + 23) >> 8; + VC8K_BrightL = (brightness + 23) & 0xFF; + } + } +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_request + * FUNCTION + * requests viewing of display memory + *** +----------------------------------------------------------------------------*/ + +int vcxk_request(void) +{ + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + CONFIG_SYS_VCXK_REQUEST; + } + return 1; +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_acknowledge_wait + * FUNCTION + * wait for acknowledge viewing requests + *** +----------------------------------------------------------------------------*/ + +int vcxk_acknowledge_wait(void) +{ + if (vcxk_driver) + { + /* use flash resist driver */ + } + else + { + while (CONFIG_SYS_VCXK_ACKNOWLEDGE); + } + return 1; +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/search_vcxk_driver + * FUNCTION + * search for driver extentions (not implement for U-Boot) + *** +----------------------------------------------------------------------------*/ + +ulong search_vcxk_driver(void) +{ + return 0; +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/vcxk_display_bitmap + * FUNCTION + * copies a bitmap (BMP-Format) to the given position + * PARAMETER + * addr pointer to bitmap + * x output bitmap @ columne + * y output bitmap @ row + *** +----------------------------------------------------------------------------*/ + +int vcxk_display_bitmap (ulong addr, int x, int y) +{ + bmp_image_t *bmp; + unsigned long width; + unsigned long height; + unsigned long bpp; + unsigned long compression; + + unsigned long xcnt,ycnt; + unsigned long linewidth; + + unsigned long cp_width; + unsigned long cp_height; + unsigned char *dataptr; + unsigned char *lineptr; + + bmp = (bmp_image_t *) addr; + if ((bmp->header.signature[0] == 'B') && + (bmp->header.signature[1] == 'M')) + { + compression = le32_to_cpu (bmp->header.compression); + width = le32_to_cpu (bmp->header.width); + height = le32_to_cpu (bmp->header.height); + bpp = le16_to_cpu (bmp->header.bit_count); + + dataptr = (unsigned char *) bmp + le32_to_cpu(bmp->header.data_offset); + + if (display_width < (width + x)) + { + cp_width = display_width - x; + } + else + { + cp_width = width; + } + if (display_height < (height + y)) + { + cp_height = display_height - y; + } + else + { + cp_height = height; + } + linewidth = (((width + 7) / 8)+3) & ~0x3; + if (cp_height < height) + { + dataptr=dataptr + linewidth * (height-cp_height); + } + switch (bpp) + { + case 1: + for (ycnt=cp_height;ycnt>0; ycnt--) + { + lineptr = dataptr; + for (xcnt=0;xcnt<cp_width; xcnt++) + { + if ((*lineptr << (xcnt % 8)) & 0x80) + { + vcxk_setpixel(xcnt,ycnt-1,0xFFFFFF); + } + else + { + vcxk_setpixel(xcnt,ycnt-1,0); + } + if ((xcnt % 8) == 7) { lineptr++; } + } /* endfor xcnt */ + dataptr=dataptr + linewidth; + } /* endfor ycnt */ + break; + default: + printf("Error: %ld bit per pixel not supported by VCxK\n", + bpp); + return 0; + } + } + else + { + printf("Error: no valid bmp at %lx\n", (ulong) bmp); + return 0; + } + return 1; +} + +/*---------------------------------------------------------------------------- + ****f* bus_vcxk/video_display_bitmap + *** +----------------------------------------------------------------------------*/ + +int video_display_bitmap (ulong addr, int x, int y) +{ + vcxk_acknowledge_wait(); + if (vcxk_display_bitmap (addr,x, y)) + { + vcxk_request(); + return 0; + } + return 1; +} + +/*---------------------------------------------------------------------------*/ +/* EOF */ +/*---------------------------------------------------------------------------*/ diff --git a/include/bus_vcxk.h b/include/bus_vcxk.h new file mode 100644 index 0000000..8d6a25c --- /dev/null +++ b/include/bus_vcxk.h @@ -0,0 +1,36 @@ +/* + * (C) Copyright 2005-2009 + * Jens Scharsig @ BuS Elektronik GmbH & Co. KG, <esw(a)bus-elektronik.de> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __BUS_VCXK_H_ +#define __BUS_VCXK_H_ + +extern int vcxk_init(unsigned long width, unsigned long height); +extern void vcxk_setpixel (int x, int y, unsigned long color); +extern int vcxk_acknowledge_wait(void); +extern int vcxk_request(void); +extern void vcxk_loadimage(ulong source); +extern int vcxk_display_bitmap (ulong addr, int x, int y); +extern void vcxk_setbrightness(unsigned int side, short brightness); +extern int video_display_bitmap (ulong addr, int x, int y); + +#endif

4 11

[U-Boot] [PATCH] Trizeps IV adaptation to changes in dm9000 driver
by sbabic＠denx.de 08 Aug '09

08 Aug '09

From: Stefano Babic <sbabic(a)denx.de> Last patch in the dm9000 driver breaks the trizeps IV board (PXA). Reading of eeprom is modified here to reflect the changes in read_srom_word(). Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- board/trizepsiv/eeprom.c | 10 ++++++---- drivers/net/dm9000x.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c index 63f1c6c..68fc754 100644 --- a/board/trizepsiv/eeprom.c +++ b/board/trizepsiv/eeprom.c @@ -24,16 +24,18 @@ #include <common.h> #include <command.h> -extern u16 read_srom_word(int); +extern void read_srom_word(int, u8 *); extern void write_srom_word(int offset, u16 val); static int do_read_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - int i; + unsigned int i; + u8 value; for (i=0; i < 0x40; i++) { if (!(i % 0x10)) - printf("\n%08lx:", i); - printf(" %04x", read_srom_word(i)); + printf("\n%08x:", i); + read_srom_word(i, &value); + printf(" %04x", value); } printf ("\n"); return (0); diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 8ca2bf7..519a11d 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -113,7 +113,7 @@ void eth_halt(void); static int dm9000_probe(void); static u16 phy_read(int); static void phy_write(int, u16); -static void read_srom_word(int, u8 *); +void read_srom_word(int, u8 *); static u8 DM9000_ior(int); static void DM9000_iow(int reg, u8 value); @@ -541,7 +541,7 @@ eth_rx(void) /* Read a word data from SROM */ -static void read_srom_word(int offset, u8 *to) +void read_srom_word(int offset, u8 *to) { DM9000_iow(DM9000_EPAR, offset); DM9000_iow(DM9000_EPCR, 0x4); -- 1.6.0.4

3 4

[U-Boot] [PATCHv3 0/5] clean up omap3 configuration structs
by Matthias Ludwig 07 Aug '09

07 Aug '09

Here are some (hopefully final) changes to the omap3 cleanup. changes since v2: - split cs-config into 2 patches (patch 1/2) - remove (accidentally missed) typedefs (patch 3) - based on arm/next (zoom2 ok now) not changed (see discussion on v2): - using a function for gpmc config - replacing config[1-7] by an array compile-tested on beagle, evm, overo, pandora, zoom[12] best regards, Matthias Matthias Ludwig (5): OMAP3EVM: net_chip uses CS5 not CS6 omap3: embedd gpmc_cs into gpmc config struct omap3: remove typedefs for configuration structs omap3: replace all instances of gpmc config struct by one global omap3: use only fixed-size types inside ctrl_structs board/omap3/beagle/beagle.c | 6 +- board/omap3/evm/evm.c | 19 +- board/omap3/pandora/pandora.c | 8 +- board/omap3/zoom2/zoom2.c | 13 +- cpu/arm_cortexa8/omap3/board.c | 16 +- cpu/arm_cortexa8/omap3/clock.c | 14 +- cpu/arm_cortexa8/omap3/mem.c | 56 ++--- cpu/arm_cortexa8/omap3/sys_info.c | 13 +- cpu/arm_cortexa8/omap3/timer.c | 2 +- drivers/mtd/nand/omap_gpmc.c | 41 ++-- include/asm-arm/arch-omap3/cpu.h | 476 +++++++++++++++++++----------------- include/asm-arm/arch-omap3/mem.h | 4 +- include/asm-arm/arch-omap3/omap3.h | 8 +- include/configs/omap3_beagle.h | 3 +- include/configs/omap3_evm.h | 3 +- include/configs/omap3_overo.h | 3 +- include/configs/omap3_pandora.h | 3 +- include/configs/omap3_zoom1.h | 3 +- include/configs/omap3_zoom2.h | 3 +- 19 files changed, 342 insertions(+), 352 deletions(-)

4 18

[U-Boot] [PATCH 2/2] KB9202: Add NAND support
by Matthias Kaehlcke 06 Aug '09

06 Aug '09

KB9202: Add NAND support This is a forward port of the patch submitted by Christian from Kwikbyte in 06/2007 (http://lists.denx.de/pipermail/u-boot/2007-June/022068.html) Signed-off-by: Matthias Kaehlcke <matthias(a)kaehlcke.net> -- --- u-boot-2009.03.org/board/kb9202/Makefile 2009-03-21 22:04:41.000000000 +0100 +++ u-boot-2009.03/board/kb9202/Makefile 2009-05-15 23:30:11.000000000 +0200 @@ -28,7 +28,7 @@ LIB = $(obj)lib$(BOARD).a -COBJS := kb9202.o +COBJS := kb9202.o nand.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) --- /dev/null 2009-05-14 23:36:38.280017984 +0200 +++ u-boot-2009.03/board/kb9202/nand.c 2009-05-15 23:30:11.000000000 +0200 @@ -0,0 +1,158 @@ +/* + * (C) Copyright 2006 KwikByte kb9200_dev(a)kwikbyte.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/AT91RM9200.h> +#include <asm/arch/hardware.h> + +#ifdef CONFIG_CMD_NAND + +#include <nand.h> + +/* + * hardware specific access to control-lines + */ + +#define MASK_ALE (1 << 22) /* our ALE is A22 */ +#define MASK_CLE (1 << 21) /* our CLE is A21 */ + +#ifndef CONFIG_KB9202B_ATL +#define KB9202_NAND_NCE (1 << 28) /* EN* on D28 */ +#define KB9202_NAND_BUSY (1 << 29) /* RB* on D29 */ +#else +#define KB9202_NAND_NCE (1 << 26) /* EN* on PB26 */ +#define KB9202_NAND_BUSY (1 << 27) /* RB* on PB27 */ +#endif + +/* + * Board-specific function to access device control signals + */ +static void kb9202_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) +{ + struct nand_chip *this = mtd->priv; + + if (ctrl & NAND_CTRL_CHANGE) { + ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; + + /* clear ALE and CLE bits */ + IO_ADDR_W &= ~(MASK_ALE | MASK_CLE); + + if (ctrl & NAND_CLE) + IO_ADDR_W |= MASK_CLE; + + if (ctrl & NAND_ALE) + IO_ADDR_W |= MASK_ALE; + + this->IO_ADDR_W = (void *) IO_ADDR_W; + + if (ctrl & NAND_NCE) + AT91C_BASE_PIOC->PIO_CODR = KB9202_NAND_NCE; + else + AT91C_BASE_PIOC->PIO_SODR = KB9202_NAND_NCE; + } + + if (cmd != NAND_CMD_NONE) + writeb(cmd, this->IO_ADDR_W); +} + + +/* + * Board-specific function to access the device ready signal. + */ +static int kb9202_nand_ready(struct mtd_info *mtd) +{ + return (((AT91C_BASE_PIOC->PIO_PDSR) & KB9202_NAND_BUSY) != 0); +} + + +/* + * Board-specific NAND init. Copied from include/linux/mtd/nand.h for reference. + * + * struct nand_chip - NAND Private Flash Chip Data + * @IO_ADDR_R: [BOARDSPECIFIC] address to read the 8 I/O lines of the flash device + * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the flash device + * @hwcontrol: [BOARDSPECIFIC] hardwarespecific function for accesing control-lines + * @dev_ready: [BOARDSPECIFIC] hardwarespecific function for accesing device ready/busy line + * If set to NULL no access to ready/busy is available and the ready/busy information + * is read from the chip status register + * @enable_hwecc: [BOARDSPECIFIC] function to enable (reset) hardware ecc generator. Must only + * be provided if a hardware ECC is available + * @eccmode: [BOARDSPECIFIC] mode of ecc, see defines + * @chip_delay: [BOARDSPECIFIC] chip dependent delay for transfering data from array to read regs (tR) + * @options: [BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about + * special functionality. See the defines for further explanation +*/ +/* + * This routine initializes controller and GPIOs. + */ +int board_nand_init(struct nand_chip *nand) +{ + unsigned value; + + nand->ecc.mode = NAND_ECC_SOFT; + nand->options &= ~(NAND_BUSWIDTH_16); + nand->cmd_ctrl = kb9202_nand_hwcontrol; + nand->dev_ready = kb9202_nand_ready; + + /* in case running outside of bootloader */ + AT91C_BASE_PMC->PMC_PCER = ((unsigned) 1 << AT91C_ID_PIOC); +#ifdef CONFIG_KB9202B_ATL + AT91C_BASE_PMC->PMC_PCER = ((unsigned) 1 << AT91C_ID_PIOB); +#endif + + /* setup nand flash access (allow ample margin) */ + /* 4 wait states, 1 setup, 1 hold, 1 float for 8-bit device */ + ((AT91PS_SMC2)AT91C_BASE_SMC2)->SMC2_CSR[3] = + AT91C_SMC2_WSEN | + (4 & AT91C_SMC2_NWS) | + ((1 << 8) & AT91C_SMC2_TDF) | + AT91C_SMC2_DBW_8 | + ((1 << 24) & AT91C_SMC2_RWSETUP) | + ((1 << 29) & AT91C_SMC2_RWHOLD); + + /* enable internal NAND controller */ + value = *(AT91C_EBI_CSA); + value |= AT91C_EBI_CS3A_SMC_SmartMedia; + *(AT91C_EBI_CSA) = value; + + /* enable SMOE/SMWE */ + AT91C_BASE_PIOC->PIO_ASR = AT91C_PC1_BFRDY_SMOE | AT91C_PC3_BFBAA_SMWE; + AT91C_BASE_PIOC->PIO_PDR = AT91C_PC1_BFRDY_SMOE | AT91C_PC3_BFBAA_SMWE; + AT91C_BASE_PIOC->PIO_OER = AT91C_PC1_BFRDY_SMOE | AT91C_PC3_BFBAA_SMWE; + + /* set NCE to high */ + AT91C_BASE_PIOC->PIO_SODR = KB9202_NAND_NCE; + + /* disable output on pin connected to the busy line of the NAND */ + AT91C_BASE_PIOC->PIO_ODR = KB9202_NAND_BUSY; + + /* enable the PIO to control NCE and BUSY */ + AT91C_BASE_PIOC->PIO_PER = KB9202_NAND_NCE | KB9202_NAND_BUSY; + + /* enable output for NCE */ + AT91C_BASE_PIOC->PIO_OER = KB9202_NAND_NCE; + + return (0); +} + +#endif /* CONFIG_CMD_NAND */ --- u-boot-2009.03.org/include/configs/kb9202.h 2009-05-15 23:31:55.000000000 +0200 +++ u-boot-2009.03/include/configs/kb9202.h 2009-05-15 23:30:11.000000000 +0200 @@ -62,6 +62,11 @@ #ifdef CONFIG_KB9202B #define CONFIG_BOOTARGS "console=ttyS0,115200 noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M" #define CONFIG_BOOTCOMMAND "bootm 0x10000000" +#define NAND_MAX_CHIPS 1 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 0x40000000 +#define CONFIG_JFFS2_NAND +#define CONFIG_JFFS2_CMDLINE #endif @@ -71,7 +76,7 @@ /* * Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (128*1024) +#define CONFIG_SYS_MALLOC_LEN (1024*1024) #define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 @@ -111,6 +116,9 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP +#ifdef CONFIG_KB9202B +#define CONFIG_CMD_NAND +#endif #define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_BDI @@ -140,7 +148,11 @@ #define PHYS_FLASH_SIZE 0x200000 #endif +#ifdef CONFIG_KB9202B_ATL +#define CFG_MAX_FLASH_BANKS 0 +#else #define CONFIG_SYS_MAX_FLASH_BANKS 1 +#endif #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_HARD_I2C -- Matthias Kaehlcke Embedded Linux Engineer Barcelona El trabajo es el refugio de los que no tienen nada que hacer (Oscar Wilde) .''`. using free software / Debian GNU/Linux | http://debian.org : :' : `. `'` gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-

5 20