March 2012 - U-Boot

[U-Boot] [PATCH 2/4][v2] powerpc/85xx:Fix MSR[DE] bit in MSR to support debugger
by Prabhakar Kushwaha 21 Mar '12

21 Mar '12

Debugging of e500 and e500v1 processer requires MSR[DE] bit to be set always. Where MSR = Machine State register Make sure of MSR[DE] bit is set uniformaly across the different execution address space i.e. AS0 and AS1. Signed-off-by: Radu Lazarescu <radu.lazarescu(a)freescale.com> Signed-off-by: Catalin Udma <catalin.udma(a)freescale.com> Signed-off-by: Marius Grigoras <marius.grigoras(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Based upon git://git.denx.de/u-boot.git branch master Changes for v2: - Avoid MSR_DE negation in arch_preboot - Made MSR_DE set code independent of any #define Tested on - SoC having E500 Family processor (P1010RDB, BSC9131RDB) - SoC having E500MC Family processor (P4080DS, P3041DS) arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 2e4a06c..3bcbffa 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -532,7 +532,7 @@ void arch_preboot_os(void) * disabled by the time we get called. */ msr = mfmsr(); - msr &= ~(MSR_ME|MSR_CE|MSR_DE); + msr &= ~(MSR_ME|MSR_CE); mtmsr(msr); setup_ivors(); diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 7bfa2d5..597151b 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -82,6 +82,9 @@ .globl _start_e500 _start_e500: +/* Enable debug exception */ + li r1,MSR_DE + mtmsr r1 #if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_E500MC) /* ISBC uses L2 as stack. @@ -729,8 +732,8 @@ create_init_ram_area: msync tlbwe - lis r6,MSR_IS|MSR_DS@h - ori r6,r6,MSR_IS|MSR_DS@l + lis r6,MSR_IS|MSR_DS|MSR_DE@h + ori r6,r6,MSR_IS|MSR_DS|MSR_DE@l lis r7,switch_as@h ori r7,r7,switch_as@l -- 1.7.5.4

1 0

[U-Boot] powerpc/85xx:debugger support patch
by Prabhakar Kushwaha 21 Mar '12

21 Mar '12

This series of patches include 4 parts to overcome the limitation of e500 and e500v2 processor to support any debugger. 1. doc:Add documentation for e500 external debugger support 2. powerpc/85xx:Fix MSR[DE] bit in MSR to support debugger 3. powerpc/85xx:Make debug exception vector accessible 4. powerpc/85xx:Fix NAND code base to support debugger Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com>

1 0

[U-Boot] [PATCH] sh_spi: Add 4 chip select signals supporting
by Shimoda, Yoshihiro 21 Mar '12

21 Mar '12

The module has 4 chip select signals. This patch supports it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> --- drivers/spi/sh_spi.c | 19 ++++++++++++++++--- drivers/spi/sh_spi.h | 4 +++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/spi/sh_spi.c b/drivers/spi/sh_spi.c index 78c7f1a..e944b23 100644 --- a/drivers/spi/sh_spi.c +++ b/drivers/spi/sh_spi.c @@ -1,7 +1,7 @@ /* * SH SPI driver * - * Copyright (C) 2011 Renesas Solutions Corp. + * Copyright (C) 2011-2012 Renesas Solutions Corp. * * 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 @@ -82,6 +82,19 @@ void spi_init(void) { } +static void sh_spi_set_cs(struct sh_spi *ss, unsigned int cs) +{ + unsigned long val = 0; + + if (cs & 0x01) + val |= SH_SPI_SSS0; + if (cs & 0x02) + val |= SH_SPI_SSS1; + + sh_spi_clear_bit(SH_SPI_SSS0 | SH_SPI_SSS1, &ss->regs->cr4); + sh_spi_set_bit(val, &ss->regs->cr4); +} + struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) { @@ -104,6 +117,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, sh_spi_write(0x00, &ss->regs->cr1); /* CR3 init */ sh_spi_write(0x00, &ss->regs->cr3); + sh_spi_set_cs(ss, cs); clear_fifo(ss); @@ -242,8 +256,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, int spi_cs_is_valid(unsigned int bus, unsigned int cs) { - /* This driver supports "bus = 0" and "cs = 0" only. */ - if (!bus && !cs) + if (!bus && cs < SH_SPI_NUM_CS) return 1; else return 0; diff --git a/drivers/spi/sh_spi.h b/drivers/spi/sh_spi.h index dd8f937..96b4b68 100644 --- a/drivers/spi/sh_spi.h +++ b/drivers/spi/sh_spi.h @@ -60,10 +60,12 @@ struct sh_spi_regs { #define SH_SPI_TBFI 0x40 #define SH_SPI_RBEI 0x20 #define SH_SPI_RBFI 0x10 +#define SH_SPI_SSS1 0x08 #define SH_SPI_WPABRT 0x04 -#define SH_SPI_SSS 0x01 +#define SH_SPI_SSS0 0x01 #define SH_SPI_FIFO_SIZE 32 +#define SH_SPI_NUM_CS 4 struct sh_spi { struct spi_slave slave; -- 1.7.1

2 1

[U-Boot] [PATCH 0/3 v3] sandbox: spi/sf emulation
by Mike Frysinger 21 Mar '12

21 Mar '12

This should be good to go now I think. Mike Frysinger (3): sandbox: SPI emulation bus sandbox: new SPI flash driver sandbox: enable new spi/sf layers arch/sandbox/include/asm/config.h | 8 + arch/sandbox/include/asm/spi.h | 58 ++++++ arch/sandbox/include/asm/state.h | 1 + drivers/mtd/spi/Makefile | 1 + drivers/mtd/spi/sandbox.c | 402 +++++++++++++++++++++++++++++++++++++ drivers/spi/Makefile | 1 + drivers/spi/sandbox_spi.c | 186 +++++++++++++++++ include/configs/sandbox.h | 7 + 8 files changed, 664 insertions(+), 0 deletions(-) create mode 100644 arch/sandbox/include/asm/spi.h create mode 100644 drivers/mtd/spi/sandbox.c create mode 100644 drivers/spi/sandbox_spi.c -- 1.7.8.5

2 7

[U-Boot] [PATCH V2] i.MX28: Drop __naked function from spl_mem_init
by Marek Vasut 20 Mar '12

20 Mar '12

Instead of compiling the function and using the result as a constant, simply use the constant. NOTE: This patch works around bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52546 Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tom Rini <trini(a)ti.com> --- arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) V2: Add comment that this works around bug in GCC diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c index 43a90ff..911bbef 100644 --- a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c +++ b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c @@ -173,22 +173,18 @@ void mx28_mem_setup_vddd(void) &power_regs->hw_power_vdddctrl); } -void data_abort_memdetect_handler(void) __attribute__((naked)); -void data_abort_memdetect_handler(void) -{ - asm volatile("subs pc, r14, #4"); -} - void mx28_mem_get_size(void) { struct mx28_digctl_regs *digctl_regs = (struct mx28_digctl_regs *)MXS_DIGCTL_BASE; uint32_t sz, da; uint32_t *vt = (uint32_t *)0x20; + /* The following is "subs pc, r14, #4", used as return from DABT. */ + const uint32_t data_abort_memdetect_handler = 0xe25ef004; /* Replace the DABT handler. */ da = vt[4]; - vt[4] = (uint32_t)&data_abort_memdetect_handler; + vt[4] = data_abort_memdetect_handler; sz = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); writel(sz, &digctl_regs->hw_digctl_scratch0); -- 1.7.9

