summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/masterWolfgang Denk2010-08-18-24/+1116
|\
| * ARM: Update ARM mach-typesSandeep Paulraj2010-08-18-24/+1116
| | | | | | | | | | | | This patch updates the mach-types.h based on the latest linux kernel Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips.Philippe De Muyter2010-08-18-8/+25
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have "ported" U-boot to a in house made board with Numonyx Axcell P33/P30 256-Mbit 65nm flash chips. After some time :( searching for bugs in our board or soft, we have discovered that those chips have a small but annoying bug, documented in "Numonyx Axcell P33/P30 256-Mbit Specification Update" It states : When customer uses [...] block unlock, the block lock status might be altered inadvertently. Lock status might be set to either 01h or 03h unexpectedly (00h as expected data), which leads to program/erase failure on certain blocks. A working workaround is given, which I have applied and tested with success : Workaround: If the interval between 60h and its subsequent command can be guaranteed within 20us, Option I is recommended, otherwise Option II (involves hardware) should be selected. Option I: The table below lists the detail command sequences: Command Data bus Address bus Remarks Sequence 1 90h Block Address Read Lock Status 2 Read Block Address + 02h (2)(3) (1) 3 60h Block Address (2)(3) (1) Lock/Unlock/RCR Configuration 4 D0h/01h/03h Block Address Notes: (1) Block Address refers to RCR configuration data only when the 60h command sequence is used to set RCR register combined with 03h subsequent command. (2) For the third and fourth command sequences, the Block Address must be the same. (3) The interval between 60h command and its subsequent D0h/01h/2Fh/03h commands should be less than 20us. And here is a log comparison of a simple (destructive) flash test without and with the workaround. diff without-numonyx-workaround.log with-numonyx-workaround.log -U-Boot 2010.06-00696-g22b002c-dirty (Aug 16 2010 - 15:07:47) +U-Boot 2010.06-00696-g22b002c-dirty (Aug 16 2010 - 15:25:19) CPU: Freescale MCF5484 CPU CLK 200 MHz BUS CLK 100 MHz Board: Macq Electronique ME2060 I2C: ready DRAM: 64 MiB FLASH: 32 MiB In: serial Out: serial Err: serial Net: FEC0, FEC1 -> flinfo Bank # 1: CFI conformant FLASH (16 x 16) Size: 32 MB in 259 Sectors Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x8922 Erase timeout: 4096 ms, write timeout: 1 ms Buffer write timeout: 5 ms, buffer size: 1024 bytes Sector Start Addresses: FE000000 RO FE008000 RO FE010000 RO FE018000 RO FE020000 RO FE040000 RO FE060000 RO FE080000 RO FE0A0000 RO FE0C0000 RO ... FFF80000 RO FFFA0000 RO FFFC0000 RO FFFE0000 RO -> protect off all Un-Protect Flash Bank # 1 ................... done -> erase all Erase Flash Bank # 1 ................... done -> cp.b 1000000 fe000000 2000000 -Copy to Flash... Flash not Erased +Copy to Flash... done -> Signed-off-by: Philippe De Muyter <phdm@macqel.be> Signed-off-by: Stefan Roese <sr@denx.de>
* cfi_flash: Cleanup flash_print_info()Stefan Roese2010-08-18-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | This patch does the following: - Extract code to detect if sector is erased into function sector_erased(). - Because of this, we don't have variable declarations inside the sector loop in flash_print_info() - Change "return" to "break" in the "if (ctrlc()) statement: This fixes a problem with the resulting output. Before this patch the output was: Sector Start Addresses: FC000000 FC020000 FC040000 => With this patch it is now: Sector Start Addresses: FC000000 FC020000 FC040000 => Signed-off-by: Stefan Roese <sr@denx.de> Cc: Kim Phillips <kim.phillips@freescale.com> Cc: Wolfgang Denk <wd@denx.de>
* Fix printing & reading of 16-bit CFI device identifiersPhilippe De Muyter2010-08-18-4/+7
| | | | | | | | | | | | | | Fix reading and printing of CFI flashes 16-bit devices identifiers Nowadays CFI flashes have a 16-bit device identifier. U-boot still print them and read them as if they were only 8-bit wide. Fix that. Before: Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x1B After: Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x881B Signed-off-by: Philippe De Muyter <phdm@macqel.be> Signed-off-by: Stefan Roese <sr@denx.de>
* cfi_flash: flinfo: allow user interrupt in flash print info fnKim Phillips2010-08-18-0/+2
| | | | | | | flashes getting larger, users more impatient. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Stefan Roese <sr@denx.de>
* env_nand: return error when no device is foundMike Frysinger2010-08-13-0/+2
| | | | | | | | | | | | | Currently, if there is an error probing the NAND chip and the env is based in NAND, the readenv() function will use a NULL function pointer and thus jump to address 0. Here I just check for a non-zero value of blocksize as that shouldn't be zero when a valid device is found, but perhaps there is a better way for someone familiar with the NAND internals to suggest. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
* Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2010-08-12-2/+345
|\
| * Fixed clobbered output of the "help usb" commandSergei Poselenov2010-08-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "usb help" doesn't format the output correctly: => help usb usb - USB sub-system Usage: usb reset - reset (rescan) USB controller usb stop [f] - stop USB [f]=force stop usb tree - show USB device tree usb info [dev] - show available USB devices usb storage - show details of USB storage devices usb dev [dev] - show or set current USB storage device usb part [dev] - print partition table of one or all USB storage devices usb read addr blk# cnt - read `cnt' blocks starting at block `blk#' to memory address `addr'usb write addr blk# cnt - write `cnt' blocks starting at block `blk#' from memory address `addr' => With fix below applied, the output is correct: => help usb usb - USB sub-system Usage: usb reset - reset (rescan) USB controller usb stop [f] - stop USB [f]=force stop usb tree - show USB device tree usb info [dev] - show available USB devices usb storage - show details of USB storage devices usb dev [dev] - show or set current USB storage device usb part [dev] - print partition table of one or all USB storage devices usb read addr blk# cnt - read `cnt' blocks starting at block `blk#' to memory address `addr' usb write addr blk# cnt - write `cnt' blocks starting at block `blk#' from memory address `addr' => Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * AM3517EVM: musb: add usb configAjay Kumar Gupta2010-08-12-0/+38
| | | | | | | | | | | | Enabling USB HOST in defconfig. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
| * musb: am35x: Workaround for fifo read issueAjay Kumar Gupta2010-08-12-0/+38
| | | | | | | | | | | | | | AM35x supports only 32bit read operations so we need to have workaround for 8bit and 16bit read operations. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
| * musb: MSC host support for AM35xAjay Kumar Gupta2010-08-12-1/+216
| | | | | | | | | | | | Tested MSC Host on AM3517EVM. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
| * AM35x: Adding SCM general register definitionsAjay Kumar Gupta2010-08-12-0/+52
| | | | | | | | | | | | | | | | Adding general register structure of system control module (SCM) of AM35x. This would be required to access devconf2 and ip_sw_reset register in musb module. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
* | Blackfin: re-use board data in cpu bannerMike Frysinger2010-08-11-1/+2
| | | | | | | | | | | | | | The bi_cpu field of the board data is already set to the relevant cpu string, so there is no need for us to use the define directly. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: cm-bf548: increase monitor lenMike Frysinger2010-08-11-1/+1
| | | | | | | | | | | | | | Recent features enabled by default require a larger monitor size for the cm-bf548 port, so bump it up a bit. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: shutdown video DMA when booting LinuxMichael Hennerich2010-08-11-0/+38
|/ | | | | | | | | | | In case there is no frame buffer driver present in Linux to hand over the PPI LCD DMA upon boot, the DMA initiated by u-boot to display the splash screen runs unattended. Therefore always stop the video driver in u-boot before starting Linux. If people don't want this behavior, then they can simply stub out the video_stop() function in their board video driver. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* disk/part.c: 'usb storage' avoiding overflow when output capacitySergei Trofimovich2010-08-10-5/+23
| | | | | | | | | | | | | | | Before: Marvell>> usb storage Device 0: Vendor: StoreJet Rev: Prod: Transcend Type: Hard Disk Capacity: 28759.9 MB = 28.0 GB (488397168 x 512) After: Marvell>> usb storage Device 0: Vendor: StoreJet Rev: Prod: Transcend Type: Hard Disk Capacity: 238475.1 MB = 232.8 GB (488397168 x 512) Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-08-10-136/+2339
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-imxWolfgang Denk2010-08-10-2/+2
| |\
| | * MX51EVK: fix return value of get_timer_maskedLi Haibo2010-08-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_timer_masked() should return current timestamp, not current ticks from hardware register. Tested on one custom board with NAND flash. Without this patch, NAND write always TIMEOUT because get_timer(0) return a big value. This patch applies for u-boot-2010.06 Signed-off-by: Li Haibo <hbli@sinocastel.com>
| | * fix cmd_mmc.c, line 136 missing "Reinhard Meyer2010-08-10-1/+1
| | | | | | | | | | | | | | | | | | Remove warning for missing " at the end of line 136 Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
| * | orion5x: allow overriding default mappings windowsAlbert Aribaud2010-08-10-41/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn all ORION5X_DEF{ADR,SZ}_xxx macros into ORION5X_{ADR,SZ}_xxx and allow defining them from board code to override defaults. This is particularly useful for defining board-specific FLASH address and size in board header file rather than having to tweak orion5x code. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| * | Merge branch 'master' of git://git.denx.de/u-boot-marvellWolfgang Denk2010-08-10-13/+247
| |\ \
| | * | Kirkwood: openrd_base: Added SATA supportPrafulla Wadaskar2010-08-08-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables mvsata driver and related filesystem support. The patch is tested for ide reset and ext2ls operation for a disk drive connected on SATA port0. This patch depends upon the patche-series http://lists.denx.de/pipermail/u-boot/2010-August/074908.html Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
| | * | cmd_ide: add support for KirkwoodPrafulla Wadaskar2010-08-08-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added MVSATAC definitions to Kirkwood. Added support for Kirkwood in cmd_ide. Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
| | * | edminiv2: add mvsata_ide and cmd_ide supportAlbert Aribaud2010-08-08-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | Add mvsata_ide and cmd_ide configuration in edminiv2 config Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| | * | cmd_ide: add support for orion5xAlbert Aribaud2010-08-08-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MVSATAHC definitions to orion5x. Add support for orion5x in cmd_ide. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| | * | ide: add mvsata_ide driverAlbert Aribaud2010-08-08-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver only provides initialization code; actual driving is done by cmd_ide.c using the ATA compatibility mode of the Marvell SATAHC controller. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| | * | ide: reorder object files alphabeticallyAlbert Aribaud2010-08-08-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| | * | ide: add configurationAlbert Aribaud2010-08-08-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_IDE_SWAP_IO This configuration option replaces a complex conditional in cmd_ide.c with an explicit define to be added to SoC or board configs. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| * | | Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-08-10-25/+1210
| |\ \ \
| | * | | ARMV7: Update default environment for OMAP4 boardsSteve Sakoman2010-08-05-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify vram on command line, remove erroneous call to nandboot in the boot script, add CONFIG_BOOTDELAY Signed-off-by: Steve Sakoman <steve@sakoman.com> Acked-by: Nishanth Menon <menon.nishanth@gmail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Enable musb driver and usbtty on OMAP4 PandaSteve Sakoman2010-08-05-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Enable musb driver and usbtty on OMAP4430 SDPSteve Sakoman2010-08-05-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and ↵Steve Sakoman2010-08-05-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP4 Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systemsSteve Sakoman2010-08-05-0/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add the basic infrastructure for the TWL6030 driver and enables support in the two existing OMAP4 boards, Panda and OMAP4430 SDP Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Modify i2c driver for more reliable operation on OMAP4Steve Sakoman2010-08-05-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the init routine to follow the TRM recommendations. It also modifies the i2c_read_byte function to reflect subtle differences between the i2c controller in OMAP3 and OMAP4. Signed-off-by: Steve Sakoman <steve@sakoman.com> Acked-by: Nishanth Menon <menon.nishanth@gmail.com> Acked-by: Heiko Schocher <hs@denx.de> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Fix udelay for OMAP4Steve Sakoman2010-08-05-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OMAP4 x-load code sets gptimer1 clock source to 32Khz. This isn't acceptable for udelay. This patch changes from gptimer1 to gptimer2, which uses sys_clk at 38.4 Mhz. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: Add pad mux support for OMAP4Steve Sakoman2010-08-05-0/+942
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functional multiplexing support for OMAP4 pads. Configure all the pads for the OMAP4430 SDP and OMAP4 Panda boards Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * | | Merge branch 'master' of ../masterWolfgang Denk2010-08-10-866/+683
| |\ \ \ | | | |/ | | |/|
| * | | ARM: Define __raw_readX and __raw_writeXMarek Vasut2010-08-07-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are undefined on ARM when using __io. These are the commonly used versions and can be redefined. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * | | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-08-07-95109/+4121
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of git://git.denx.de/u-boot-samsungWolfgang Denk2010-08-04-2/+597
| |\ \ \
| | * | | s5p_goni: enable mmc0Minkyu Kang2010-08-03-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the board_mmc_init function and enable the mmc command Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| | * | | S5P: support mmc driverMinkyu Kang2010-08-03-0/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support mmc driver for s5p SoC Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| | * | | SAMSUNG: serial: remove compiler warningsMinkyu Kang2010-07-09-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove below warnings serial_s5p.c: In function 'serial_getc_dev': serial_s5p.c:136: warning: dereferencing type-punned pointer will break strict-aliasing rules serial_s5p.c: In function 'serial_putc_dev': serial_s5p.c:152: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| | * | | Merge branch 'master' of git://git.denx.de/u-bootMinkyu Kang2010-07-06-23873/+8238
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://git.denx.de/u-boot-armMinkyu Kang2010-06-15-227/+4202
| | |\ \ \ \
| | * | | | | SAMSUNG: goni: add the GPL licenceMinkyu Kang2010-06-09-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Tom <Tom@bumblecow.com>
| | * | | | | s5pc1xx: Add support for Samsung Goni boardMinkyu Kang2010-06-03-4/+1237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Samsung Goni board (S5PC110 SoC) Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>