January 2013 - U-Boot

[U-Boot] Flash Not Erased Problem with M29W128GL
by Ramesh K Khokhani 23 Jan '13

23 Jan '13

Hi Friends, I have my custom board with MCF5329 processor and M29W128GL (16MB NOR). I have LTIB package from freescale of M5329EVB board. I am using this package and modified according M29W128GL NOR. Like * FLASH organization */ #define CONFIG_SYS_FLASH_CFI #ifdef CONFIG_SYS_FLASH_CFI # define CONFIG_FLASH_CFI_DRIVER 1 # define CONFIG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT # define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ # define CONFIG_SYS_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ #endif And Enviroment Configuration: #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 And U-boot output after flash using JTAG: U-Boot 2011.09 (Jan 15 2013 - 14:03:02) CPU: BTAM MCF5329 (Mask:54 Version:2) CPU CLK 240 MHz BUS CLK 80 MHz Board: BTAM 5329 I2C: ready DRAM: 32 MiB Reserving 512k for protected RAM at 41f80000 Top of RAM usable for U-Boot at: 41f80000 Reserving 155k for U-Boot at: 41f59000 Reserving 256k for malloc() at: 41f19000 Reserving 58 Bytes for Board Info at: 41f18fc6 Reserving 88 Bytes for Global Data at: 41f18f6e Reserving 64k for boot parameters at: 41f08f6e Stack Pointer at: 41f08f48 Start relocate of code from 00000400 to 41f59000 Now running in RAM - U-Boot at: 41f59000 Flash: flash detect cfi fwc addr (null) cmd f0 f000 16bit x 8 bit fwc addr 000000aa cmd 98 9800 16bit x 8 bit is= cmd 51(Q) addr 00000020 is= 5100 5100 is= cmd 52(R) addr 00000022 is= 5200 5200 is= cmd 59(Y) addr 00000024 is= 5900 5900 device interface is 2 found port 2 chip 1 port 16 bits chip 8 bits 00 : 51 52 59 02 00 40 00 00 00 00 00 27 36 b5 c5 04 QRY..@.....'6... 10 : 04 09 10 04 02 03 04 18 02 00 06 00 01 7f 00 00 ................ 20 : 02 00 00 00 00 00 00 00 00 00 00 00 00 41 f0 8e .............A.. fwc addr (null) cmd f0 f0 8bit x 8 bit fwc addr 00000aaa cmd aa aa 8bit x 8 bit fwc addr 00000555 cmd 55 55 8bit x 8 bit fwc addr 00000aaa cmd 90 90 8bit x 8 bit fwc addr (null) cmd f0 f0 8bit x 8 bit fwc addr 000000aa cmd 98 9800 16bit x 8 bit manufacturer is 2 manufacturer id is 0x0 device id is 0x22 device id2 is 0x0 cfi version is 0x3133 size_ratio 1 port 16 bits chip 8 bits found 1 erase regions erase region 0: 0x0200007f erase_region_count = 128 erase_region_size = 131072 fwc addr (null) cmd f0 f0 8bit x 8 bit Portwidth: 1 Chipwidth: 1 Man ID : 0 Device ID: 34 flash_protect ON: from 0x00000400 to 0x000213FF fwc addr (null) cmd 70 70 8bit x 8 bit flash_is_busy: 0 protect on 0 fwc addr 00020000 cmd 70 70 8bit x 8 bit flash_is_busy: 0 protect on 1 flash_protect ON: from 0x00040000 to 0x0005FFFF fwc addr 00040000 cmd 70 70 8bit x 8 bit flash_is_busy: 0 protect on 2 16 MiB *** Warning - bad CRC, using default environment Destroy Hash Table: 41f7beb4 table = (null) Create Hash Table: N=105 INSERT: table 41f7beb4, filled 1/107 rv 41f19414 ==> name="bootdelay" value="5" INSERT: table 41f7beb4, filled 2/107 rv 41f19480 ==> name="baudrate" value="115200" INSERT: table 41f7beb4, filled 3/107 rv 41f1936c ==> name="ethaddr" value="00:e0:0c:bc:e5:60" INSERT: table 41f7beb4, filled 4/107 rv 41f1930c ==> name="ipaddr" value="192.162.1.2" INSERT: table 41f7beb4, filled 5/107 rv 41f194e0 ==> name="serverip" value="192.162.1.1" INSERT: table 41f7beb4, filled 6/107 rv 41f191d4 ==> name="gatewayip" value="192.162.1.1" INSERT: table 41f7beb4, filled 7/107 rv 41f19654 ==> name="netmask" value="255.255.255.0" INSERT: table 41f7beb4, filled 8/107 rv 41f194a4 ==> name="hostname" value="M5329EVB" INSERT: table 41f7beb4, filled 9/107 rv 41f1954c ==> name="netdev" value="eth0" INSERT: table 41f7beb4, filled 10/107 rv 41f194ec ==> name="loadaddr" value="40010000" INSERT: table 41f7beb4, filled 11/107 rv 41f19564 ==> name="u-boot" value="u-boot.bin" INSERT: table 41f7beb4, filled 12/107 rv 41f194b0 ==> name="load" value="tftp ${loadaddr) ${u-boot}" INSERT: table 41f7beb4, filled 13/107 rv 41f1960c ==> name="upd" value="run load; run prog" INSERT: table 41f7beb4, filled 14/107 rv 41f193cc ==> name="prog" value="prot off 0 3ffff;era 0 3ffff;cp.b ${loadaddr} 0 ${filesize};save" INSERT: free(data = 41f19008) INSERT: done In: serial Out: serial Err: serial U-Boot relocated to 41f59000 Net: No PHY device found. FEC0 ### main_loop entered: bootdelay=5 ### main_loop: bootcmd="<UNDEFINED>" -> saveenv Saving Environment to Flash... Data to save 0x1f000, 0x40000, 0x5ffff Data (start 0x41000, len 0x1f000) saved at 0x41f1a058 Protect off 00040000 ... 0005FFFF Un-Protecting sectors 2..2 in bank 1 fwc addr 00040000 cmd 70 70 8bit x 8 bit flash_is_busy: 0 . done Un-Protected 1 sectors EXPORT table = 41f7beb4, htab.size = 107, htab.filled = 19, size = 4092 Unsorted: n=19 0: 41f191d4 ==> gatewayip => 192.162.1.1 1: 41f191e0 ==> stdout => serial 2: 41f192d0 ==> stderr => serial 3: 41f1930c ==> ipaddr => 192.162.1.2 4: 41f1936c ==> ethaddr => 00:e0:0c:bc:e5:60 5: 41f1939c ==> stdin => serial 6: 41f193cc ==> prog => prot off 0 3ffff;era 0 3ffff;cp.b ${loadaddr} 0 ${filesize};save 7: 41f19414 ==> bootdelay => 5 8: 41f19480 ==> baudrate => 115200 9: 41f194a4 ==> hostname => M5329EVB 10: 41f194b0 ==> load => tftp ${loadaddr) ${u-boot} 11: 41f194e0 ==> serverip => 192.162.1.1 12: 41f194ec ==> loadaddr => 40010000 13: 41f1951c ==> mem => 32256k 14: 41f1954c ==> netdev => eth0 15: 41f19564 ==> u-boot => u-boot.bin 16: 41f195b8 ==> ethact => FEC0 17: 41f1960c ==> upd => run load; run prog 18: 41f19654 ==> netmask => 255.255.255.0 Erasing Flash...!Erase Flash from 0x00040000 to 0x0005ffff in Bank # 1 fwc addr 00040aaa cmd aa aa 8bit x 8 bit fwc addr 00040555 cmd 55 55 8bit x 8 bit fwc addr 00040aaa cmd 80 80 8bit x 8 bit fwc addr 00040aaa cmd aa aa 8bit x 8 bit fwc addr 00040555 cmd 55 55 8bit x 8 bit fwc addr 00040000 cmd 30 30 8bit x 8 bit flash_is_busy: 0 . done Erased 1 sectors Writing to Flash...! My Debug info :Flash Addr = 40000, Config Env Size = 20000, Env Size = 1fffc Flash not Erased Protecting sectors 2..2 in bank 1 fwc addr 00040000 cmd 70 70 8bit x 8 bit flash_is_busy: 0 . done Protected 1 sectors -> I am having problem with Flash Not Erased. Please help me. Thanks & Warm Regards, Ramesh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Disclaimer~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Information contained and transmitted by this e-mail is confidential and proprietary to iGATE and its affiliates and is intended for use only by the recipient. If you are not the intended recipient, you are hereby notified that any dissemination, distribution, copying or use of this e-mail is strictly prohibited and you are requested to delete this e-mail immediately and notify the originator or mailadmin(a)igate.com <mailto:mailadmin@igate.com>. iGATE does not enter into any agreement with any party by e-mail. Any views expressed by an individual do not necessarily reflect the view of iGATE. iGATE is not responsible for the consequences of any actions taken on the basis of information provided, through this email. The contents of an attachment to this e-mail may contain software viruses, which could damage your own computer system. While iGATE has taken every reasonable precaution to minimise this risk, we cannot accept liability for any damage which you sustain as a result of software viruses. You should carry out your own virus checks before opening an attachment. To know more about iGATE please visit www.igate.com <http://www.igate.com>. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2 9