3 8

[U-Boot] TI DM3730 - NAND
by Prashant Shah 20 Mar '12

20 Mar '12

Hi, Is there any guide on configuring NAND device with u-boot ? I am trying to configure u-boot to detect the NAND device Samsung K9GAG08UOE - 16GBits connected to TI DM3730 - GPMC controller. Regards.

1 0

[U-Boot] LAN9514 on Beagleboard
by Maximilian Schwerin 20 Mar '12

20 Mar '12

Hi, could someone with a beagleboard xm please tell me if the LAN9514 works correctly? We've built two clones, that have the LAN9514 attached via the TPS65950 and I get register write errors when trying to set the MAC address. The linux drivers don't have this problem, so it's probably not a hardware issue. Greetings, Maximilian Schwerin.

2 1

[U-Boot] Building uboot image for panda board
by charlesKAO 20 Mar '12

20 Mar '12

Hi i am charles. I am building the panda uboot image, but something wrong. make[1]: Leaving directory `/home/charles/Work_100G/PandaBoard/U_boot/u-boot/arch/arm/cpu/armv7' make -C tools all make[1]: Entering directory `/home/charles/Work_100G/PandaBoard/U_boot/u-boot/tools' make[1]: Leaving directory `/home/charles/Work_100G/PandaBoard/U_boot/u-boot/tools' make -C spl/board/ti/panda all make[1]: Entering directory `/home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/board/ti/panda' /home/charles/Work_100G/PandaBoard/ICS4.0/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-gcc -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80e80000 -I/home/charles/Work_100G/PandaBoard/U_boot/u-boot/include -fno-builtin -ffreestanding -nostdinc -isystem /home/charles/Work_100G/PandaBoard/ICS4.0/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/../lib/gcc/arm-eabi/4.4.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mno-thumb-interwork -mabi=aapcs-linux -march=armv5 -march=armv7-a -Wall -Wstrict-prototypes -fno-stack-protector -DCONFIG_PRELOADER -Os -ffixed-r8 -ffunction-sections -fdata-sections -march=armv7-a -mthumb -c -o spl-omap.o spl-omap.c cd /home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/board/ti/panda && /home/charles/Work_100G/PandaBoard/ICS4.0/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-ld -Bstatic -T /home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/u-boot-spl-generated.lds --gc-sections start.o reset.o lowlevel_init.o serial.o ns16550.o string.o vsprintf.o console.o stdio.o ctype.o eabi_compat.o div64.o omap_hsmmc.o omap24xx_i2c.o mmc.o time.o part.o part_dos.o fat.o syslib.o utils.o timer.o spl-omap.o board.o clocks.o emif.o sdram_elpida.o \ -L /home/charles/Work_100G/PandaBoard/ICS4.0/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/../lib/gcc/arm-eabi/4.4.3/thumb -lgcc \ -Map /home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/u-boot-spl.map \ -o /home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/u-boot-spl clocks.o: In function `prcm_init': clocks.c:(.text.prcm_init+0x8a): undefined reference to `omap_set_gpio_direction' clocks.c:(.text.prcm_init+0x92): undefined reference to `omap_set_gpio_dataout' make[1]: *** [/home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/u-boot-spl] Error 1 make[1]: Leaving directory `/home/charles/Work_100G/PandaBoard/U_boot/u-boot/spl/board/ti/panda' make: *** [SPL] Error 2 Does anyone know what's wrong? Thanks~ -- View this message in context: http://old.nabble.com/Building-uboot-image-for-panda-board-tp33464297p33464… Sent from the Uboot - Users mailing list archive at Nabble.com.

