summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge remote branch 'u-boot-avr32/master'Wolfgang Denk2008-06-03-284/+477
|\
| * avr32: Rework SDRAM initialization codeHaavard Skinnemoen2008-05-27-44/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the SDRAM initialization and related code a bit, and allows faster booting. * Add definitions for EBI and internal SRAM to asm/arch/memory-map.h * Remove memory test from sdram_init() and make caller responsible for verifying the SDRAM and determining its size. * Remove base_address member from struct sdram_config (was sdram_info) * Add data_bits member to struct sdram_config and kill CFG_SDRAM_16BIT * Add support for a common STK1000 hack: 16MB SDRAM instead of 8. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Rename pm_init() as clk_init() and make SoC-specificHaavard Skinnemoen2008-05-27-0/+2
| | | | | | | | | | | | | | | | pm_init() was always more about clock initialization than anything else. Dealing with PLLs, clock gating and such is also inherently SoC-specific, so move it into a SoC-specific directory. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Clean up the HMATRIX codeHaavard Skinnemoen2008-05-27-232/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | Rework the HMATRIX configuration interface so that it becomes easier to configure the HMATRIX for boards with special needs, and add new parts. The HMATRIX header file has been split into a general, chip-independent part with register definitions, etc. and a chip-specific part with SFR bitfield definitions and master/slave identifiers. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Add support for the ATSTK1006 boardHaavard Skinnemoen2008-05-27-0/+202
| | | | | | | | | | | | | | This is a replacement for ATSTK1002 with 64MB SDRAM and NAND flash on board. It's currently in production and will be available soon. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Get rid of the .flashprog sectionHaavard Skinnemoen2008-05-27-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | The .flashprog section was only needed back when we were running directly from flash, and it's even more useless on NGW100 since it uses the CFI flash driver which never used this workaround in the first place. Remove it on STK1000 as well, and get rid of all the associated code and annotations. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Use correct condition around macb clock accessorsHaavard Skinnemoen2008-05-27-1/+1
| | | | | | | | | | | | | | get_macb_pclk_rate() and get_macb_hclk_rate() should be available when the chip has a MACB controller, not when it has a USART. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: stk1002 and ngw100 convergenceDavid Brownell2008-05-27-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Make STK1002 and NGW100 boards act more alike: - STK boards can use as many arguments as NGW - STK boards don't need to manage FPGAs either - NGW commands should match STK ones Also spell U-Boot right in prompts for STK1002 and NGW100. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> [haavard.skinnemoen@atmel.com: update STK100[34] as well] Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
* | Merge remote branch 'u-boot-nand-flash/master'Wolfgang Denk2008-06-03-0/+9
|\ \
| * | Make onenand_uboot.h self-sufficient.Scott Wood2008-05-28-0/+5
| | | | | | | | | | | | | | | | | | Don't assume types are provided by previously included headers. Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | NAND: Provide a sane default for NAND_MAX_CHIPS.Scott Wood2008-05-28-0/+4
| |/ | | | | | | | | | | | | This allows the header to be included regardless of whether a board's config file provides NAND-related defininitions. Signed-off-by: Scott Wood <scottwood@freescale.com>
* | Merge remote branch 'u-boot-mips/master'Wolfgang Denk2008-06-03-294/+1254
|\ \
| * | mips: Add an 'include/asm/errno.h', like all other architecturesJason McMullan2008-05-30-0/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | All other u-boot architectures have an include/asm/errno.h, so this change adds it to the mips include/asm-mips headers also. Stolen from Linux 2.6.25. Signed-off-by: Jason McMullan <mcmullan@netapp.com>
| * | [MIPS] <asm/mipsregs.h>: Update coprocessor register access macrosShinya Kuribayashi2008-05-30-125/+825
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | [MIPS] <asm/mipsregs.h>: Update register / bit field definitionsShinya Kuribayashi2008-05-30-111/+225
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | [MIPS] <asm/mipsregs.h>: CodinygStyle cleanupsShinya Kuribayashi2008-05-30-140/+143
| |/ | | | | | | | | | | No functional changes. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | Merge remote branch 'u-boot-ppc4xx/master'Wolfgang Denk2008-06-02-0/+298
|\ \ | |/ |/|
| * Merge branch 'quad100hd'Stefan Roese2008-05-21-0/+298
| |\
| | * ppc4xx: QUAD100HD: Allow the environment to be put into flash.Gary Jennejohn2008-05-14-4/+9
| | | | | | | | | | | | | | | | | | | | | After moving TEXT_BASE the value for CFG_ENV_ADDR was incorrect. Also use a redundant environment. Signed-off-by: Gary Jennejohn <garyj@denx.de>
| | * ppc4xx: Add the Harris QUAD100HD AMCC 405EP-based boardGary Jennejohn2008-05-08-0/+293
| | | | | | | | | | | | | | | Signed-off-by: Gary Jennejohn <garyj@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-05-27-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | USB: add support for multiple PCI OHCI controllersSergei Poselenov2008-05-22-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new configuration variable CONFIG_PCI_OHCI_DEVNO. In case of several PCI USB controllers on a board this variable specifys which controller to use. Also add USB support for sokrates board. See doc/README.generic_usb_ohci for details. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
* | | | Socrates: Added USB support.Sergei Poselenov2008-05-27-9/+12
| | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | | Socrates: add support for DS75 Digital Thermo Sensor on I2C bus.Sergei Poselenov2008-05-27-1/+11
| | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | | Socrates: Config file cleanup.Sergei Poselenov2008-05-27-3/+4
|/ / / | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | Merge branch 'socrates' of /home/wd/git/u-boot/projectsWolfgang Denk2008-05-21-0/+402
|\ \ \
| * | | socrates: fix second TSEC configuration (it is actually TSEC3)Sergei Poselenov2008-05-20-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * | | socrates: changes to support FDTSergei Poselenov2008-05-20-33/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Initial support for "Socrates" boardSergei Poselenov2008-05-20-0/+410
| |/ / | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | Merge branch 'lwmon5' of /home/wd/git/u-boot/projectsWolfgang Denk2008-05-21-3/+34
|\ \ \
| * | | POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) ↵Yuri Tikhonov2008-05-20-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the GD_FLG_LOGINIT flag in gd->flags. This way we become able to utilize the full post_log_word for POST activities (overwise, POST ECC, which has 0x8000 ID, could be erroneously treated as started in post_output_backlog() even if there was actually no POST ECC run (because of OCM POST failure, for example). Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | | POST: add POST_STOP flagYuri Tikhonov2008-05-20-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't run futher tests in case of a test fails that is marked as POST_STOP. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | | POST: switch CFG_POST_OCM with CFG_POST_CODEC (workaround)Yuri Tikhonov2008-05-20-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch the OCM testid with the codec one. The reason is that current implementation requires the POST_ROM testid to fit into lower 16 bits, and the codec test will never run with POST_ROM hopefully. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
| * | | lwmon5: enable OCM post test on lwmon5 boardYuri Tikhonov2008-05-20-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Ilya Yanok <yanok@emcraft.com>
| * | | POST: OCM test added.Yuri Tikhonov2008-05-20-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Added OCM test to POST layer. This version runs before all other tests but doesn't yet interrupt post sequence on failure. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
* | | Adding DIU support for Freescale 5121ADSYork Sun2008-05-21-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | Add DIU and cfb console support to FSL 5121ADS board. Use #define CONFIG_VIDEO in config file to enable fb console. Signed-off-by: York Sun <yorksun@freescale.com>
* | | Big white-space cleanup.Wolfgang Denk2008-05-21-6218/+6212
|/ / | | | | | | | | | | | | | | | | | | | | This commit gets rid of a huge amount of silly white-space issues. Especially, all sequences of SPACEs followed by TAB characters get removed (unless they appear in print statements). Also remove all embedded "vim:" and "vi:" statements which hide indentation problems. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Fix 8313ERDB board configurationYork Sun2008-05-19-8/+6
| | | | | | | | | | | | | | | | | | Change LCRR clock ratio from 2 to 4 to commodate VSC7385. Correct TSEC1 vs TSEC2 assignment. Define ETHADDR and ETH1ADDR always. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Timur Tabi <timur@freescale.com>
* | environment: fix bug introduced by commit a8409f4f1ac8Wolfgang Denk2008-05-14-2/+2
| | | | | | | | | | | | env_get_char is not a function, but a pointer to one. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-05-14-4/+8
|\ \
| * | ppc4xx: Add 405EX(r) revision C PVR definitions and detection codeStefan Roese2008-05-13-4/+8
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | | environment: cleanup prototype declarations of env functions.Wolfgang Denk2008-05-14-0/+10
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Makefile: fix "error: version_autogenerated.h: No such file or directory"Wolfgang Denk2008-05-13-0/+2
|/ / | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-05-12-11/+19
|\ \
| * | ppc4xx: Kilauea: Add CONFIG_BOOTP_SUBNETMASK to Kilauea board configMarkus Klotzbücher2008-05-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using dhcp/bootp the "netmask" environment variable is not set because CONFIG_BOOTP_SUBNETMASK is not defined. But usually this is desireable, so the following patch adds this this option to the board config. Signed-off-by: Markus Klotzbuecher <mk@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Update Makalu defconfig to use device-tree booting as defaultStefan Roese2008-05-10-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reworks the default environment on Makalu. Now "net_nfs" for example uses the device-tree style booting formerly know as "net_nfs_fdt". Also the addresses in RAM were changed because of the new image booting support, which check for image overwriting. So the addresses needed to get adjusted. Signed-off-by: Stefan Roese <sr@denx.de>
* | | Revert "Avoid initrd and logbuffer area overlaps"Wolfgang Denk2008-05-12-1/+0
| | | | | | | | | | | | | | | This reverts commit 1b5605ca57fbb364f4d78eeee28b974ed875e888 which breaks building on all PPC boards that don't use a log buffer.
* | | Revert "Change env_get_char from a global function ptr to a function."Wolfgang Denk2008-05-12-1/+0
|/ / | | | | | | | | This reverts commit c0559be371b2a64b1a817088c3308688e2182f93 which is known to break booting from dataflash and NAND.
* | PPC: fix map_physmem build warningBecky Bruce2008-05-10-1/+1
| | | | | | | | | | | | | | map_physmem currently generates a warning when CONFIG_PHYS_64BIT is enabled. This quiets the warning. Signed-off-by: Becky Bruce <Becky.Bruce@freescale.com>
* | Update pci code to use phys_addr_tBecky Bruce2008-05-10-5/+5
| | | | | | | | | | | | | | | | Physical addrs need to be represented by phys_addr_t, not unsigned long. Otherwise, systems that use CONFIG_PHYS_64BIT are going to fail mightily. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>