summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-08-18-55/+1539
|\
| * 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>
| * 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>
* | Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-08-12-329/+307
|\ \
| * | mmc: omap3: fix block read functionGrazvydas Ignotas2010-08-12-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OMAP3 block read function is not following API and always returning 1 instead of read block count, fix it. Also to simplify code, merge it with with a helper function, which was only called from the block read function. After this patch ext2 filesystem can be used properly. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Tested-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * | mmc: omap3: make local symbols staticGrazvydas Ignotas2010-08-12-25/+17
| |/ | | | | | | | | | | | | | | | | Make driver local variables and functions static and remove them from the arch header. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Tested-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * 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-netWolfgang Denk2010-08-10-233/+228
| |\ \
| | * | Fix compile warnings for const correctnessBen Warren2010-08-09-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6e37b1a3a25004d3df5867de49fff6b3fc9c4f04 modifies several net calls to take a (const char *) parameter instead of (char *), but in some cases the modified functions call other functions taking (char *). The end result is warnings about discarding the const qualifier. This patch fixes these other function signatures. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | miiphy: leverage current_mii cache moreMike Frysinger2010-08-09-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For code that uses miiphy_{read,write}, every call invokes a full look up of the mii list. There is already a "current_mii" cache that is used by some code, but have the miiphy_{read,write} function use it as well. This does increase the code size slightly, but I think it's worth it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | miiphy: unify device list lookupMike Frysinger2010-08-09-60/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have every func re-implement the list walking code, do it one local function. This shrinks the resulting object code a little while making the source much more manageable. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | miiphy: constify device nameMike Frysinger2010-08-09-106/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver name does not need to be writable, so constify it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | net: rename "FSL UECx" net interfaces "UECx"Kim Phillips2010-08-09-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continuation of commit 2ecc2262d66a286e3aac79005bcb5f461312dea8 "net ppc: fix ethernet device names with spaces" (currently in u-boot-net.git) for QE based parts. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | net ppc: fix ethernet device names with spacesHeiko Schocher2010-08-09-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names with spaces drop a Warning: eth device name has a space! message. This patch fix it for: - "FEC ETHERNET" devices found on mpc512x, mpc5xxx, mpc8xx and mpc8220 boards. renamed to "FEC". - "SCC ETHERNET" devices found on mpc8xx, mpc82xx based boards. Renamed to "SCC". - "HDLC ETHERNET" devices found on mpc8xx boards Renamed to "HDLC" - "FCC ETHERNET" devices found on mpc8260 and mpc85xx based boards. Renamed to "FCC" Tested on the kup4k board. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | net,fec: Shorten device name as done for other driversStefano Babic2010-08-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussion on the ML it is suggested to drop unrequired and not useful characters from the device name. This patch changes the name for the fec_mxc driver from "FEC_MXC" to "FEC". Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | ppc4xx: Fix/Update katmai board headerStefan Roese2010-08-09-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has the following fixes/changes: - Set 'kernel_addr' and 'ramdisk_addr' to correct values and add 'fdt_addr' environment variable - Remove 'kozio' environment variable - Remove environmant variables to boot ancient arch/ppc Linux kernels - Remove CONFIG_SYS_BOOTMAPSZ definition. It's already defined to the same value in amcc-common.h Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Fix building of sc3 boardHeiko Schocher2010-08-09-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update image size after addition of new environment handling. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Fix building of PMC440 boardMatthias Fuchs2010-08-09-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update image size and default environment after addition of new environment handling. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Fix building of CANBT boardMatthias Fuchs2010-08-09-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update image size after addition of new environment handling. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Fix building of AR405 boardMatthias Fuchs2010-08-09-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update image size after addition of new environment handling. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: cleanup default environment for AMCC boardsWolfgang Denk2010-08-09-4/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | None of the AMCC boards uses an embedded environment, so there is no need to run "saveenv" after updating U-Boot. Drop the redundant commands from the default environment. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | | ARM: Add support for jadecpu board based on MB86R01 SoCMatthias Weisser2010-08-10-0/+791
| | | | | | | | | | | | | | | | | | | | | This patch adds support for the jadecpu board using the MB86R01 'Jade' SoC from Fujitsu. Signed-off-by: Matthias Weisser <weisserm@arcor.de>
* | | video: add support for display controller in MB86R0x SoCsMatthias Weisser2010-08-10-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the display controller in the MB86R0x SoCs. Signed-off-by: Matthias Weisser <weisserm@arcor.de> Acked-by: Anatolij Gustschin <agust@denx.de>
* | | ARM: Add support for MB86R0x SoCsMatthias Weisser2010-08-10-6/+956
| |/ |/| | | | | Signed-off-by: Matthias Weisser <weisserm@arcor.de>
* | 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
|\ \ \
generated by cgit v1.1 at 2024-11-12 21:22:40 +0000