December 2008 - U-Boot

[U-Boot] [PATCH] evb64260: fix "cast to pointer from integer of different size" warnings
by Wolfgang Denk 09 Dec '08

09 Dec '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/evb64260/zuma_pbb.c | 6 ++++-- board/evb64260/zuma_pbb_mbox.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c index 296e461..1d03570 100644 --- a/board/evb64260/zuma_pbb.c +++ b/board/evb64260/zuma_pbb.c @@ -149,8 +149,10 @@ void zuma_init_pbb (void) pci_read_config_dword (dev, PCI_BASE_ADDRESS_0, &iobase); - zuma_pbb_reg = - (PBB_DMA_REG_MAP *) (iobase & PCI_BASE_ADDRESS_MEM_MASK); + iobase &= PCI_BASE_ADDRESS_MEM_MASK; + + zuma_pbb_reg = (PBB_DMA_REG_MAP *)iobase; + if (!zuma_pbb_reg) { printf ("zuma pbb bar none! (hah hah, get it?)\n"); diff --git a/board/evb64260/zuma_pbb_mbox.c b/board/evb64260/zuma_pbb_mbox.c index 6f5df6e..8e38102 100644 --- a/board/evb64260/zuma_pbb_mbox.c +++ b/board/evb64260/zuma_pbb_mbox.c @@ -165,7 +165,9 @@ int zuma_mbox_init(void) pci_read_config_dword(zuma_mbox_dev.dev, PCI_BASE_ADDRESS_0, &iobase); - zuma_mbox_dev.sip = (PBB_DMA_REG_MAP *) (iobase & PCI_BASE_ADDRESS_MEM_MASK); + iobase &= PCI_BASE_ADDRESS_MEM_MASK; + + zuma_mbox_dev.sip = (PBB_DMA_REG_MAP *)iobase; zuma_mbox_dev.sip->int_mask.word=0; -- 1.5.6.5

1 0

Re: [U-Boot] mtd partitions (Carlos kescuin)
by Tom Evans 09 Dec '08

09 Dec '08

"Carlos kescuin" <kescuin(a)gmail.com> wrote: > > I'm using a Coldfire m5329EVB and I would like to make some > partitions (one for kernel and one for filsystem) on my NAND > FLASH (16Mb). I've tryied to search the u-boot options > (u-boo 2008.10) but it doesn't work at all. > > Does anybody know the configure options or at least how > to succeed in partitioning my NAND Flash? What we do is to load u-boot via JTAG, then boot the OS (Linux in our case) using TFTP with the filesystem mounted over NFS. That gives us all the drivers and programs required to then partition the NAND and burn U-Boot into it. We then partition and format an SD card for the filesystem into a SD card, but we have the option of putting it into NAND, and have done so. -- Tom Evans

1 0

Re: [U-Boot] Pull request: u-boot-SUBREPO
by Wolfgang Denk 09 Dec '08

09 Dec '08

Dear "Remy Bohmer", In message <3efb10970812091258s579a15e0sef1d6d16d9a3be7e(a)mail.gmail.com> you wrote: > The following changes since commit 13d36ec849785453953d00220b2c7dc66644a3c2: > Wolfgang Denk (1): > Merge branch 'master' of git://git.denx.de/u-boot-at91 > > are available in the git repository at: > > git://git.denx.de/u-boot-usb.git master > > Jean-Christophe PLAGNIOL-VILLARD (1): > usbtty/omap: update to current API > > Stefan Althoefer (1): > USB: descriptor handling > > drivers/serial/usbtty.c | 6 ++---- > drivers/serial/usbtty.h | 31 +++++++++++++++++++++---------- > drivers/usb/usbdcore_omap1510.c | 4 +++- > include/usb.h | 2 +- > include/usbdcore_omap1510.h | 6 +++--- > 5 files changed, 30 insertions(+), 19 deletions(-) Applied, thanks. Next time, please edit the Subject: line ("SUBREPO") Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de I thought my people would grow tired of killing. But you were right, they see it is easier than trading. And it has its pleasures. I feel it myself. Like the hunt, but with richer rewards. -- Apella, "A Private Little War", stardate 4211.8

1 0

[U-Boot] [PATCH v3 2/2] ppc4xx: Add PPC4xx SPI helpers to Sequoia
by Steven A. Falco 09 Dec '08

09 Dec '08