[U-Boot] [PATCH 1/2] sf: stmicro: Add support for N25Q64
by Michal Simek 23 Jan '13

23 Jan '13

From: Jagannadha Sutradharudu Teki <jagannadha.sutradharudu-teki(a)xilinx.com> Add support for Numonyx N25Q064 SPI flash. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mtd/spi/stmicro.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 30b626a..96403ee 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -93,6 +93,12 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = { .name = "M25P128", }, { + .id = 0xba17, + .pages_per_sector = 256, + .nr_sectors = 128, + .name = "N25Q64", + }, + { .id = 0xba18, .pages_per_sector = 256, .nr_sectors = 256, -- 1.7.0.4

3 3

[U-Boot] [PATCH 1/2] mx23_olinuxino: Add default environment
by Otavio Salvador 23 Jan '13

23 Jan '13

Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- include/configs/mx23_olinuxino.h | 75 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index bc63481..a97598c 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -114,6 +114,14 @@ /* * MMC Driver */ +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OVERWRITE +#ifdef CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OFFSET (256 * 1024) +#define CONFIG_ENV_SIZE (16 * 1024) +#define CONFIG_SYS_MMC_ENV_DEV 0 +#endif +#define CONFIG_CMD_SAVEENV #ifdef CONFIG_CMD_MMC #define CONFIG_MMC #define CONFIG_BOUNCE_BUFFER @@ -127,21 +135,74 @@ #define CONFIG_APBH_DMA /* - * ENV -- nowhere so far - */ -#define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_IS_NOWHERE - -/* * Boot Linux */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_OF_LIBFDT +/* + * Extra Environments + */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "update_sd_firmware_filename=u-boot.sd\0" \ + "update_sd_firmware_filename=u-boot.sd\0" \ + "update_sd_firmware=" /* Update the SD firmware partition */ \ + "if mmc rescan ; then " \ + "if tftp ${update_sd_firmware_filename} ; then " \ + "setexpr fw_sz ${filesize} / 0x200 ; " /* SD block size */ \ + "setexpr fw_sz ${fw_sz} + 1 ; " \ + "mmc write ${loadaddr} 0x800 ${fw_sz} ; " \ + "fi ; " \ + "fi\0" \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ + "console=ttyAMA0\0" \ + "fdt_file=imx23-olinuxino.dtb\0" \ + "fdt_addr=0x41000000\0" \ + "boot_fdt=try\0" \ + "mmcdev=0\0" \ + "mmcpart=2\0" \ + "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ + "loadbootscript=" \ + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" + +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else " \ + "echo ERR: Fail to boot from MMC; " \ + "fi; " \ + "fi; " \ + "else exit; fi" + #endif /* __MX23_OLINUXINO_CONFIG_H__ */ -- 1.8.1

2 2

[U-Boot] [PATCH] spi: xilinx_spi: Perform software reset during slave setup
by Michal Simek 23 Jan '13

23 Jan '13

From: Jason Wu <jason.wu(a)petalogix.com> to make sure it is in the clear state. Signed-off-by: Jason Wu <huanyu(a)xilinx.com> --- drivers/spi/xilinx_spi.c | 2 ++ drivers/spi/xilinx_spi.h | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 52a4134..db01cc2 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -99,6 +99,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, debug("%s: bus:%i cs:%i base:%p mode:%x max_hz:%d\n", __func__, bus, cs, xilspi->regs, xilspi->mode, xilspi->freq); + writel(SPISSR_RESET_VALUE, &xilspi->regs->srr); + return &xilspi->slave; } diff --git a/drivers/spi/xilinx_spi.h b/drivers/spi/xilinx_spi.h index 32610d2..69d0b94 100644 --- a/drivers/spi/xilinx_spi.h +++ b/drivers/spi/xilinx_spi.h @@ -119,6 +119,9 @@ struct xilinx_spi_reg { #define SPIRFOR_OCYVAL_POS 0 #define SPIRFOR_OCYVAL_MASK (0xf << SPIRFOR_OCYVAL_POS) +/* SPI Software Reset Register (ssr) */ +#define SPISSR_RESET_VALUE 0x0a + struct xilinx_spi_slave { struct spi_slave slave; struct xilinx_spi_reg *regs; -- 1.7.0.4

1 0

[U-Boot] [PATCH] net: phy: Define Marvell 88e1518 phy
by Michal Simek 23 Jan '13

23 Jan '13

From: Michal Simek <monstr(a)monstr.eu> This phy is used on zedboard (xilinx zynq platform). Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- drivers/net/phy/marvell.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 4b27198..46801c7 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -465,6 +465,16 @@ static struct phy_driver M88E1149S_driver = { .shutdown = &genphy_shutdown, }; +static struct phy_driver M88E1518_driver = { + .name = "Marvell 88E1518", + .uid = 0x1410dd1, + .mask = 0xffffff0, + .features = PHY_GBIT_FEATURES, + .config = &m88e1111s_config, + .startup = &m88e1011s_startup, + .shutdown = &genphy_shutdown, +}; + int phy_marvell_init(void) { phy_register(&M88E1149S_driver); @@ -474,6 +484,7 @@ int phy_marvell_init(void) phy_register(&M88E1118R_driver); phy_register(&M88E1111S_driver); phy_register(&M88E1011S_driver); + phy_register(&M88E1518_driver); return 0; } -- 1.7.0.4

1 0

[U-Boot] [PATCH V1 0/5] prepare for mx6dl/ mx6solo
by Troy Kisky 23 Jan '13

23 Jan '13

Each patch in this series should be able to be applied independently of the others. These patch have been seen before but I marked this as version 1, because they were in the middle of another series previously. Troy Kisky (5): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h imximage.cfg: run files through C preprocessor .gitignore | 1 + Makefile | 11 +- arch/arm/cpu/armv7/mx6/soc.c | 32 ++- arch/arm/imx-common/cpu.c | 66 +++++- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 +++++++++++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- board/esg/ima3-mx53/imximage.cfg | 120 ++++++----- board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg | 90 ++++---- board/freescale/mx25pdk/imximage.cfg | 77 +++---- board/freescale/mx51evk/imximage.cfg | 114 +++++----- board/freescale/mx53ard/imximage_dd3.cfg | 83 ++++---- board/freescale/mx53evk/imximage.cfg | 86 ++++---- board/freescale/mx53loco/imximage.cfg | 83 ++++---- board/freescale/mx53smd/imximage.cfg | 83 ++++---- board/freescale/mx6qarm2/imximage.cfg | 88 ++++---- board/freescale/mx6qsabreauto/imximage.cfg | 82 +++---- board/genesi/mx51_efikamx/imximage_mx.cfg | 132 ++++++------ board/genesi/mx51_efikamx/imximage_sb.cfg | 126 +++++------ board/ttcontrol/vision2/imximage_hynix.cfg | 295 ++++++++++++++------------ drivers/gpio/mxc_gpio.c | 6 +- drivers/video/ipu_regs.h | 2 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 1 + include/configs/mx6qsabrelite.h | 1 + 26 files changed, 1036 insertions(+), 715 deletions(-) create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h -- 1.7.9.5

3 14

[U-Boot] [PATCH] microblaze: Add muldi3.c which contains routines for _muldi3
by Michal Simek 23 Jan '13

23 Jan '13

From: David Holsgrove <david.holsgrove(a)xilinx.com> Referenced arch/blackfin/lib/muldi3.c and the linux kernel. Resolves issue seen when building u-boot for HW_MUL=0; PLATFORM_CPPFLAGS += -mxl-soft-mul PLATFORM_CPPFLAGS += -mno-xl-multiply-high which resulted in error while linking to libgcc.a without mul hw (bs / m); libgcc.a(_muldi3.o): In function `__muldi3': .... src/gcc-4.6.2/libgcc/libgcc2.c:550: undefined reference to `_GLOBAL_OFFSET_TABLE_' This link failure would not occur if we used gcc instead of ld directly, as gcc will correctly use the crt's to resolve this link. Signed-off-by: David Holsgrove <david.holsgrove(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/microblaze/lib/Makefile | 1 + arch/microblaze/lib/muldi3.c | 91 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 0 deletions(-) create mode 100644 arch/microblaze/lib/muldi3.c diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile index 7730695..8d7febd 100644 --- a/arch/microblaze/lib/Makefile +++ b/arch/microblaze/lib/Makefile @@ -29,6 +29,7 @@ SOBJS-y += COBJS-y += board.o COBJS-y += bootm.o +COBJS-y += muldi3.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) diff --git a/arch/microblaze/lib/muldi3.c b/arch/microblaze/lib/muldi3.c new file mode 100644 index 0000000..76d7590 --- /dev/null +++ b/arch/microblaze/lib/muldi3.c @@ -0,0 +1,91 @@ +/* + * U-boot - muldi3.c contains routines for mult and div + * + * + * 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., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +/* Generic function got from GNU gcc package, libgcc2.c */ +#ifndef SI_TYPE_SIZE +#define SI_TYPE_SIZE 32 +#endif +#define __ll_B (1L << (SI_TYPE_SIZE / 2)) +#define __ll_lowpart(t) ((USItype) (t) % __ll_B) +#define __ll_highpart(t) ((USItype) (t) / __ll_B) +#define BITS_PER_UNIT 8 + +#if !defined(umul_ppmm) +#define umul_ppmm(w1, w0, u, v) \ + do { \ + USItype __x0, __x1, __x2, __x3; \ + USItype __ul, __vl, __uh, __vh; \ + \ + __ul = __ll_lowpart(u); \ + __uh = __ll_highpart(u); \ + __vl = __ll_lowpart(v); \ + __vh = __ll_highpart(v); \ + \ + __x0 = (USItype) __ul * __vl; \ + __x1 = (USItype) __ul * __vh; \ + __x2 = (USItype) __uh * __vl; \ + __x3 = (USItype) __uh * __vh; \ + \ + __x1 += __ll_highpart(__x0); /* this can't give carry */\ + __x1 += __x2; /* but this indeed can */ \ + if (__x1 < __x2) /* did we get it? */ \ + __x3 += __ll_B; /* yes, add it in the proper pos. */ \ + \ + (w1) = __x3 + __ll_highpart(__x1); \ + (w0) = __ll_lowpart(__x1) * __ll_B + __ll_lowpart(__x0);\ + } while (0) +#endif + +#if !defined(__umulsidi3) +#define __umulsidi3(u, v) \ + ({DIunion __w; \ + umul_ppmm(__w.s.high, __w.s.low, u, v); \ + __w.ll; }) +#endif + +typedef unsigned int USItype __attribute__ ((mode(SI))); +typedef int SItype __attribute__ ((mode(SI))); +typedef int DItype __attribute__ ((mode(DI))); +typedef int word_type __attribute__ ((mode(__word__))); + +struct DIstruct { + SItype low, high; +}; +typedef union { + struct DIstruct s; + DItype ll; +} DIunion; + +DItype __muldi3(DItype u, DItype v) +{ + DIunion w; + DIunion uu, vv; + + uu.ll = u, vv.ll = v; + /* panic("kernel panic for __muldi3"); */ + w.ll = __umulsidi3(uu.s.low, vv.s.low); + w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high + + (USItype) uu.s.high * (USItype) vv.s.low); + + return w.ll; +} -- 1.7.0.4

1 0

[U-Boot] [PATCH] powerpc/85xx: add missing QMAN frequency calculation
by Shaohui Xie 23 Jan '13

23 Jan '13

When CONFIG_SYS_FSL_QORIQ_CHASSIS2 is not defined, QMAN frequency will not be initialized, and QMAN will have a wrong frequency display. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/speed.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 801ee07..882fc5f 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -285,6 +285,10 @@ void get_sys_info (sys_info_t * sysInfo) #endif #endif +#ifdef CONFIG_SYS_DPAA_QBMAN + sysInfo->freqQMAN = sysInfo->freqSystemBus / 2; +#endif + #endif /* CONFIG_SYS_FSL_QORIQ_CHASSIS2 */ #else /* CONFIG_FSL_CORENET */ -- 1.6.4

1 0

[U-Boot] [PATCH 1/1] console: USB: KBD: Fix incorrect autoboot timeout
by Jim Lin 23 Jan '13

23 Jan '13

Autoboot timeout defined by CONFIG_BOOTDELAY will not be accurate if CONFIG_USB_KEYBOARD and CONFIG_SYS_USB_EVENT_POLL are defined in configuration file and when tstc() function for checking key pressed takes longer time than 10 ms (e.g., 50 ms) to finish. Signed-off-by: Jim Lin <jilin(a)nvidia.com> --- common/main.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/main.c b/common/main.c index b145f85..8cdfb8b 100644 --- a/common/main.c +++ b/common/main.c @@ -225,6 +225,7 @@ static inline int abortboot(int bootdelay) { int abort = 0; + unsigned long ts; #ifdef CONFIG_MENUPROMPT printf(CONFIG_MENUPROMPT); @@ -248,11 +249,13 @@ int abortboot(int bootdelay) #endif while ((bootdelay > 0) && (!abort)) { - int i; + int i, j; --bootdelay; /* delay 100 * 10ms */ - for (i=0; !abort && i<100; ++i) { + j = 100; + for (i = 0; !abort && i < j; ++i) { + ts = get_timer(0); if (tstc()) { /* we got a key press */ abort = 1; /* don't auto boot */ bootdelay = 0; /* no more delay */ @@ -263,7 +266,11 @@ int abortboot(int bootdelay) # endif break; } - udelay(10000); + ts = get_timer(ts); + if (ts < 10) + mdelay(10 - ts); + else + j = 1000 / (int) ts; } printf("\b\b\b%2d ", bootdelay); -- 1.7.3 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------

2 2

[U-Boot] [PATCH] powerpc/p2041: fix serdes reference clock frequency for PC board
by Shaohui Xie 23 Jan '13

23 Jan '13

PC board has different serdes clock setting with PB board, it uses same serdes frequency setting on bank2 as on bank1. PC board can be distingushed from PB board by checking CPLD version, if running on PC board, then fix the serdes reference clock frequency of bank2. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)freescale.com> --- board/freescale/p2041rdb/p2041rdb.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index 4e4d18f..f6de0d3 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -227,6 +227,11 @@ int misc_init_r(void) "'00' is unsupported\n"); else actual[i] = freq[i][clock]; + + if ((i == 1) & (CPLD_READ(cpld_ver_sub) == 1) + & (CPLD_READ(pcba_ver) == 5)) + /* PC board frequency */ + actual[i] = freq[i-1][clock]; } for (i = 0; i < NUM_SRDS_BANKS; i++) { -- 1.6.4

2 1