summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2009-07-23-25/+60
|\
| * xpedite5370: Enable NAND command supportPeter Tyser2009-07-22-1/+8
| | | | | | | | | | | | | | | | | | | | | | Use the MPC8572's eLBC to access 1 GB (or greater) onboard NAND flash via the 'nand' command. Previously, the XPedite5370's NAND chip selects were properly configured, but NAND support was not enabled. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * xes: Increase CONFIG_SYS_BOOTM_LEN to 16MBPeter Tyser2009-07-22-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Increasing CONFIG_SYS_BOOTM_LEN from 8 MB to 16 MB is necessary to support uncompressing images larger than 8 MB when using the bootm command. Note that recent Linux kernels for the 85xx and 86xx map greater than 16MB of memory on bootup, but we use 16MB to maintain compatibility with older Linux kernels for now. Signed-off-by: Nate Case <ncase@xes-inc.com> Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * xpedite5200,5370: Use buffered NOR flash writesPeter Tyser2009-07-22-0/+2
| | | | | | | | | | | | | | | | Buffered writes are possible on the XPedite5200 and XPedite5370 and greatly improve NOR flash write speeds Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 86xx: Rename ccsr_ddr's sdram_mode_1, sdram_cfg_1 fieldsPeter Tyser2009-07-22-2/+2
| | | | | | | | | | | | | | | | Rename sdram_mode_1 to sdram_mode and sdram_cfg_1 to sdram_cfg to match the 86xx user's manual and other Freescale architectures Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Add pci/pcie E1000 ethernet support for MPC8544DS and MPC8536 boardsRoy Zang2009-07-22-0/+2
| | | | | | | | | | Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Report which "bank" of NOR flash we are booting from on FSL boardsKumar Gala2009-07-22-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The p2020DS, MPC8536DS, MPC8572DS, MPC8544DS boards are capable of swizzling the upper address bits of the NOR flash we boot out of which creates the concept of "virtual" banks. This is useful in that we can flash a test of image of u-boot and reset to one of the virtual banks while still maintaining a working image in "bank 0". The PIXIS FPGA exposes registers on LBC which we can use to determine which "bank" we are booting out of (as well as setting which bank to boot out of). Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 86xx: Report which "bank" of NOR flash we are booting from on MPC8641HPCNKumar Gala2009-07-22-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPC8641HPCN board is capable of swizzling the upper address bit of the NOR flash we boot out of which creates the concept of "virtual" banks. This is useful in that we can flash a test of image of u-boot and reset to one of the virtual banks while still maintaining a working image in "bank 0". The PIXIS FPGA exposes registers on LBC which we can use to determine which "bank" we are booting out of (as well as setting which bank to boot out of). Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Bump up the BOOTMAP to 16M on FSL 85xx boardsKumar Gala2009-07-21-22/+22
| | | | | | | | | | | | | | | | We have always mapped at least 16M in the kernel and we have seen cases with new kernel features that a kernel image needs more than 8M of memory. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Refresh LZMA-lib to v4.65Luigi 'Comio' Mantellini2009-07-22-11/+18
| | | | | | | | Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
* | AT91: factor out ROUND() macroWolfgang Denk2009-07-22-10/+1
|/ | | | | | | | A large number of boards (all AT91 based) duplicated the ROUND() macro in their board specific config files. Add the definition to include/common.h and clean up the board config files. Signed-off-by: Wolfgang Denk <wd@denx.de>
* 83xx, kmeter: fix compile errorHeiko Schocher2009-07-21-1/+0
| | | | | | | | | | CONFIG_SYS_MALLOC_LEN is defined in the board config, and the keymile-common.h, which collects common options used by all keymile-boards. This results in a compile error when compiling the kmeter1 board. So remove this define in the board config file. Signed-off-by: Heiko Schocher <hs@denx.de>
* powerpc: updates for the keymile boardsHeiko Schocher2009-07-21-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CONFIG_SYS_MAX_I2C_BUS changed to 1 We use only one I2C hardwarecontroller on this boards, so change the CONFIG_SYS_MAX_I2C_BUS to 1. - common: dont print errormsg if second IVM Block lacks. - 82xx, mgcoge: fix double mtdpart entry in environment - 82xx, mgcoge: activate on second Flash the second bank. - common: CONFIG_ENV_SIZE 0x4000 for all keymile boards - common: Change malloc size to 1MByte for all Keymile boards We need a bigger malloc area for the environment support (128k) on some Keymile boards (kmeter1) and the upcoming UBI support. Change it to 1MB for all Keymile boards to be on the save side. Also define CONFIG_SYS_64BIT_VSPRINTF which is needed for UBI/UBIFS support. - Add UBI support to all Keymile boards - change manner of writing "/localbus/ranges" node instead of writting the complete "/localbus/ranges" node before booting Linux, only update the ranges entries which gets dynamical detected (size of flashes). This is needed, because keymile adds in the DTS "/localbus/ranges" node entries, which u-boot must not overwrite/delete. - kmeter, mgcoge: define 2 seperate regions needed for the Intel P30 chips The Intel P30 chip has 2 non-identical chips on one die, so we need to define 2 seperate regions that are scanned by physmap_of independantly. - kmeter1: Add MTD concat support to Keymile boards - 82xx, mgcoge: add "unlock=yes" to default environment - added CONFIG_MTD_DEVICE to get in sync with mainline code Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* Add unaligned.h for armSimon Kagstrom2009-07-20-0/+18
| | | | | | | | | This patch adds unaligned.h for ARM (needed to build with LZO compression). The file is taken from the linux kernel, but includes u-boot headers instead. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Acked-by: Stefan Roese <sr@denx.de>
* Remove last remanants of unused CONFIG_I2C_CMD_TREEPeter Tyser2009-07-20-4/+0
| | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-07-20-7/+8
|\
| * Blackfin: bf537-{minotaur,srv1}: do not hardcode CONFIG_ETHADDRMike Frysinger2009-07-18-6/+4
| | | | | | | | | | | | | | MAC addresses should not be hardcoded in boards to avoid random link level conflicts. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf533-stamp: back down SCLK a bitMike Frysinger2009-07-18-1/+1
| | | | | | | | | | | | | | | | | | While the 1.0 and 1.2 spin of the bf533-stamp boards can handle the higher SCLK speeds just fine, the 1.1 spin cannot due to the bugs introduced with the shortened SDRAM traces. So lower the SCLK speed down to a value that all three can handle. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: add os log functionsMike Frysinger2009-07-18-0/+3
| | | | | | | | | | | | | | | | Part of the mini Blackfin ABI with operating systems is that they can use 0x4f0-0x4f8 to pass log buffers to/from bootloaders. So add support to U-Boot for reading the log buffer. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2009-07-20-34/+42
|\ \
| * | mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCIKim Phillips2009-07-18-34/+42
| |/ | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | digsy mtc: Enable command line history.Grzegorz Bernacki2009-07-19-0/+1
| | | | | | | | Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
* | compiler.h: unify system ifdef cruft hereMike Frysinger2009-07-19-71/+138
| | | | | | | | | | | | | | | | | | | | | | Shove a lot of the HOSTCC and related #ifdef checking crap into the new compiler.h header so that we can keep all other headers nice and clean. Also introduce custom uswap functions so we don't have to rely on the non standard implementations that a host may (or may not in the case of OS X) provide. This allows mkimage to finally build cleanly on an OS X system. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | malloc.h: protect it against multiple includeJean-Christophe PLAGNIOL-VILLARD2009-07-19-1/+4
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Fix boards broken after removal of legacy NAND and DoC supportWolfgang Denk2009-07-19-4/+1
| | | | | | | | | | | | | | | | Commit 2419169f removed support for legacy NAND and disk on chip but missed to update the code for a few boards. This patch fixes the resulting build issues. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Canyonlands SATA harddisk driverKazuaki Ichinohe2009-07-19-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a SATA harddisk driver for the canyonlands. This patch is kernel driver's porting. This patch corresponded to not cmd_scsi but cmd_sata. This patch divided an unused member with ifndef __U_BOOT__ in the structure. [environment variable, boot script] setenv bootargs root=/dev/sda7 rw setenv bootargs ${bootargs} console=ttyS0,115200 ext2load sata 0:2 0x400000 /canyonlands/uImage ext2load sata 0:2 0x800000 /canyonlands/canyonlands.dtb fdt addr 0x800000 0x4000 bootm 0x400000 - 0x800000 If you drive SATA-2 disk on Canyonlands, you must change parts from PI2PCIE212 to PI2PCIE2212 on U25. We confirmed to boot by using following disks: 1.Vendor: Fujitsu Type: MHW2040BS 2.Vendor: Fujitsu Type: MHW2060BK 3.Vendor: HAGIWARA SYS-COM:HFD25S-032GT 4.Vendor: WesternDigital Type: WD3200BJKT (CONFIG_LBA48 required) 5.Vendor: WesternDigital Type: WD3200BEVT (CONFIG_LBA48 required) 6.Vendor: Hitachi Type: HTS543232L9A300 (CONFIG_LBA48 required) 7.Vendor: Seagate Type: ST31000333AS (CONFIG_LBA48 required) 8.Vendor: Transcend Type: TS32GSSD25S-M 9.Vendor: MTRON Type: MSD-SATA1525-016 Signed-off-by: Kazuaki Ichinohe <kazuichi at fsi.co.jp>
* | Add support for the Tundra TSI148 VME-bridgeReinhard Arlt2009-07-19-0/+218
|/ | | | | | | | | | From: Reinhard Arlt <reinhard.arlt@esd-electronics.com> This patch adds support for the Tundra TSI148 VME-bridge. It's used on the upcoming esd VME8349 board. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
* console: unify printing current devicesJean-Christophe PLAGNIOL-VILLARD2009-07-19-0/+1
| | | | | | Create stdio_print_current_devices() for this purpose Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2009-07-19-1122/+1
|\
| * Remove legacy NAND and disk on chip references from boards.Scott Wood2009-07-17-863/+0
| | | | | | | | Signed-off-by: Scott Wood <scottwood@freescale.com>
| * Remove legacy NAND and disk on chip code.Scott Wood2009-07-16-258/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Legacy NAND had been scheduled for removal. Any boards that use this were already not building in the previous release due to an #error. The disk on chip code in common/cmd_doc.c relies on legacy NAND, and it has also been removed. There is newer disk on chip code in drivers/mtd/nand; someone with access to hardware and sufficient time and motivation can try to get that working, but for now disk on chip is not supported. Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand: Change NAND_MAX_OOBSIZE to 218 as needed for some 4k page devicesStefan Roese2009-07-16-1/+1
| | | | | | | | | | | | | | | | | | This is needed for the MPC512x NAND driver (fsl_nfc_nand.c) which already defines such a 4k plus 218 bytes ECC layout. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* | NAND: Part 2: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...Wolfgang Denk2009-07-18-1/+46
| | | | | | | | | | | | | | | | | | | | | | Commit 8d2effea added a warning for configurations that use NAND without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but failed to fix the affected boards. This patch covers the non-PPC boards that were missed in the previous patch (commit 170c1972). Signed-off-by: Wolfgang Denk <wd@denx.de>
* | at91cap9adk: fix #ifdef/#endif pairingWolfgang Denk2009-07-18-1/+1
| | | | | | | | | | | | The #ifdef/#endif pairing in this file was obviously messed up. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MPC837XERDB: fix warning: "CONFIG_SYS_MONITOR_LEN" redefinedWolfgang Denk2009-07-18-1/+0
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | 8xxx: fix warning: implicit declaration of function 'uec_standard_init'Wolfgang Denk2009-07-18-0/+1
| | | | | | | | | | | | | | | | Commit 8e55258f created function uec_standard_init() to initialize all UEC interfaces for 83xx and 85xx but failed to provide a prototype for it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | NAND: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...Wolfgang Denk2009-07-18-2/+34
| | | | | | | | | | | | | | | | Commit 8d2effea added a warning for configurations that use NAND without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but failed to fix the affected boards. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | stdio/device: rework function naming conventionJean-Christophe PLAGNIOL-VILLARD2009-07-18-64/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the console API uses the following naming convention: ======Extract====== typedef struct device_t; int device_register (device_t * dev); int devices_init (void); int device_deregister(char *devname); struct list_head* device_get_list(void); device_t* device_get_by_name(char* name); device_t* device_clone(device_t *dev); ======= which is too generic and confusing. Instead of using device_XX and device_t we change this into stdio_XX and stdio_dev This will also allow to add later a generic device mechanism in order to have support for multiple devices and driver instances. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | ppc: Fix compile error for boards with CONFIG_DDR_ECCPeter Tyser2009-07-17-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC defined and resulted in errors such as: Configuring for canyonlands board... fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your processor" make[1]: *** No rule to make target `.depend', needed by `libdma.a'. Stop. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | 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-0/+69
|\ \
| * | video: mb862xx: use macros instead of magic numbersAnatolij Gustschin2009-07-17-0/+69
| |/ | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | 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>
* mpc83xx: MPC8315ERDB: Use hwconfig for board type selectionAnton Vorontsov2009-07-16-0/+1
| | | | | | | 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-0/+1
| | | | | | | | | | | 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/+17
| | | | | | | | | | | | | | | | | | 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/+8
| | | | | | | | | | | 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/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-mpc83xxWolfgang Denk2009-07-16-11/+51
|\
| * 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>