This patch adds helper routines needed in support of the PPC4xx SPI driver. Signed-off-by: Steven A. Falco <sfalco(a)harris.com> --- Changed CONFIG constant to CONFIG_PPC4xx_SPI. board/amcc/sequoia/sequoia.c | 20 ++++++++++++++++++++ include/configs/sequoia.h | 4 ++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index d6668e2..080ee1e 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -26,6 +26,7 @@ #include <libfdt.h> #include <fdt_support.h> #include <ppc4xx.h> +#include <spi.h> #include <asm/gpio.h> #include <asm/processor.h> #include <asm/io.h> @@ -513,3 +514,22 @@ int post_hotkeys_pressed(void) return 0; /* No hotkeys supported */ } #endif /* CONFIG_POST */ + +#if defined(CONFIG_PPC4xx_SPI) +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs >= 0 && cs < 64; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + /* Assumes chip-selects are active-low. */ + gpio_write_bit(slave->cs, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + gpio_write_bit(slave->cs, 1); +} +#endif /* CONFIG_PPC4xx_SPI */ + diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 9321bdc..417fda1 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -236,6 +236,10 @@ #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3 +/* Define these if you are using the SPI port. */ +#undef CONFIG_HARD_SPI +#undef CONFIG_PPC4xx_SPI + /* * Default environment variables */ -- 1.6.0.2

4 10

[U-Boot] [PATCH] video: fix FADS823 and RRvision compiling issues
by Anatolij Gustschin 09 Dec '08

09 Dec '08

Since commit 561858ee building for FADS823 and RRvision doesn't work. Let's include version.h and timestamp.h unconditionally to fix the problem. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- cpu/mpc8xx/video.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c index 5479644..4a59927 100644 --- a/cpu/mpc8xx/video.c +++ b/cpu/mpc8xx/video.c @@ -32,10 +32,8 @@ #include <stdarg.h> #include <common.h> #include <config.h> -#ifdef VIDEO_INFO #include <version.h> #include <timestamp.h> -#endif #include <i2c.h> #include <linux/types.h> #include <devices.h> -- 1.5.3.3

2 1

[U-Boot] [PATCH] drivers/fsl_pci_init: Fix compile warning
by Kumar Gala 09 Dec '08

09 Dec '08

fsl_pci_init.c: In function 'fsl_pci_setup_inbound_windows': fsl_pci_init.c:122: warning: comparison is always true due to limited range of data type The check only makes sense if we are CONFIG_PHYS_64BIT Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- drivers/pci/fsl_pci_init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index e57acba..1db42fd 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -119,9 +119,11 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r) } #endif +#ifdef CONFIG_PHYS_64BIT if (sz && (((u64)gd->ram_size) < (1ull << 32))) printf("Was not able to map all of memory via " "inbound windows -- %lld remaining\n", sz); +#endif return r - rgn_base; } -- 1.5.6.5

2 1

[U-Boot] [PATCH v3 1/2] ppc4xx: Add PPC4xx SPI driver
by Steven A. Falco 09 Dec '08

09 Dec '08

