summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* include/config_cmd_default.h cleanupPrafulla Wadaskar2009-07-17-3/+3
| | | | | | | arranged configurations in alphabetical order CONFIG_CMD_FLASH moved under ifndef CONFIG_SYS_NO_FLASH Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
* Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2009-07-17-131/+304
|\
| * Added support for splash screen positioningMatthias Weisser2009-07-17-3/+92
| | | | | | | | | | | | | | | | | | | | This patch adds support splash image positioning by adding an additional variable "splashpos" to the environment. Please see README for details. Signed-off-by: Matthias Weisser <matthias.weisser@graf-syteco.de> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * video: mb862xx: replace printf with putsAnatolij Gustschin2009-07-17-10/+10
| | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * video: mb862xx: use macros instead of magic numbersAnatolij Gustschin2009-07-17-46/+119
| | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * video: mb862xx: fix coding style and remove dead codeAnatolij Gustschin2009-07-17-103/+114
| | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-microblazeWolfgang Denk2009-07-17-5/+3
|\ \
| * | microblaze: Remove ignored return type for __arch__swab16 functionMichal Simek2009-07-17-1/+3
| | | | | | | | | | | | | | | | | | This change remove compilation warnings. Signed-off-by: Michal Simek <monstr@monstr.eu>
| * | microblaze: Removed unused variablesMichal Simek2009-07-17-4/+0
| |/ | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
* | sata: namespace curr_device variableMike Frysinger2009-07-17-15/+15
| | | | | | | | | | | | | | | | | | | | | | The curr_device variable really should be namespaced with a "sata_" prefix since it is only used by the sata code. It also avoids random conflicts with other pieces of code (like cmd_mmc): common/libcommon.a(cmd_sata.o):(.data.curr_device+0x0): multiple definition of `curr_device' common/libcommon.a(cmd_mmc.o):(.data.curr_device+0x0): first defined here Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | cmd_mmc: make curr_device staticMike Frysinger2009-07-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | The curr_device variable isn't used outside of cmd_mmc, so mark it static to avoid conflicts with other pieces of code (like sata which also exports a curr_device). Otherwise we end up with stuff like: common/libcommon.a(cmd_sata.o):(.data.curr_device+0x0): multiple definition of `curr_device' common/libcommon.a(cmd_mmc.o):(.data.curr_device+0x0): first defined here Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | envcrc: add missing dependencies on env storageMike Frysinger2009-07-17-0/+4
| | | | | | | | | | | | | | When the envcrc building was made conditional, it missed a bunch of env storage types, so add all currently supported types. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | config.mk: Remove $(PCI_CLOCK) referenceShinya Kuribayashi2009-07-17-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit introduced $(PCI_CLOCK) reference so that we could tweak `PCI_66M' definition via an environment variable. > commit f046ccd15c8bc9613bfd72916b761a127d36e5c6 > Author: Eran Liberty <liberty@freescale.com> > Date: Thu Jul 28 10:08:46 2005 -0500 > > * Patch by Eran Liberty > Add support for the Freescale MPC8349ADS board. But I suggest a removal of it for the following reasons: * In 2006, MPC8349ADS was merged into MPC8349EMDS port, and it seems that MPC8349EMDS port is PCI_66M free. * OTOH, PCI_66M is used by MPC832XEMDS an MPC8360EMDS ports, but they don't need $(PCI_CLOCK) environment variable at all. PCI_66M is automatically configured via $(BOARD)_config names with the help of $(findstring _66_,$@). * Unfortunately $(PCI_CLOCK) has been undocumented anywhere, so only a few people know the existence of it these days. * Keep config.mk independent from $(BOARD) as much as possible. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* | fix: missing autoconfig.mk from general MakefileJean-Christophe PLAGNIOL-VILLARD2009-07-17-0/+1
|/ | | | | | | | | | | | | At the first run of make we generate the autoconf.mk and autoconf.mk.dep if not already the case and we currently include only to .dep In order to use these autogenerated values we need to include it also even if it's included in config.mk but it's done before their generation Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* mpc83xx: MPC837xEMDS: Use hwconfig instead of pci_external_arbiter variableAnton Vorontsov2009-07-16-2/+1
| | | | | | | | Since we have simple hwconfig interface now, we don't need pci_external_arbiter variable any longer. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* mpc83xx: MPC8315ERDB: Use hwconfig for board type selectionAnton Vorontsov2009-07-16-9/+6
| | | | | | | This patch simply converts the board to the hwconfig infrastructure. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* mpc83xx: MPC837XEMDS: Fixup eSDHC nodes in device treeAnton Vorontsov2009-07-16-13/+25
| | | | | | | | | | | fdt_fixup_esdhc() will either disable or enable eSDHC nodes, and also will fixup clock-frequency property. Plus, since DR USB and eSDHC are mutually exclusive, we should only configure the eSDHC if asked through hwconfig. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* mpc83xx: MPC837XERDB: Add support for FSL eSDHCAnton Vorontsov2009-07-16-0/+35
| | | | | | | | | | | | | | | | | | This patch adds support for eSDHC on MPC837XERDB boards. The WP switch doesn't seem to work on RDB boards though, the WP pin is always asserted (can see the pin state when it's in GPIO mode). FSL DR USB and FSL eSDHC are mutually exclusive because of pins multiplexing, so user should specify 'esdhc' or 'dr_usb' options in the hwconfig environment variable to choose between the devices. p.s. Now we're very close to a monitor len limit (196 bytes left using gcc-4.2.0), so also increase the monitor len by one sector (64 KB). Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* fsl_esdhc: Add device tree fixupsAnton Vorontsov2009-07-16-0/+27
| | | | | | | | | | | This patch implements fdt_fixup_esdhc() function that is used to fixup the device tree. The function adds status = "disabled" propery if esdhc pins muxed away, otherwise it fixups clock-frequency for esdhc nodes. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* Add simple hwconfig infrastructureAnton Vorontsov2009-07-16-0/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements simple hwconfig infrastructure: an interface for software knobs to control a hardware. This is very simple implementation, i.e. it is implemented via `hwconfig' environment variable. Later we could write some "hwconfig <enable|disable|list>" commands, ncurses interface for Award BIOS-like interface, and frame-buffer interface for AMI GUI[1] BIOS-like interface with mouse support[2]. Current implementation details/limitations: 1. Doesn't support options dependencies and mutual exclusion. We can implement this by integrating apt-get[3] into the u-boot. But I didn't bother yet. 2. Since we don't implement hwconfig command, i.e. we're working with the environement directly, there is no way to tell that toggling a particular option will need a reboot to take an effect. So, for now it's advised to always reboot the target after modifying hwconfig variable. 3. We support hwconfig options with arguments. For example, set hwconfig dr_usb:mode=peripheral,phy_type=ulpi That means: - dr_usb - enable Dual-Role USB controller; - dr_usb:mode=peripheral - USB in Function mode; - dr_usb:phy_type=ulpi - USB should work with ULPI PHYs; The purpose of this simple implementation is to define some internal API and then we can continue improving user experience by adding more mature interface, like hwconfig command with bells and whistles. Or not adding, if we feel that current interface fits its needs. [1] http://en.wikipedia.org/wiki/American_Megatrends [2] Regarding ncurses and GUI with mouse support -- I'm just kidding. [3] The comment regarding apt-get is also a joke, meaning that dependency tracking could be non-trivial. For example, for enabling HW feature X we may need to disable Y, and turn Z into reduced mode (like RMII-only interface for ethernet, no MII). It's quite trivial to implement simple cases though. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2009-07-16-2/+9
|\
| * mtd: cfi - if defined, use MAX_FLASH_BANKS_DETECT for static declarationsKim Phillips2009-07-16-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | a.k.a cfi_mtd.c does as cfi_flash.c does. This also prevents the TQM834x build from doing a: cfi_mtd.c:36: error: variably modified 'cfi_mtd_info' at file scope cfi_mtd.c:37: error: variably modified 'cfi_mtd_names' at file scope using gcc 4.4. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2009-07-16-11/+53
|\ \
| * | mpc83xx: increase MONITOR_LEN to offset growing painsKim Phillips2009-07-14-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Saving the environment leads to overwriting u-boot itself, bricking boards. Increase u-boot's image size so the environment base address doesn't end up overlapping u-boot text. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * | usb: mpx8349itx: added support of loading images from USB storage (MPH/DR)Valeriy Glushkov2009-07-14-2/+29
| | | | | | | | | | | | | | | Signed-off-by: Valeriy Glushkov <gvv@lstec.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * | usb: mpc834x: added support of the MPH USB controller in addition to the DR oneValeriy Glushkov2009-07-14-1/+12
| | | | | | | | | | | | | | | Signed-off-by: Valeriy Glushkov <gvv@lstec.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * | mpc83xx: set 64BIT_VSPRINTF for boards using nand_utilKim Phillips2009-07-14-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | When enabling NAND support for a board, one must also define CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c for correct output. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Dave Liu <daveliu@freescale.com> Cc: Ron Madrid <ron_madrid@sbcglobal.net> Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
* | Merge branch 'asm-generic' of git://git.denx.de/u-boot-microblazeWolfgang Denk2009-07-16-1052/+30
|\ \
| * | asm-generic: Consolidate errno.h to asm-generic/errno.hMichal Simek2009-07-09-1052/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch use blackfin errno.h implementation which correspond Linux kernel one. MIPS implemetation is different that's why I keep it. I removed ppc_error_no.h from Marvell boards which was the same too. I have got ack from ppc40x, blackfin, arm, coldfire and avr custodians. Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Michal Simek <monstr@monstr.eu>
* | | Improve U-Boot Porting Guide in the READMEJerry Van Baren2009-07-16-24/+36
| |/ |/| | | | | | | | | | | | | | | Update for... * BDI2000 -> BDI3000 (BDI2000 is obsolete). * Add a line to read the doc/README.* files * Fix coding standard violations Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
* | mpc5121ads: add JFFS2 and MTDPARTS support; adjust flash mapWolfgang Denk2009-07-14-8/+38
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | aria: add JFFS2 and MTDPARTS support; adjust flash mapWolfgang Denk2009-07-14-5/+34
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | aria: enable NAND flash supportWolfgang Denk2009-07-14-1/+24
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MPC512x: fix typo in comment listing the NAND driver nameWolfgang Denk2009-07-14-2/+2
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | mecp5123: cleanup - remove dead codeWolfgang Denk2009-07-14-7/+0
| | | | | | | | | | | | | | | | Remove dead code that was obviously a left-over from copy & paste. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | aria: adjust memory controller initializationWolfgang Denk2009-07-14-13/+72
| | | | | | | | | | | | Needed for Rev. 2 silicon at 400 MHz Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MPC512x: factor out common codeWolfgang Denk2009-07-14-335/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have 3 boards for the MPC512x it turns out that they all use the very same fixed_sdram() code. This patch factors out this common code into cpu/mpc512x/fixed_sdram.c and adds a new header file, include/asm-ppc/mpc512x.h, with some macros, inline functions and prototype definitions specific to MPC512x systems. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | mecp5123: fix build errorWolfgang Denk2009-07-14-8/+5
| | | | | | | | | | | | | | | | | | | | The mecp5123 board did not compile because the MSCAN Clock Control Registers were missing; these got added, but as an array instead of 4 individual registers. Adapt the code so it builds. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | MPC512x: Add MSCAN1...4 Clock Control RegistersWolfgang Denk2009-07-14-4/+5
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | MPC512x: enabling NAND support requires CONFIG_SYS_64BIT_VSPRINTFWolfgang Denk2009-07-14-0/+4
| | | | | | | | | | | | | | | | | | | | When enabling NAND support for a board, one must also define CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c for correct output. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2009-07-14-1915/+2617
|\ \
| * \ Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-618/+1474
| |\ \
| | * \ Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2009-07-13-618/+1474
| | |\ \
| | | * | versatile: update config and merge to cfi flash driverJean-Christophe PLAGNIOL-VILLARD2009-07-12-530/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Peter Pearse <peter.pearse@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com>
| | | * | versatile: specify the board type on the promptJean-Christophe PLAGNIOL-VILLARD2009-07-12-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Peter Pearse <peter.pearse@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com>
| | | * | at91: Introduction of at91sam9g10 SOC.Sedji Gaouaou2009-07-12-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91sam9g10 is an ARM 926ej-s SOC. It is an evolution of the at91sam9261 with a faster clock speed: 266/133MHz. Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
| | | * | at91: Introduction of at91sam9g45 SOC.Sedji Gaouaou2009-07-12-22/+1221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91sam9g45 series is an ARM 926ej-s SOC family clocked at 400/133MHz. It embeds USB high speed host and device, LCD, DDR2 RAM, and a full set of peripherals. The first board that embeds at91sam9g45 chip is the AT91SAM9G45-EKES. On the board you can find 2 USART, USB high speed, a 480*272 LG lcd, ethernet, gpio/joystick/buttons. Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
| | | * | pxa: fix CKEN_B register bitsDaniel Mack2009-07-12-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current defition for CKEN_B register bits is nonsense. Adding 32 to the shifted value is equal to '| (1 << 5)', and this bit is marked 'reserved' in the PXA docs. Signed-off-by: Daniel Mack <daniel@caiaq.de>
| | | * | pxa: add clock for system bus 2 arbiterDaniel Mack2009-07-12-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This clock is needed for systems using the USB2 device unit or the 2d graphics accelerator. Signed-off-by: Daniel Mack <daniel@caiaq.de>
| | | * | OMAP3 pandora: Fix CKE1 MUX setting to allow self-refreshGrazvydas Ignotas2009-07-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pandora is using both SDRC CSes. The MUX setting is needed for the second CS clock signal to allow the 2 RAM parts to be put in self-refresh correctly. Based on similar patch for beagle and overo by Jean Pihet and Steve Sakoman.
generated by cgit v1.1 at 2024-12-19 10:21:50 +0000