summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-armWolfgang Denk2008-08-12-29/+44
|\
| * i.MX31: Fix mx31_gpio_mux() function and MUX_-macros.Magnus Lilja2008-08-11-25/+40
| | | | | | | | | | | | | | | | | | | | Correct the mx31_gpio_mux() function to allow changing all i.MX31 IOMUX contacts instead of only the first 256 ones as is the case prior to this patch. Add missing MUX_* macros and update board files to use the new macros. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * i.MX31: Fix IOMUX related typosMagnus Lilja2008-08-11-6/+6
| | | | | | | | | | | | Correct the names of some IOMUX macros. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2008-08-12-4/+2
|\ \
| * | OneNAND: Remove unused parameters to onenand_verify_pageSteve Sakoman2008-08-11-4/+2
| | | | | | | | | | | | | | | | | | | | | The block and page parameters of onenand_verify_page() are not used. This causes a compiler error when CONFIG_MTD_ONENAND_VERIFY_WRITE is enabled. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
* | | 85xx: Rename CONFIG_NR_CPUS to CONFIG_NUM_CPUSKumar Gala2008-08-12-5/+5
| | | | | | | | | | | | | | | | | | | | | Use CONFIG_NUM_CPUS to match existing define used by 86xx. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Jon Loeliger <jdl@freescale.com>
* | | Fix fallout from autostart revertKumar Gala2008-08-12-73/+13
| | | | | | | | | | | | | | | | | | | | | | | | The autostart revert caused a bit of duplicated code as well as code that was using images->autostart that needs to get removed so we can build again. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | Fix compile error related to r8a66597-hcd & usbKumar Gala2008-08-12-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building the 8544DS board we get this error: In file included from r8a66597-hcd.c:22: u-boot/include/usb.h:190:2: error: #error USB Lowlevel not defined make[1]: *** [r8a66597-hcd.o] Error 1 The cleanest fix is to only build r8a66597-hcd.c if CONFIG_USB_R8A66597_HCD is set. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | POWERPC 86xx: Move BAT setup code to CBecky Bruce2008-08-11-119/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because we will be possibly be locating devices at physical addresses above 32bits, and the asm preprocessing does not appear to deal with ULL constants properly. We now call write_bat in lib_ppc/bat_rw.c. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Acked-by: Jon Loeliger <jdl@freescale.com>
* | | POWERPC: Add synchronization to write_bat in lib_ppc/bat_rw.cBecky Bruce2008-08-11-0/+6
| | | | | | | | | | | | | | | | | | | | | Perform sync/isync as required by the architecture. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Acked-by: Jon Loeliger <jdl@freescale.com>
* | | POWERPC: 86xx - add missing CONFIG_HIGH_BATS to sbc8641d configBecky Bruce2008-08-11-0/+2
|/ / | | | | | | | | Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Acked-by: Jon Loeliger <jdl@freescale.com>
* | Merge branch 'master' of /home/stefan/git/u-boot/u-bootStefan Roese2008-08-11-581/+2702
|\ \
| * | video: fix bug in cfb_console codeAnatolij Gustschin2008-08-11-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FILL_15BIT_555RGB macro extension for pixel swapping by commit bed53753dd1d7e6bcbea4339be0fb7760214cc35 introduced a bug in cfb_console: Bitmaps with odd-numbered width won't be rendered correctly and even U-Boot crashes are observed on some platforms while repeated rendering of such bitmaps with "bmp display". Also if a bitmap is rendered to an odd-numbered x starting position, the same problem occurs. This patch is an attempt to fix it. Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * | video: fix bug in logo_plotAnatolij Gustschin2008-08-11-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If logo_plot() should ever be called with x starting position other than zero and for pixel depths greater than 8bpp, logo colors distortion will be observed. This patch fixes the issue. Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * | MAINTAINERS: sort entriesWolfgang Denk2008-08-11-27/+27
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Add mpc7448hpc2 maintainer informationRoy Zang2008-08-11-0/+4
| | | | | | | | | | | | Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
| * | common/cmd_load.c - Minor code & Coding Style cleanupGururaja Hebbar K R2008-08-11-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | - os_data_header Variable is a carry over feature & unused. So removed all instance of this variable - Minor Code Style Update Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Update the U-Boot wiki URL.Magnus Lilja2008-08-11-2/+2
| | | | | | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * | OneNAND: Remove base address offset usagedirk.behme@googlemail.com2008-08-10-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While locally preparing some U-Boot patches for ARM based OMAP3 boards, some using OneNAND and some using NAND, we found some differences in OneNAND and NAND command address handling. As this might confuse users (it already confused us), we like to align OneNAND and NAND address handling. The issue is that cmd_onenand.c subtracts the onenand base address from the addresses you type into the u-boot command line so, unlike nand, you can't use addresses relative to the start of the onenand part e.g. this won't work: onenand read 82000000 280000 400000 you have to use: onenand read 82000000 20280000 400000 Looking at recent git, the only board currently using OneNAND is Apollon, and for this the OneNAND base address is 0 (apollon.h) #define CFG_ONENAND_BASE 0x00000000 so patch below won't break any existing boards and will align OneNAND and NAND handling on boards where OneNAND base address is != 0. Signed-off-by: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Manikandan Pillai <mani.pillai@ti.com> Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
| * | mpc85xx: workaround old binutils bugKumar Gala2008-08-10-35/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent change to move the .bss outside of the image gives older binutils (ld from eldk4.1/binutils-2.16) some headache: ppc_85xx-ld: u-boot: Not enough room for program headers (allocated 3, need 4) ppc_85xx-ld: final link failed: Bad value We workaround it by being explicit about the program headers and not assigning the .bss to a program header. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | Revert "[new uImage] Add autostart flag to bootm_headers structure"Wolfgang Denk2008-08-10-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f5614e7926863bf0225ec860d9b319741a9c4004. The commit was based on a misunderstanding of the (documented) meaning of the 'autostart' environment variable. It might cause boards to hang if 'autostart' was used, with the potential to brick them. Go back to the documented behaviour. Conflicts: common/cmd_bootm.c common/image.c include/image.h Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Merge branch 'master' of git://git.denx.de/u-boot-at91Wolfgang Denk2008-08-10-2/+15
| |\ \
| | * | DataFlash: AT45DB021 fix and AT45DB081 supportSergey Lapin2008-08-09-2/+15
| | |/ | | | | | | | | | | | | | | | | | | Fix for page size of AT45DB021. Also adding bigger AT45DB081 which comes with some newer boards. Signed-off-by: Sergey Lapin <slapin@ossfans.org>
| * | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2008-08-10-0/+9
| |\ \
| | * | sh: Update sh7763rdp configNobuhiro Iwamatsu2008-08-09-0/+9
| | |/ | | | | | | | | | | | | | | | Add sh_eth support to sh7763rdp. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
| * | Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2008-08-10-4/+1614
| |\ \
| | * | usb: add support for R8A66597 usb controllerYoshihiro Shimoda2008-08-07-1/+1589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for Renesas R8A66597 usb controller. This patch supports USB Host mode. Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| | * | Add support for OMAP5912 and OMAP16xx to usbdcore_omap1510.cHunter, Jon2008-08-07-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to drivers/usb/usbdcore_omap1510.c for OMAP5912 and OMAP16xx devices. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| | * | Merge branch 'master' of git://www.denx.de/git/u-bootMarkus Klotzbuecher2008-08-04-1748/+1082
| | |\ \ | | | |/
| | * | Merge branch 'master' of git://www.denx.de/git/u-bootMarkus Klotzbuecher2008-07-21-2461/+4610
| | |\ \
| | * \ \ Merge branch 'master' of git://www.denx.de/git/u-bootMarkus Klotzbuecher2008-07-10-159/+225
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://www.denx.de/git/u-bootMarkus Klotzbuecher2008-07-10-11587/+26863
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://www.denx.de/git/u-bootMarkus Klotzbuecher2008-06-03-53/+75
| | |\ \ \ \ \
| | * | | | | | Fix endianess conversion in usb_ohci.cChristian Eggers2008-05-22-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry, I forgot this line: Signed-off-by: Christian Eggers <ceggers@gmx.de> I think this must be swapped (result may be equal).
| * | | | | | | Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2008-08-10-0/+50
| |\ \ \ \ \ \ \
| | * | | | | | | QE UEC: Fix compiler warningsBen Warren2008-08-07-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved static functions earlier in file so forward declarations are not needed. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * | | | | | | QE UEC: Add MII CommandsDavid Saada2008-08-07-0/+53
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MII commands to the UEC driver. Note that once a UEC device is selected, any device on its MDIO bus can be addressed. Signed-off-by: David Saada <david.saada@ecitele.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | | | | Merge branch 'master' of git://git.denx.de/u-boot-mpc512xWolfgang Denk2008-08-10-393/+388
| |\ \ \ \ \ \ \
| | * | | | | | | mpc5121: Move iopin features from board specific to common files.Kenneth Johansson2008-08-05-376/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And in the process eliminate some duplicate register defines. Signed-off-by: Kenneth Johansson <kenneth@southpole.se>
| | * | | | | | | mpc5121: squash some fdt fixup errorsJohn Rigby2008-08-05-17/+65
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ADS5121 when booting linux the following errors are seen: Unable to update property /soc5121@80000000:bus-frequency, err=FDT_ERR_NOTFOUND Unable to update property /soc5121@80000000/ethernet@2800:local-mac-address, err=FDT_ERR_NOTFOUND Unable to update property /soc5121@80000000/ethernet@2800:address, err=FDT_ERR_NOTFOUND This is caused by ft_cpu_setup trying to deal with both old and new soc node naming. This patch fixes this by being smarter about what to fixup. Also do soc node fixups by compatible instead of by path. A new board config called OF_SOC_COMPAT defined to be "fsl,mpc5121-immr" replaces the old OF_SOC node path that was defined to be "soc@80000000". Old device trees still work, but the compatiblity is conditional on CONFIG_OF_SUPPORT_OLD_DEVICE_TREES which is on by default in include/configs/ads5121.h. Signed-off-by: John Rigby <jrigby@freescale.com>
| * | | | | | | TQM8xx{L,M}: try to normalize config files for TQM8xx? based boardWolfgang Denk2008-08-09-67/+440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enable CFI driver where this was forgotten - enable mtdparts support - adjust default environment etc. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | | | | FIT: Fix handling of images without ramdisksPeter Tyser2008-08-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot_get_ramdisk() should not treat the case when a FIT image does not contain a ramdisk as an error. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Acked-by: Michal Simek <monstr@monstr.eu>
| * | | | | | | TQM823L: re-enable logo support; update LCD_INFO textWolfgang Denk2008-08-08-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | | | | TQM8xxL: fix support for second flash bankWolfgang Denk2008-08-08-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching the TQM8xxL modules to use the CFI flash driver, support for the second flash bank was broken because the CFI driver did not support dynamically sized banks. This gets fixed now. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | | | | CFI: allow for dynamically determined flash sizes and addressesWolfgang Denk2008-08-08-6/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CFI driver allowed only for static initializers in the CFG_FLASH_BANKS_LIST definition, i. e. it did not allow to map several flash banks contiguously if the bank sizes were not known in advance, which kind of violates U-Boot's design philosophy. (will be used for example by the TQM8xxL boards) Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | | | | ppc4xx: Sequoia has two UARTs in "4-pin" mode. Configure the GPIOs as per ↵Steven A. Falco2008-08-07-6/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schematic. The Sequoia board has two UARTs in "4-pin" mode. This patch modifies the GPIO configuration to match the schematic, and also sets the SDR0_PFC1 register to select the corresponding mode for the UARTs. Signed-off-by: Steven A. Falco <sfalco@harris.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | | | | | drivers/serial: Move conditional compilation to Makefile for CONFIG_* macrosJean-Christophe PLAGNIOL-VILLARD2008-08-03-29/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | | | nios2/sysid: fix printf warningJean-Christophe PLAGNIOL-VILLARD2008-08-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | | | Fix remaining build issues with MPC8xx FADS boards.Jean-Christophe PLAGNIOL-VILLARD2008-08-03-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | | | nios2: fix phys_addr_t and phys_size_t supportJean-Christophe PLAGNIOL-VILLARD2008-08-03-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>