This patch adds an SPI driver for the 440EPx processor. Tested on Sequoia. Signed-off-by: Steven A. Falco <sfalco(a)harris.com> --- Thanks for the comments. I've added the in/out accessors, and included the other comments made by reviewers (inlines, etc). The patch passes a checkpatch test. drivers/spi/Makefile | 1 + drivers/spi/ppc4xx_spi.c | 141 ++++++++++++++++++++++++++++++++++++++++++ include/asm-ppc/ppc4xx_spi.h | 58 +++++++++++++++++ 3 files changed, 200 insertions(+), 0 deletions(-) create mode 100644 drivers/spi/ppc4xx_spi.c create mode 100644 include/asm-ppc/ppc4xx_spi.h diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 15e0f7a..a699760 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libspi.a COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o +COBJS-$(CONFIG_PPC4xx_SPI) += ppc4xx_spi.o COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS := $(COBJS-y) diff --git a/drivers/spi/ppc4xx_spi.c b/drivers/spi/ppc4xx_spi.c new file mode 100644 index 0000000..273f8c4 --- /dev/null +++ b/drivers/spi/ppc4xx_spi.c @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2008 Harris Corporation + * Author: Steven A. Falco <sfalco(a)harris.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 <spi.h> +#include <malloc.h> + +#include <asm/io.h> +#include <asm/ppc4xx_spi.h> + +void spi_init(void) +{ + spi4xx_t *spi = (spi4xx_t *) SPI_BASE_ADDR; + + out_8(&spi->cdm, 0); /* Default to the highest speed */ + out_8(&spi->mode, SPI_MODE_SPE); /* Enable the port */ +} + +struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int mode) +{ + spi4xx_t *spi = (spi4xx_t *) SPI_BASE_ADDR; + + ulong opb = get_OPB_freq(); + ulong divisor; + struct spi_slave *s; + + if (!spi_cs_is_valid(bus, cs)) + return NULL; + + divisor = ((opb + (max_hz * 4) - 1) / (max_hz * 4)) - 1; + if (divisor > 255) + return NULL; + + out_8(&spi->cdm, divisor); + + s = malloc(sizeof(struct spi_slave)); + if (!s) + return NULL; + + if (mode & SPI_CPHA) + clrbits_8(&spi->mode, SPI_MODE_SCP); + else + setbits_8(&spi->mode, SPI_MODE_SCP); + + if (mode & SPI_CPOL) + setbits_8(&spi->mode, SPI_MODE_CI); + else + clrbits_8(&spi->mode, SPI_MODE_CI); + + s->bus = bus; + s->cs = cs; + + return s; +} + +void spi_free_slave(struct spi_slave *slave) +{ + free(slave); +} + +int spi_claim_bus(struct spi_slave *slave) +{ + return 0; +} + +void spi_release_bus(struct spi_slave *slave) +{ +} + +/* Start an 8-bit transaction. */ +static inline void spi_start(spi4xx_t *spi) +{ + out_8(&spi->cr, SPI_CR_STR); +} + +/* Wait for the TX to be empty. */ +static inline void spi_tx_wait(spi4xx_t *spi) +{ + while (in_8(&spi->sr) & SPI_SR_BSY) + ; +} + +/* Wait for the RX to have data. */ +static inline void spi_rx_wait(spi4xx_t *spi) +{ + while (!(in_8(&spi->sr) & SPI_SR_RBR)) + ; +} + +int spi_xfer(struct spi_slave *slave, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + spi4xx_t *spi = (spi4xx_t *) SPI_BASE_ADDR; + + const u8 *txd = dout; + u8 *rxd = din; + int ii; + + if (flags & SPI_XFER_BEGIN) + spi_cs_activate(slave); + + /* Do a byte at a time */ + for (ii = 0; ii < ((bitlen + 7) / 8); ii++) { + /* Wait for room, then load the next byte. */ + spi_tx_wait(spi); + out_8(&spi->txd, *txd++); + + /* Send/receive 8 bits. */ + spi_start(spi); + + /* Wait for the incoming byte, then store it. */ + spi_rx_wait(spi); + *rxd++ = in_8(&spi->rxd); + } + + if (flags & SPI_XFER_END) + spi_cs_deactivate(slave); + + return 0; +} diff --git a/include/asm-ppc/ppc4xx_spi.h b/include/asm-ppc/ppc4xx_spi.h new file mode 100644 index 0000000..f908ef8 --- /dev/null +++ b/include/asm-ppc/ppc4xx_spi.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2008 Harris Corporation + * Author: Steven A. Falco <sfalco(a)harris.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 + */ + +#ifndef _4xx_spi_h_ +#define _4xx_spi_h_ + +#include <asm/types.h> + +#if defined(CONFIG_440EPX) || \ + defined(CONFIG_440GRX) +#define SPI_BASE_ADDR (CONFIG_SYS_PERIPHERAL_BASE + 0x00000900) +#endif + +/* Bits in the command register */ +#define SPI_CR_STR 0x01 + +/* Bits in the status register */ +#define SPI_SR_RBR 0x01 +#define SPI_SR_BSY 0x02 + +/* Bits in the mode register */ +#define SPI_MODE_IL 0x01 +#define SPI_MODE_CI 0x02 +#define SPI_MODE_RD 0x04 +#define SPI_MODE_SPE 0x08 +#define SPI_MODE_SCP 0x10 + +typedef struct spi4xx { + u8 mode; /* mode register */ + u8 rxd; /* receive register */ + u8 txd; /* transmit register */ + u8 cr; /* command register */ + u8 sr; /* status register */ + u8 res0; /* reserved */ + u8 cdm; /* clock divisor */ +} spi4xx_t; + +#endif /* _4xx_spi_h_ */ -- 1.6.0.2

3 3

[U-Boot] mtd partitions
by Carlos kescuin 09 Dec '08

09 Dec '08

Hi, I'm using a Coldfire m5329EVB and I would like to make some partitions (one for kernel and one for filsystem) on my NAND FLASH (16Mb). I've tryied to search the u-boot options (u-boo 2008.10) but it doesn't work at all. Does anybody know the configure options or at least how to succeed in partitioning my NAND Flash? Thanks in advance.

2 1

[U-Boot] alpr U-Boot image too big
by Stefan Roese 09 Dec '08

09 Dec '08

Hi Pieter, I just noticed that the alpr doesn't build anymore in the current U-Boot version (main and 4xx). The image size (256k) is exceeded because of general code growth. We either need to remove some features/commands from the alpr target or increase the image size. Please advise how to fix this. A patch would be most welcome. Thanks. Best regards, Stefan ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office(a)denx.de =====================================================================

2 3

[U-Boot] [PATCH] vxworks.h: Fix build problem introduced by commits 29a4c24d/e9084b23
by Wolfgang Denk 09 Dec '08

09 Dec '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- include/vxworks.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vxworks.h b/include/vxworks.h index 548e8e8..1633904 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -47,7 +47,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #endif #ifndef CONFIG_SYS_VXWORKS_SERVERNAME -#define CONFIG_SYS_VXWORKS_SERVERNAME srv +#define CONFIG_SYS_VXWORKS_SERVERNAME "srv" #endif #endif -- 1.5.6.5

2 1