4 3

[U-Boot] [PATCH] include/mmc.h: remove struct mmc_csd
by Andreas Bießmann 20 Mar '12

20 Mar '12

From: Andreas Bießmann <biessmann(a)corscience.de> The outdated struct mmc_csd was only used by old atmel_mci driver which was removed in c9abb4260c30fbfd51bb2cd551e7426e2ae15b66. Signed-off-by: Andreas Bießmann <biessmann(a)corscience.de> cc: Andy Fleming <afleming(a)freescale.com> --- include/mmc.h | 50 -------------------------------------------------- 1 files changed, 0 insertions(+), 50 deletions(-) diff --git a/include/mmc.h b/include/mmc.h index f52df70..b0bdee4 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -205,56 +205,6 @@ struct mmc_cid { char pnm[7]; }; -/* - * WARNING! - * - * This structure is used by atmel_mci.c only. - * It works for the AVR32 architecture but NOT - * for ARM/AT91 architectures. - * Its use is highly depreciated. - * After the atmel_mci.c driver for AVR32 has - * been replaced this structure will be removed. - */ -struct mmc_csd -{ - u8 csd_structure:2, - spec_vers:4, - rsvd1:2; - u8 taac; - u8 nsac; - u8 tran_speed; - u16 ccc:12, - read_bl_len:4; - u64 read_bl_partial:1, - write_blk_misalign:1, - read_blk_misalign:1, - dsr_imp:1, - rsvd2:2, - c_size:12, - vdd_r_curr_min:3, - vdd_r_curr_max:3, - vdd_w_curr_min:3, - vdd_w_curr_max:3, - c_size_mult:3, - sector_size:5, - erase_grp_size:5, - wp_grp_size:5, - wp_grp_enable:1, - default_ecc:2, - r2w_factor:3, - write_bl_len:4, - write_bl_partial:1, - rsvd3:5; - u8 file_format_grp:1, - copy:1, - perm_write_protect:1, - tmp_write_protect:1, - file_format:2, - ecc:2; - u8 crc:7; - u8 one:1; -}; - struct mmc_cmd { ushort cmdidx; uint resp_type; -- 1.7.9.1

1 0

[U-Boot] [PATCH] mxs_spi: Return proper timeout error
by Fabio Estevam 20 Mar '12

20 Mar '12

Instead of returning -1, it is preferred to return -ETIMEDOUT in case of timeouts. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/spi/mxs_spi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index adb9ca8..4e6f14e 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -162,7 +162,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, if (mx28_wait_mask_set(&ssp_regs->hw_ssp_ctrl0_reg, SSP_CTRL0_RUN, MXS_SPI_MAX_TIMEOUT)) { printf("MXS SPI: Timeout waiting for start\n"); - return -1; + return -ETIMEDOUT; } if (tx) @@ -174,7 +174,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, if (mx28_wait_mask_clr(&ssp_regs->hw_ssp_status_reg, SSP_STATUS_FIFO_EMPTY, MXS_SPI_MAX_TIMEOUT)) { printf("MXS SPI: Timeout waiting for data\n"); - return -1; + return -ETIMEDOUT; } *rx = readl(&ssp_regs->hw_ssp_data); @@ -184,7 +184,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, if (mx28_wait_mask_clr(&ssp_regs->hw_ssp_ctrl0_reg, SSP_CTRL0_RUN, MXS_SPI_MAX_TIMEOUT)) { printf("MXS SPI: Timeout waiting for finish\n"); - return -1; + return -ETIMEDOUT; } } -- 1.7.1

4 4