summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* ppc4xx: Unify AMCC's board config files (part 1/3)Stefan Roese2008-06-06-0/+259
| | | | | | | | | | | | | | | This patch series unifies the AMCC eval board ports by introducing a common include header for all AMCC eval boards: include/configs/amcc-common.h This header now includes all common configuration options/defines which are removed from the board specific headers. The reason for this is ease of maintenance and unified look and feel of all AMCC boards. Signed-off-by: Stefan Roese <sr@denx.de>
* ppc4xx: Cleanup CPCI405 variant's config fileMatthias Fuchs2008-06-03-93/+0
| | | | | | | | This patch removes some dead code from CPCI405 board's config files. JFFS2 support is also removed. It's not used and CPCI4052 does not build anymore without some size reduction. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* ppc4xx: Remove implementations of testdram()Stefan Roese2008-06-03-8/+0
| | | | | | | This patch removes the used testdram() implementations of the board that are maintained by myself. Signed-off-by: Stefan Roese <sr@denx.de>
* ppc4xx: Change Kilauea to use the common DDR2 init functionStefan Roese2008-06-03-4/+4
| | | | | | | | | | | This patch changes the kilauea and kilauea_nand (for NAND booting) board port to not use a board specific DDR2 init routine anymore. Now the common code from cpu/ppc4xx is used. Thanks to Grant Erickson for all his basic work on this 405EX early bootup. Signed-off-by: Stefan Roese <sr@denx.de>
* ppc4xx: Consolidate PPC4xx SDRAM/DDR/DDR2 defines, part2Stefan Roese2008-06-03-0/+1156
| | | | | | | This patch now adds a new header file (asm-ppc/ppc4xx-sdram.h) for all ppc4xx related SDRAM/DDR/DDR2 controller defines. Signed-off-by: Stefan Roese <sr@denx.de>
* ppc4xx: Consolidate PPC4xx SDRAM/DDR/DDR2 defines, part1Stefan Roese2008-06-03-1310/+25
| | | | | | | | | | | | | | | | | | | This patch removes all SDRAM related defines from the PPC4xx headers ppc405.h and ppc440.h. This is needed since now some 405 PPC's use the same SDRAM controller as 440 systems do (like 405EX and 440SP). It also introduces new defines for the equipped SDRAM controller based on which PPC variant is used. There new defines are: used on 405GR/CR/EP and some Xilinx Virtex boards. used on 440GP/GX/EP/GR. used on 440EPx/GRx. used on 405EX/r/440SP/SPe/460EX/GT. Signed-off-by: Stefan Roese <sr@denx.de>
* ppc4xx: Enable Primordial Stack for 40x and Unify ECC HandlingGrant Erickson2008-06-03-27/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch (Part 2 of 2): * Rolls up a suite of changes to enable correct primordial stack and global data handling when the data cache is used for such a purpose for PPC40x-variants (i.e. CFG_INIT_DCACHE_CS). * Related to the first, unifies DDR2 SDRAM and ECC initialization by eliminating redundant ECC initialization implementations and moving redundant SDRAM initialization out of board code into shared 4xx code. * Enables MCSR visibility on the 405EX(r). * Enables the use of the data cache for initial RAM on both AMCC's Kilauea and Makalu and removes a redundant CFG_POST_MEMORY flag from each board's CONFIG_POST value. - Removed, per Stefan Roese's request, defunct memory.c file for Makalu and rolled sdram_init from it into makalu.c. With respect to the 4xx DDR initialization and ECC unification, there is certainly more work that can and should be done (file renaming, etc.). However, that can be handled at a later date on a second or third pass. As it stands, this patch moves things forward in an incremental yet positive way for those platforms that utilize this code and the features associated with it. Signed-off-by: Grant Erickson <gerickson@nuovations.com> Signed-off-by: Stefan Roese <sr@denx.de>
* ppc4xx: Enable Primordial Stack for 40x and Unify ECC HandlingGrant Erickson2008-06-03-15/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch (Part 1 of 2): * Rolls up a suite of changes to enable correct primordial stack and global data handling when the data cache is used for such a purpose for PPC40x-variants (i.e. CFG_INIT_DCACHE_CS). * Related to the first, unifies DDR2 SDRAM and ECC initialization by eliminating redundant ECC initialization implementations and moving redundant SDRAM initialization out of board code into shared 4xx code. * Enables MCSR visibility on the 405EX(r). * Enables the use of the data cache for initial RAM on both AMCC's Kilauea and Makalu and removes a redundant CFG_POST_MEMORY flag from each board's CONFIG_POST value. - Removed, per Stefan Roese's request, defunct memory.c file for Makalu and rolled sdram_init from it into makalu.c. With respect to the 4xx DDR initialization and ECC unification, there is certainly more work that can and should be done (file renaming, etc.). However, that can be handled at a later date on a second or third pass. As it stands, this patch moves things forward in an incremental yet positive way for those platforms that utilize this code and the features associated with it. Signed-off-by: Grant Erickson <gerickson@nuovations.com> Signed-off-by: Stefan Roese <sr@denx.de>
* Merge branch 'master' of /home/stefan/git/u-boot/u-bootStefan Roese2008-06-03-6240/+6702
|\
| * 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>
* | 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>
* | 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>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xxWolfgang Denk2008-05-10-0/+10
|\ \
| * | mpc83xx: system performance settings for MPC8349EMDS.Lee Nipper2008-05-06-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | These same settings are used on MPC8349ITX, and improve performance on MPC8349EMDS. Signed-off-by: Lee Nipper <lee.nipper@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | | Fix @ -> <at> substitutionStelian Pop2008-05-10-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When applying the AT91CAP9 patches upstream, something transformed the '@' character into the ' <at> ' sequence. The patch below restores the original form in all the places where it has been modified (the AT91CAP9 files, the AT91SAM9260 files which were copied from AT91CAP9, and a couple of other files where the ' <at> ' sequence was present). Signed-off-by: Stelian Pop <stelian@popies.net>
* | | Update origin and copyright information in arch-at91sam9 header filesStelian Pop2008-05-10-152/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing the AT91CAP9/AT91SAM9 port, a number of header files were copied from the Linux kernel sources. This patch explicitly specifies this origin for all the copied headers, and for those missing copyright information, adds it. Additionaly, the header file 'at91sam926x_mc.h' has been superceeded in the latest kernel sources by 'at91sam9_smc.h'. The copyright information has been confirmed by the AT91 Linux kernel maintainer, Andrew Victor <avictor.za@gmail.com>. Signed-off-by: Stelian Pop <stelian@popies.net>
* | | mx31ads: fix 32kHz clock handlingGuennadi Liakhovetski2008-05-10-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to schematics and to RedBoot sources, the MX31ADS uses a 32768Hz oscillator as a SKIL source. Fix previously wrongly assumed 32000Hz value. Also fix a typo when verifying a jumper configuration. While at it, make two needlessly global functions static. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | | Avoid initrd and logbuffer area overlapsMarian Balakowicz2008-05-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add logbuffer to reserved LMB areas to prevent initrd allocation from overlaping with it. Make sure to use correct logbuffer base address. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2008-05-09-6/+40
|\ \ \ | |_|/ |/| |
| * | microblaze: Repare intc handlingMichal Simek2008-05-09-4/+38
| | | | | | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>