May 2009 - U-Boot

[U-Boot] [PATCH] tools/netconsole: make a bit more robust and use ncb when possible
by Mike Frysinger 15 Sep '09

15 Sep '09

The netcat utility likes to exit when it receives an empty packet (as it thinks this means EOF). This can easily occur when working with command line editing as this behavior will be triggered when using backspace. Or with tabs and command line completion. Since the local ncb util does not have this "feature" and it supports broadcast udp, default to using that rather than netcat. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tools/netconsole | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/netconsole b/tools/netconsole index 09c8981..aa30d9b 100755 --- a/tools/netconsole +++ b/tools/netconsole @@ -31,12 +31,24 @@ if [ -z "${ip}" ] || [ -n "$3" ] ; then fi for nc in netcat nc ; do - type ${nc} >/dev/null && break + type ${nc} >/dev/null 2>&1 && break done trap "stty icanon echo intr ^C" 0 2 3 5 10 13 15 echo "NOTE: the interrupt signal (normally ^C) has been remapped to ^T" stty -icanon -echo intr ^T -${nc} -u -l -p ${port} < /dev/null & -exec ${nc} -u ${ip} ${port} +( +if [ -x ./ncb ] ; then + exec ./ncb ${port} +elif [ -x ${0%/*}/ncb ] ; then + exec ${0%/*}/ncb ${port} +else + while ${nc} -u -l -p ${port} < /dev/null ; do + : + done +fi +) & +pid=$! +${nc} -u ${ip} ${port} +kill $pid 2>/dev/null -- 1.6.1

2 15

[U-Boot] [PATCH] AT91RM9200 BGA port D defines
by Jens Scharsig 11 Sep '09

11 Sep '09

This patch add's the defines for port d I/Os on AT91RM9200 (BGA package) Signed-off-by: Jens Scharsig <esw(a)bus-elektronik.de> --- diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/include/asm-arm/arch-at91rm9200/AT91RM9200.h index 95db017..308dea1 100644 --- a/include/asm-arm/arch-at91rm9200/AT91RM9200.h +++ b/include/asm-arm/arch-at91rm9200/AT91RM9200.h @@ -634,10 +634,12 @@ typedef struct _AT91S_PDC #define AT91C_PIO_PB21 ((unsigned int) 1 << 21) /* Pin Controlled by PB21 */ #define AT91C_PB21_TXD1 AT91C_PIO_PB21 /* USART1 Transmit Data */ + #define AT91C_ID_SYS ((unsigned int) 1) /* System Peripheral */ #define AT91C_ID_PIOA ((unsigned int) 2) /* PIO port A */ #define AT91C_ID_PIOB ((unsigned int) 3) /* PIO port B */ #define AT91C_ID_PIOC ((unsigned int) 4) /* PIO port C */ +#define AT91C_ID_PIOD ((unsigned int) 5) /* PIO port D BGA only */ #define AT91C_ID_USART0 ((unsigned int) 6) /* USART 0 */ #define AT91C_ID_USART1 ((unsigned int) 7) /* USART 1 */ #define AT91C_ID_TWI ((unsigned int) 12) /* Two Wire Interface */ @@ -730,6 +732,35 @@ typedef struct _AT91S_PDC #define AT91C_PB12_TF2 ((unsigned int) AT91C_PIO_PB12) /* SSC Transmit Frame Sync 2 */ #define AT91C_PB12_ETX2 ((unsigned int) AT91C_PIO_PB12) /* Ethernet MAC Transmit Data 2 */ +#define AT91C_PIO_PD0 ((unsigned int) 1 << 0) /* Pin Controlled by PD0 */ +#define AT91C_PIO_PD1 ((unsigned int) 1 << 1) /* Pin Controlled by PD1 */ +#define AT91C_PIO_PD2 ((unsigned int) 1 << 2) /* Pin Controlled by PD2 */ +#define AT91C_PIO_PD3 ((unsigned int) 1 << 3) /* Pin Controlled by PD3 */ +#define AT91C_PIO_PD4 ((unsigned int) 1 << 4) /* Pin Controlled by PD4 */ +#define AT91C_PIO_PD5 ((unsigned int) 1 << 5) /* Pin Controlled by PD5 */ +#define AT91C_PIO_PD6 ((unsigned int) 1 << 6) /* Pin Controlled by PD6 */ +#define AT91C_PIO_PD7 ((unsigned int) 1 << 7) /* Pin Controlled by PD7 */ +#define AT91C_PIO_PD8 ((unsigned int) 1 << 8) /* Pin Controlled by PD8 */ +#define AT91C_PIO_PD9 ((unsigned int) 1 << 9) /* Pin Controlled by PD9 */ +#define AT91C_PIO_PD10 ((unsigned int) 1 << 10) /* Pin Controlled by PD10 */ +#define AT91C_PIO_PD11 ((unsigned int) 1 << 11) /* Pin Controlled by PD11 */ +#define AT91C_PIO_PD12 ((unsigned int) 1 << 12) /* Pin Controlled by PD12 */ +#define AT91C_PIO_PD13 ((unsigned int) 1 << 13) /* Pin Controlled by PD13 */ +#define AT91C_PIO_PD14 ((unsigned int) 1 << 14) /* Pin Controlled by PD14 */ +#define AT91C_PIO_PD15 ((unsigned int) 1 << 15) /* Pin Controlled by PD15 */ +#define AT91C_PIO_PD16 ((unsigned int) 1 << 16) /* Pin Controlled by PD16 */ +#define AT91C_PIO_PD17 ((unsigned int) 1 << 17) /* Pin Controlled by PD17 */ +#define AT91C_PIO_PD18 ((unsigned int) 1 << 18) /* Pin Controlled by PD18 */ +#define AT91C_PIO_PD19 ((unsigned int) 1 << 19) /* Pin Controlled by PD19 */ +#define AT91C_PIO_PD20 ((unsigned int) 1 << 20) /* Pin Controlled by PD20 */ +#define AT91C_PIO_PD21 ((unsigned int) 1 << 21) /* Pin Controlled by PD21 */ +#define AT91C_PIO_PD22 ((unsigned int) 1 << 22) /* Pin Controlled by PD22 */ +#define AT91C_PIO_PD23 ((unsigned int) 1 << 23) /* Pin Controlled by PD23 */ +#define AT91C_PIO_PD24 ((unsigned int) 1 << 24) /* Pin Controlled by PD24 */ +#define AT91C_PIO_PD25 ((unsigned int) 1 << 25) /* Pin Controlled by PD25 */ +#define AT91C_PIO_PD26 ((unsigned int) 1 << 26) /* Pin Controlled by PD26 */ +#define AT91C_PIO_PD27 ((unsigned int) 1 << 27) /* Pin Controlled by PD27 */ + #define AT91C_PIOB_BSR ((AT91_REG *) 0xFFFFF674) /* (PIOB) Select B Register */ #define AT91C_PIOB_PDR ((AT91_REG *) 0xFFFFF604) /* (PIOB) PIO Disable Register */

2 5

[U-Boot] Large Block USB Flash Drive Problem
by Barnes, Clifton A. 01 Sep '09

01 Sep '09

I have been trying out loading the Linux kernel using a USB flash drive in the u-boot-2009.06-rc2 release and ran into a problem with one of my flash drives. This particular drive has a block size of 2048 while the other drives have block sizes of 512. The drives with a block size of 512 work perfectly. However, the flash drive with a block size of 2048 fails during the 'usb start' command. I traced this issue to the Part_dos.c file and the function test_part_dos. The buffer allocated there is only 512 bytes. When I changed it to 2048, the 'usb start' command worked correctly and found the one storage device connected. This had no adverse affect with the flash drives that were 512 bytes. Should the macro DEFAULT_SECTOR_SIZE be changed to accommodate larger block size usb flash drives? The second problem came when I tried to use the FAT utilities. When I ran 'fatls usb 0', it failed the same way as when the 'usb start' failed before. Naturally, I guessed that it was a buffer size problem again. I was able to trace the issue to the macro SECTOR_SIZE in fat.h. I tried changing it to 2048, however, there is a check right below it that fails if SECTOR_SIZE != FS_BLOCK_SIZE. So, I assume that the support isn't written to handle sector sizes that are different than the FAT block size. However, I went ahead and changed them both to 2048. This fixed the issues with the FAT utilities partly. I was able to run 'fatls usb 0' and it listed the files but also some junk. I'm guessing it was grabbing junk after the files since the block size is too big. I was also able to run 'fatload usb 0 0x22000000 uImage' successfully and boot the kernel successfully. So, I think the fix has to be in the SECTOR_SIZE macro in the fat.h file. Can anyone with expertise in the FAT implementation take a look at supporting different sector sizes for larger block size flash drives? I can send a large block flash drive to someone if they're willing to take a look at this issue and they don't have one of these drives. Thanks, Clifton A Barnes INDesign, LLC cabarnes(a)indesign-llc.com

2 3

[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] [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