Commit graph

1223 commits

Author SHA1 Message Date
Aubrey.Li
3f0606ad0b [Blackfin]PATCH-1/2]: Remove obsolete blackfin port and add bf533 platform support 2007-03-09 13:38:44 +08:00
Wolfgang Denk
cf3b41e0c1 Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx 2007-03-08 23:06:12 +01:00
Stefan Roese
992423ab43 ppc4xx: Fix file mode of sequoia.c
Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-08 23:00:08 +01:00
John Otken john@softadvances.com
8ce16f55c7 ppc4xx: Clear Sequoia/Rainier security engine reset bits
Signed-off-by: John Otken john@softadvances.com <john@softadvances.com>
2007-03-08 22:49:22 +01:00
Wolfgang Denk
37896293bc Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx 2007-03-08 22:42:44 +01:00
Matthias Fuchs
f9fc6a5852 fixed ethernet phy configuration for plu405 board
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
2007-03-08 22:14:47 +01:00
Wolfgang Denk
dd0321f5f8 Merge with /home/hs/jupiter/u-boot 2007-03-08 21:45:04 +01:00
Wolfgang Denk
efa013df33 Merge with /home/git/u-boot 2007-03-08 11:41:19 +01:00
Wolfgang Denk
35ded29fd9 Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx 2007-03-08 11:38:58 +01:00
Wolfgang Denk
d8be57669b Merge with /home/git/u-boot 2007-03-08 11:34:24 +01:00
Stefan Roese
cd84528f20 Merge with /home/stefan/git/u-boot/yucca-ddr2 2007-03-08 10:32:45 +01:00
Stefan Roese
00cdb4ce5e [PATCH] Update AMCC Luan 440SP eval board support
The AMCC Luan now uses the common 440SP(e) DDR SPD code for DDR
inititializition. This includes DDR auto calibration and support
for different DIMM modules, instead of the fixed setup used in
the earlier version.

This patch also enables the cache in FLASH for the startup
phase of U-Boot (while running from FLASH). After relocating to
SDRAM the cache is disabled again. This will speed up the boot
process, especially the SDRAM setup, since there are some loops
for memory testing (auto calibration).

Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-08 10:13:16 +01:00
Stefan Roese
2f5df47351 [PATCH] Update AMCC Yucca 440SPe eval board support
The AMCC Yucca now uses the common 440SP(e) DDR SPD code for DDR
inititializition. This includes DDR auto calibration and support
for different DIMM modules, instead of the fixed setup used in
the earlier version.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-08 10:10:18 +01:00
Stefan Roese
2721a68a9e ppc4xx: Small AMCC Katmai 440SPe update
Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-08 10:07:18 +01:00
Wolfgang Denk
46270c2851 Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx 2007-03-07 16:50:34 +01:00
Stefan Roese
fa1aef15bc [PATCH] Use dynamic SDRAM TLB setup on AMCC Ocotea eval board
Define CONFIG_PROG_SDRAM_TLB so that the TLB entries for the
DDR memory are dynamically programmed matching the total size
of the equipped memory (DIMM modules).

Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-07 16:43:00 +01:00
Wolfgang Denk
3921843398 UC101: fix compiler warnings 2007-03-07 16:33:44 +01:00
Wolfgang Denk
8d7e273222 HMI1001: fix build error, cleanup compiler warnings. 2007-03-07 16:19:46 +01:00
Stefan Roese
07b7b0037a [PATCH] Speed optimization of AMCC Sequoia/Rainier DDR2 setup
As provided by the AMCC applications team, this patch optimizes the
DDR2 setup for 166MHz bus speed. The values provided are also save
to use on a "normal" 133MHz PLB bus system. Only the refresh counter
setup has to be adjusted as done in this patch.

For this the NAND booting version had to include the "speed.c" file
from the cpu/ppc4xx directory. With this addition the NAND SPL image
will just fit into the 4kbytes of program space. gcc version 4.x as
provided with ELDK 4.x is needed to generate this optimized code.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-06 07:47:04 +01:00
Wolfgang Denk
647d3c3eed Some code cleanup. 2007-03-04 01:36:05 +01:00
Wolfgang Denk
b24444f1b3 Merge with http://opensource.freescale.com/pub/scm/u-boot-7448hpc2.git 2007-03-04 01:17:20 +01:00
Kim Phillips
781e026c8a mpc83xx: fix implicit declaration of function 'ft_get_prop' warnings
(cherry picked from c5bf13b02284c3204a723566a9bab700e5059659 commit)
2007-03-02 14:08:26 -06:00
Kim Phillips
3fc0bd1591 mpc83xx: Disable G1TXCLK, G2TXCLK h/w buffers
Disable G1TXCLK, G2TXCLK h/w buffers. This patch
fixes a networking timeout issue with MPC8360EA (Rev.2) PBs.

Verified on Rev. 1.1, Rev. 1.2, and Rev. 2.0 boards.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Emilian Medve <Emilian.Medve@freescale.com>
2007-03-02 11:05:54 -06:00
Xie Xiaobo
d61853cf24 mpc83xx: Add DDR2 controller fixed/SPD Init for MPC83xx
The code supply fixed and SPD initialization for MPC83xx DDR2 Controller.
it pass DDR/DDR2 compliance tests.

Signed-off-by: Xie Xiaobo <X.Xie@freescale.com>
2007-03-02 11:05:54 -06:00
Timur Tabi
7a78f148d6 mpc83xx: Add support for the MPC8349E-mITX-GP
Add support for the MPC8349E-mITX-GP, a stripped-down version of the
MPC8349E-mITX.  Bonus features include support for low-boot (BMS bit in
HRCW is 0) for the ITX and a README for the ITX and the ITX-GP.

Signed-off-by: Timur Tabi <timur@freescale.com>
2007-03-02 11:05:54 -06:00
Timur Tabi
fab16807ad mpc83xx: Delete sdram_init() for MPC8349E-mITX
There is no SDRAM on any of the 8349 ITX variants, so function sdram_init()
never does anything.  This patch deletes it.

Signed-off-by: Timur Tabi <timur@freescale.com>
2007-03-02 11:05:54 -06:00
Paul Gortmaker
91e2576977 mpc83xx: U-Boot support for Wind River SBC8349
I've redone the SBC8349 support to match git-current, which
incorporates all the MPC834x updates from Freescale since the 1.1.6
release,  including the DDR changes.

I've kept all the SBC8349 files as parallel as possible to the
MPC8349EMDS ones for ease of maintenance and to allow for easy
inspection of what was changed to support this board.  Hence the SBC8349
U-Boot has FDT support and everything else that the MPC8349EMDS has.

Fortunately the Freescale updates added support for boards using CS0,
but I had to change spd_sdram.c to allow for board specific settings for
the sdram_clk_cntl (it is/was hard coded to zero, and that remains the
default if the board doesn't specify a value.)

Hopefully this should be mergeable as-is and require no whitespace
cleanups or similar, but if something doesn't measure up then let me
know and I'll fix it.

Thanks,
Paul.
2007-03-02 11:05:53 -06:00
Sam Song
05031db456 mpc83xx: Remove a redundant semicolon in mpc8349itx.c
A redundant semicolon existed in mpc8349itx.c
should be removed.

Signed-off-by: Sam Song <samsongshu@yahoo.com.cn>
2007-03-02 11:05:53 -06:00
Dave Liu
24c3aca3f1 mpc83xx: Add support for the MPC832XEMDS board
This patch supports DUART, ETH3/4 and PCI etc.

Signed-off-by: Dave Liu <daveliu@freescale.com>
2007-03-02 11:05:53 -06:00
Dave Liu
e080313c32 mpc83xx: streamline the 83xx immr head file
For better format and style, I streamlined the 83xx head files,
including immap_83xx.h and mpc83xx.h. In the old head files, 1)
duplicated macro definition appear in the both files; 2) the structure
of QE immr is duplicated in the immap_83xx.h and immap_qe.h; 3) The
macro definition put inside the each structure. So, I cleaned up the
structure of QE immr from immap_83xx.h, deleted the duplicated stuff and
moved the macro definition to mpc83xx.h, Just like MPC8260.

CHANGELOG

*streamline the 83xx immr head file

Signed-off-by: Dave Liu <daveliu@freescale.com>
2007-03-02 11:05:53 -06:00
Stefan Roese
fdd1d6dcc9 Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr 2007-03-01 21:16:58 +01:00
Stefan Roese
c8556d0e0b Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-03-01 21:16:02 +01:00
Stefan Roese
ba58e4c9a9 [PATCH] Update AMCC Katmai 440SPe eval board support
This patch updates the recently added Katmai board support. The biggest
change is the support of ECC DIMM modules in the 440SP(e) SPD DDR2
driver.

Please note, that still some problems are left with some memory
configurations. See the driver for more details.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-01 21:11:36 +01:00
roy zang
00b574bdc8 Merge branch 'master' into hpc2
Conflicts:

	drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2007-02-28 16:46:48 +08:00
Sergei Poselenov
e344568b1b MCC200: Fixes for update procedure
- fix logic error in image type handling
- make sure file system images (cramfs etc.) get stored in flash
  with image header stripped so they can be mounted through MTD
2007-02-28 00:54:18 +01:00
Wolfgang Denk
743571145b Minor code cleanup. 2007-02-27 14:26:04 +01:00
Sergei Poselenov
638dd1458b MCC200 update - add LCD Progress Indicator 2007-02-27 14:17:09 +01:00
Stefan Roese
eb41db6d22 Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-02-21 12:54:04 +01:00
Stefan Roese
958de0e22e Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr 2007-02-21 12:53:28 +01:00
Stefan Roese
874bb7b88f [PATCH] Clean up Katmai (440SPe) linker script
Signed-off-by: Stefan Roese <sr@denx.de>
2007-02-20 13:15:40 +01:00
Stefan Roese
90b0cf47eb Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-02-20 10:58:04 +01:00
Stefan Roese
4745acaa1a [PATCH] Add support for the AMCC Katmai (440SPe) eval board
Signed-off-by: Stefan Roese <sr@denx.de>
2007-02-20 10:57:08 +01:00
Stefan Roese
79b2d0bb2e [PATCH] PPC4xx: Add support for multiple I2C busses
This patch adds support for multiple I2C busses on the PPC4xx
platforms. Define CONFIG_I2C_MULTI_BUS in the board config file
to make use of this feature.

It also merges the 405 and 440 i2c header files into one common
file 4xx_i2c.h.

Also the 4xx i2c reset procedure is reworked since I experienced
some problems with the first access on the 440SPe Katmai board.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-02-20 10:27:08 +01:00
Grant Likely
99b0f0fd3f [PATCH 2_4] Use config.h, not xparameters.h, for xilinx targets
Change the xilinx device drivers and board code to include config.h
instead of xparameters.h directly.  config.h always includes the
correct xparameters file.  This change reduces the posibility of
including the wrong file when adding a new xilinx board port

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-02-20 09:04:52 +01:00
Grant Likely
735dd97b1b [PATCH 1_4] Merge common get_dev() routines for block devices
Each of the filesystem drivers duplicate the get_dev routine.  This change
merges them into a single function in part.c

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-02-20 09:04:34 +01:00
Wolfgang Denk
f5fcc3c20b MCC200: Software Updater: allow both "ramdisk" and "filesystem" types
as root file system images.
2007-02-19 23:09:51 +01:00
Sergei Poselenov
489c696ae7 MCC200: Extensions to Software Update Mechanism
Update / extend Software Update Mechanism for MCC200 board:

- Add support for rootfs image added. The environment variables
  "rootfs_st" and "rootfs_nd" can be used to override the default
  values of the image start and end.
- Remove excessive key check code.
- Code cleanup.
2007-02-19 15:14:53 +01:00
Wolfgang Denk
bc2b9c3383 Merge with /home/tur/git/u-boot#motionpro 2007-02-16 23:44:55 +01:00
Heiko Schocher
2605e90bf6 [PATCH] Added support for the jupiter board.
Signed-off-by: Heiko Schocher <hs@denx.de>
2007-02-16 07:57:42 +01:00
Gary Jennejohn
497d012e5b LPC2292: patch from Siemens. 2007-02-12 13:11:50 +01:00
roy zang
30bddf2c46 Merge branch 'master' into hpc2 2007-02-12 11:24:27 +08:00
Stefan Roese
b0b1a920ae [PATCH] Add missing p3mx.h file to repository (ups)
Signed-off-by: Stefan Roese <sr@denx.de>
2007-02-10 08:49:31 +01:00
Bartlomiej Sieka
53d4a4983f [Motion-PRO] Preliminary support for the Motion-PRO board. 2007-02-09 10:45:42 +01:00
Stefan Roese
d5ea287b02 [PATCH] Update esd cpci5200 files
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
2007-01-31 16:38:04 +01:00
Stefan Roese
8b7d1f0ab7 [PATCH] Add support for esd mecp5200 board
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
2007-01-31 16:37:34 +01:00
Wolfgang Denk
c105f4c660 Merge with /home/sr/git/u-boot/denx-merge-sr 2007-01-30 17:32:15 +01:00
Stefan Roese
700200c67e [PATCH] Merge Yosemite & Yellowstone board ports
Now the AMCC eval boards Yosemite (440EP) and Yellowstone (440GR)
share one config file and all board specific files. This way we
don't have to maintain two different sets of files for nearly
identical boards.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-30 17:04:19 +01:00
roy zang
c1c52e38d3 Merge branch 'master' into hpc2 2007-01-30 16:43:18 +08:00
Wolfgang Denk
f8db84f132 LPC2292 SODIMM port coding style cleanup. 2007-01-30 00:50:40 +01:00
Gary Jennejohn
6bd2447ee4 Add port for the lpc2292sodimm evaluation board from EmbeddedArtists 2007-01-24 12:16:56 +01:00
Wolfgang Denk
b78bb469f5 Merge with /home/tur/proj/idmr/u-boot 2007-01-24 10:26:47 +01:00
Bartlomiej Sieka
f7db33101f [iDMR] Flash driver on initialisation write-protects some sectors,
currently sectors 0-3. Sector 3 does not need to be protected, though
(U-boot occupies sectors 0-1 and the environment sector 2). This commit
fixes this, i.e., only sectors 0-2 are protected.
2007-01-23 14:21:14 +01:00
roy zang
ee460917af Merge branch 'master' into hpc2
Conflicts:

	drivers/cfi_flash.c

The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
2007-01-22 13:15:35 +08:00
Wolfgang Denk
a401239664 Minor code cleanup. 2007-01-19 23:08:39 +01:00
Wolfgang Denk
15e5025a73 Merge with /home/hs/SC3/u-boot-dev 2007-01-19 12:06:32 +01:00
Stefan Roese
9d8d5a5bfb [PATCH] Add support for Prodrive SCPU (PDNB3 variant) board
Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-18 16:05:47 +01:00
Stefan Roese
0057d758e3 [PATCH] Update Prodrive P3Mx support
Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-18 11:54:52 +01:00
Heiko Schocher
cb4820725e [PATCH] Fix: Compilerwarnings for SC3 board.
The EBC Configuration Register is now by CFG_EBC_CFG definable
             Added JFFS2 support for the SC3 board.

Signed-off-by: Heiko Schocher <hs@denx.de>
2007-01-18 11:28:51 +01:00
Stefan Roese
3a83ee3021 Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-01-18 10:27:26 +01:00
Stefan Roese
5fb692cae5 [PATCH] Add support for AMCC Taishan PPC440GX eval board
Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-18 10:25:34 +01:00
Wolfgang Denk
6d3e010723 Raname solidcard3 into sc3; add redundant env for sc3 2007-01-16 18:30:50 +01:00
Wolfgang Denk
f11033e739 Merge with /home/hs/SC3/u-boot
Some code cleanup.
2007-01-15 13:41:04 +01:00
Wolfgang Denk
ddd4123336 Merge with /home/hs/MAN/u-boot-dev 2007-01-15 12:56:52 +01:00
Stefan Roese
44cd6de2e1 Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr 2007-01-13 08:01:31 +01:00
Stefan Roese
77ddc5b9af [PATCH] Update Yellowstone (440GR) to display board rev and PCI bus speed
Now the board revision and the current PCI bus speed are printed after
the board message.

Also the EBC initialising is now done via defines in the board config
file.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-13 07:59:56 +01:00
Stefan Roese
36adff362c [PATCH] Update Yosemite (440EP) to display board rev and PCI bus speed
Now the board revision and the current PCI bus speed are printed after
the board message.

Also the EBC initialising is now done via defines in the board config
file.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-13 07:59:19 +01:00
Stefan Roese
e0b9ea8c8a [PATCH] Update Sequoia (440EPx) to display board rev and PCI bus speed
Now the board revision and the current PCI bus speed are printed after
the board message.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-13 07:57:51 +01:00
Heiko Schocher
ca43ba18e9 Added support for the SOLIDCARD III board from Eurodesign
Signed-off-by: Heiko Schocher <hs@denx.de>
2007-01-11 15:44:44 +01:00
Detlev Zundel
0350e79d2a Merge with /home/m8/git/u-boot/ 2007-01-10 16:36:51 +01:00
Wolfgang Denk
2e61581435 Merge with /home/mk/11-cmb1920/u-boot#4upstream 2007-01-10 15:34:43 +01:00
Wolfgang Denk
787fa15860 Fix auto_update for MCC200 board.
The invocation of do_auto_update() is moved to the end of the
misc_init_r() function, after the flash mappings have been
initialized. Please find attached a patch that implements that
change.

Also correct the decoding of the keypad status. With this update, the
key that will trigger the update is Column 2, Row 2.
2007-01-10 01:28:39 +01:00
Marian Balakowicz
d9384de2f5 CAM5200 flash driver modifications:
- use CFI driver (replaces custom flash driver) for main 'cam5200' target
- add second build target 'cam5200_niosflash' which still uses custom driver
2007-01-10 00:26:15 +01:00
Markus Klotzbuecher
67fea022fa SPC1920: cleanup memory contoller setup 2007-01-09 16:02:48 +01:00
Markus Klotzbuecher
9295acb774 SPC1920: add support for the FM18L08 Ramtron FRAM 2007-01-09 14:57:13 +01:00
Markus Klotzbuecher
5921e5313f Miscellanious spc1920 related cleanups 2007-01-09 14:57:13 +01:00
Markus Klotzbuecher
e4c2d37adc SPC1920 GO/NOGO led should be set to color red in U-Boot 2007-01-09 14:57:12 +01:00
Markus Klotzbuecher
d8d9de1a02 Update the SPC1920 CMB PLD driver 2007-01-09 14:57:10 +01:00
Markus Klotzbuecher
d28707dbce Add support for the tms320671x host port interface (HPI) 2007-01-09 14:57:10 +01:00
Stefan Roese
f16c1da957 [PATCH] Update ALPR board files
This update brings the ALPR board support to the newest version.
It also fixes a problem with the NAND driver.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-06 15:56:13 +01:00
Stefan Roese
c04a1a7287 Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-01-05 10:40:50 +01:00
Stefan Roese
a78bc443ae [PATCH] Clear PLB4A0_ACR[WRP] on Sequoia (440EPx)
This fix will make the MAL burst disabling patch for the Linux
EMAC driver obsolete.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-05 10:40:36 +01:00
Stefan Roese
0238898382 [PATCH] Add DDR2 optimization code for Sequoia (440EPx) board
This code will optimize the DDR2 controller setup on a board specific
basis.

Note: This code doesn't work right now on the NAND booting image for the
Sequoia board, since it doesn't fit into the 4kBytes for the SPL image.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-05 10:38:05 +01:00
roy zang
a41969e09b Merge branch 'master' into hpc2 2007-01-04 11:10:05 +08:00
Wolfgang Denk
574ca77c41 Merge with /home/tur/proj/v38b/u-boot 2007-01-04 02:05:51 +01:00
Bartlomiej Sieka
cce4acbb68 Few V38B changes:
- fix a typo in V38B config file
  - move watchdog initialisation earlier in the boot process
  - add "wdt=off" to default kernel command line (disables kernel watchdog)
2006-12-28 19:08:21 +01:00
Wolfgang Denk
9c0f42ecfe Minor code cleanup. 2006-12-24 01:42:57 +01:00
Wolfgang Denk
bc5556d62b Merge with /home/hs/TQ/u-boot-dev 2006-12-24 01:30:04 +01:00
Stefan Roese
1b3c360c23 [PATCH] Fix sequoia flash autodetection (finally correct)
Now 32MByte and 64MByte FLASH is know to work and other
configurations should work too.

Signed-off-by: Stefan Roese <sr@denx.de>
2006-12-22 14:29:40 +01:00
Wolfgang Denk
82e5236a8b Minor code cleanup; update CHANGELOG. 2006-12-22 10:30:26 +01:00
Heiko Schocher
fa23044564 Added support for the TQM8272 board from TQ
Signed-off-by: Heiko Schocher <hs@denx.de>
2006-12-21 17:17:02 +01:00
Heiko Schocher
6dedf3d49d [PATCH] Add support for the UC101 board from MAN.
Signed-off-by: Heiko Schocher <hs@denx.de>
2006-12-21 16:14:48 +01:00
Bartlomiej Sieka
daa6e418bc Preliminary support for the iDMR board (ColdFire). 2006-12-20 00:27:32 +01:00
Andrei Safronov
cdb97a6678 automatic update mechanism 2006-12-08 16:23:08 +01:00
roy zang
9d27b3a068 Slight code clean up.
Add comments, delete duplicate define and remove spaces.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2006-12-04 17:56:59 +08:00
roy zang
6f12c61cf3 Remove the duplicate memory test code for mpc744ihpc2 board.
If a memory test is needed, please use the functions in
post/memory.c or memtest command.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2006-12-04 14:33:08 +08:00
roy zang
e0b369e4f7 Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.

Merge branch 'master' into hpc2

Conflicts:

	MAKEALL
	cpu/74xx_7xx/cpu.c
	cpu/74xx_7xx/cpu_init.c
	cpu/74xx_7xx/speed.c
2006-12-01 12:09:33 +08:00
roy zang
ee311214e0 Clean up the code according to codestyle:
(1) remove some C++ comments.
(2) remove trailing white space.
(3) remove trailing empty line.
(4) Indentation by table.
(5) remove {} in one line condition.
(6) add space before '(' in function call.
Remove some weird printf () output.
Add necessary comments.
Modified Makefile to support building in a separate directory.
2006-12-01 11:47:36 +08:00
Wolfgang Denk
dd520bf314 Code cleanup. 2006-11-30 18:02:20 +01:00
Wolfgang Denk
ab07b6c221 Merge with http://opensource.freescale.com/pub/scm/u-boot-83xx.git 2006-11-30 02:01:32 +01:00
Wolfgang Denk
8d9a8610b8 Code cleanup. Update CHANGELOG. 2006-11-30 01:54:07 +01:00
Stefan Roese
1eac2a7141 [PATCH] Add support for Prodrive P3M750 & P3M7448 (P3Mx) boards
This patch adds support for the Prodrive P3M750 (PPC750 & MV64460)
and the P3M7448 (MPC7448 & MV64460) PMC modules. Both modules are
quite similar and share the same board directory "prodrive/p3mx"
and the same config file "p3mx.h".

Signed-off-by: Stefan Roese <sr@denx.de>
2006-11-29 16:14:05 +01:00
Kim Phillips
32081125a0 Merge http://www.denx.de/git/u-boot 2006-11-28 23:35:49 -06:00
Timur Tabi
e857a5bdb3 mpc83xx: Miscellaneous code style fixes
Implement various code style fixes and similar changes.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-28 23:34:30 -06:00
roy zang
6bd87c0aee Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2

Conflicts:

	drivers/cfi_flash.c
2006-11-29 09:45:03 +08:00
Stefan Roese
e59581c56a [PATCH] Enable the IceCube/lite5200 variants to pass a device tree to Linux.
This patch adds the code and configuration necessary to boot with an
arch/powerpc Linux kernel.

Signed-off-by: Grant Likely <grant.likely@gmail.com>
Acked-by: Jon Loeliger <jdl@freescale.com>
2006-11-28 17:55:49 +01:00
Wolfgang Denk
d2c83f5493 Merge with /home/sr/git/u-boot/denx-alpr-merge-test 2006-11-27 23:11:18 +01:00
Wolfgang Denk
a9398e0185 Minor code cleanup. Update CHANGELOG. 2006-11-27 15:32:42 +01:00
Stefan Roese
cc5ee8a92a [PATCH] alpr: remove unused board specific flash driver
Signed-off-by: Stefan Roese <sr@denx.de>
2006-11-27 14:49:51 +01:00
Stefan Roese
1c2ce22620 [PATCH] Update Prodrive ALPR board support (440GX)
Signed-off-by: Stefan Roese <sr@denx.de>
2006-11-27 14:12:17 +01:00
Stefan Roese
48c7d6dba9 Merge with /home/stefan/git/u-boot/denx 2006-11-27 14:11:22 +01:00
Wolfgang Denk
78d620ebb5 Updates for TQM5200 modules:
- fix off-by-one error in board/tqm5200/cam5200_flash.c error message
- simplify "udate" definitions
2006-11-23 22:58:58 +01:00
Stefan Roese
dfc8a9ee00 Merge with /home/stefan/git/u-boot/denx 2006-11-10 07:48:47 +01:00
Wolfgang Denk
91650b3e4d Sequential accesses to non-existent memory must be synchronized,
at least on G2 cores.

This fixes get_ram_size() problems on MPC5200 Rev. B boards.
2006-11-06 17:06:36 +01:00
Timur Tabi
be5e61815d mpc83xx: Update 83xx to use fsl_i2c.c
Update the 83xx tree to use I2C support in drivers/fsl_i2c.c.  Delete
cpu/mpc83xx/i2c.c, include/asm-ppc/i2c.h, and all references to those files.
Added multiple I2C bus support to fsl_i2c.c.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-03 19:42:23 -06:00
Timur Tabi
d239d74b1c mpc83xx: Replace CFG_IMMRBAR with CFG_IMMR
Replace all instances of CFG_IMMRBAR with CFG_IMMR, so that the 83xx
tree matches the other 8xxx trees.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-03 19:42:23 -06:00
Dave Liu
90f30a710a mpc83xx: Fix the incorrect dcbz operation
The 834x rev1.x silicon has one CPU5 errata.

The issue is when the data cache locked with
HID0[DLOCK], the dcbz instruction looks like no-op inst.

The right behavior of the data cache is when the data cache
Locked with HID0[DLOCK], the dcbz instruction allocates
new tags in cache.

The 834x rev3.0 and later and 8360 have not this bug inside.

So, when 834x rev3.0/8360 are working with ECC, the dcbz
instruction will corrupt the stack in cache, the processor will
checkstop reset.

However, the 834x rev1.x can work with ECC with these code,
because the sillicon has this cache bug. The dcbz will not
corrupt the stack in cache.
Really, it is the fault code running on fault sillicon.

This patch fix the incorrect dcbz operation. Instead of
CPU FP writing to initialise the ECC.

CHANGELOG:
* Fix the incorrect dcbz operation instead of CPU FP
writing to initialise the ECC memory. Otherwise, it
will corrupt the stack in cache, The processor will checkstop
reset.

Signed-off-by: Dave Liu <daveliu@freescale.com>
2006-11-03 19:42:22 -06:00
Kim Phillips
bf0b542d67 mpc83xx: add OF_FLAT_TREE bits to 83xx boards
add ft_pci_setup, OF_CPU, OF_SOC, OF_TBCLK, and
STDOUT_PATH configuration bits to mpc8349emds,
mpc8349itx, and mpc8360emds board code.

redo environment to use bootm with the fdtaddr
for booting ARCH=powerpc kernels by default,
and provide default fdtaddr values.
2006-11-03 19:42:22 -06:00
Timur Tabi
9ca880a250 mpc83xx: Fix dual I2C support for the MPC8349ITX, MPC8349EMDS, TQM834x, and MPC8360EMDS
This patch also adds an improved I2C set_speed(), which handles all clock
frequencies.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-03 19:42:22 -06:00
Dave Liu
7737d5c658 mpc83xx: add QE ethernet support
this patch adds support for the QUICC Engine based UCC gigabit ethernet device.
2006-11-03 19:42:21 -06:00
Dave Liu
5f8204394e mpc83xx: Add MPC8360EMDS basic board support
Add support for the Freescale MPC8360EMDS board.
Includes DDR, DUART, Local Bus, PCI.
2006-11-03 19:42:21 -06:00
Timur Tabi
988833324a mpc83xx: Fix PCI, USB, bootargs for MPC8349E-mITX
PREREQUISITE PATCHES:

* This patch can only be applied after the following patches have been applied:

  1) DNX#2006092142000015 "Add support for the MPC8349E-mITX  1/2"
  2) DNX#2006092142000024 "Add support for the MPC8349E-mITX  2/2"

CHANGELOG:

* For the 8349E-mITX, fix some size values in pci_init_board(), enable
  the clock for the 2nd USB board (Linux kernel will hang otherwise),
  and fix the CONFIG_BOOTARGS macro.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-03 19:42:20 -06:00
Timur Tabi
2ad6b513b3 mpc83xx: Add support for the MPC8349E-mITX
PREREQUISITE PATCHES:

* This patch can only be applied after the following patches have been applied:

  1) DNX#2006090742000024 "Add support for multiple I2C buses"
  2) DNX#2006090742000033 "Multi-bus I2C implementation of MPC834x"
  3) DNX#2006091242000041 "Additional MPC8349 support for multibus i2c"
  4) DNX#2006091242000078 "Add support for variable flash memory sizes on 83xx systems"
  5) DNX#2006091242000069 "Add support for Errata DDR6 on MPC 834x systems"

CHANGELOG:

* Add support for the Freescale MPC8349E-mITX reference design platform.
  The second TSEC (Vitesse 7385 switch) is not supported at this time.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-03 19:42:20 -06:00
Ben Warren
183da6d9b4 Additional MPC8349 support for multibus i2c
Hello,

Here is a patch for a file that was accidentally left out of a previous
attempt.

It accompanies the patch with ticket DNX#2006090742000024

CHANGELOG:
        Change PCI initialization to use new multi-bus I2C API.

regards,
Ben
2006-11-03 19:42:19 -06:00
Tanya Jiang
2fc34ae66e mpc83xx: Unified TQM834x variable names with 83xx and consolidated macros
Unified TQM834x variable names with 83xx and consolidated macro
in preparation for the 8360 and other upcoming 83xx devices.

Signed-off-by: Tanya Jiang <tanya.jiang@freescale.com>
2006-11-03 19:42:18 -06:00
Dave Liu
f6eda7f80c mpc83xx: Changed to unified mpx83xx names and added common 83xx changes
Incorporated the common unified variable names and the changes in preparation
for releasing mpc8360 patches.

Signed-off-by: Dave Liu <daveliu@freescale.com>
2006-11-03 19:42:18 -06:00
Tanya Jiang
3894c46c27 mpc83xx: Fix missing build for mpc8349emds pci.c
Make pci build for mpc8349emds

Signed-off-by: Tanya Jiang <tanya.jiang@freescale.com>
2006-11-03 19:42:17 -06:00
roy zang
0a8eb59983 Merge branch 'master' into hpc2 2006-11-03 13:15:31 +08:00
roy zang
99c09c4dec Change the TEXT_BASE from 0xFFF00000 to 0xFF000000.
Both work. 0xFF000000 seems more reasonable.
2006-11-03 13:07:36 +08:00
roy zang
87c4db0969 Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
mpc7448hpc2 board support high level code:tsi108 init + mpc7448hpc2.

Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2006-11-02 18:59:15 +08:00
roy zang
27801b8ab1 Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
Make ,config.mk and link file for the mpc7448hpc2 board.

Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2006-11-02 18:57:21 +08:00
roy zang
625bb5ddb5 Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
The mpc7448hpc2 board support low level assemble language init code.

Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2006-11-02 18:52:21 +08:00
Bartlomiej Sieka
25721b5cec Finish up support for MarelV38B board
- add watchdog support
 - enable GPIO_WKUP_7 pin for input
 - code cleanup
2006-11-01 02:04:38 +01:00
Bartlomiej Sieka
ffa150bc90 - Fix issues related to the use of ELDK 4 when compiling for MarelV38B:
* remove warnings when compiling ethaddr.c
      * adjust linker script (fixes a crash resulting from incorrect
      definition of __u_boot_cmd_start)
- Some MarelV38B code cleanup.
2006-11-01 01:45:46 +01:00
Bartlomiej Sieka
dae80f3caf - Add MPC5XXX register definition MPC5XXX_WU_GPIO_DATA_I and change the
MPC5XXX_WU_GPIO_DATA macro to MPC5XXX_WU_GPIO_DATA_O (per MPC5200 User's
  Manual). Replace the uses of MPC5XXX_WU_GPIO_DATA with
  MPC5XXX_WU_GPIO_DATA_O for affected boards.

- Add defintions for some MPC5XXX GPIO pins.
2006-11-01 01:38:16 +01:00
Stefan Roese
1265581502 [PATCH] Add some missing machtypes for netstar & voiceblue boards
Use MACH_TYPE_NETSTAR and MACH_TYPE_VOICEBLUE defines instead of
numbers in code.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Stefan Roese <sr@denx.de>
2006-10-28 17:12:58 +02:00
Wolfgang Denk
d38936cdae Fix "ar" flags in some Makefiles to allow for silent "make -s" 2006-10-27 11:55:21 +02:00
Haavard Skinnemoen
5e3b0bc19f Finish up support for the ATSTK1000/ATSTK1002 boards
Add atstk1002_config target to Makefile and move the AVR32 section
down below Blackfin so that it doesn't end up in the middle of
MIPS.

Drop the autogenerated linker script thing for now. Will have to
revisit how to handle chips with different flash and RAM layout
later.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2006-10-25 23:44:48 +02:00
Wolfgang Denk
0ab292cbc1 Merge with /home/wd/git/u-boot/master 2006-10-24 15:17:59 +02:00
Wolfgang Denk
9748d5a9e8 Merge with /home/wd/git/u-boot/mailing-list/Haavard_Skinnemoen 2006-10-24 15:17:18 +02:00
Wolfgang Denk
3a78e3e75b Move atstk1000 files into vendor specific directory.
Patch by Haavard Skinnemoen, 12 Sep 2006
2006-10-24 14:51:36 +02:00
Wolfgang Denk
6ccec4492e Add ATSTK1000 and ATSTK1002 board support
Patch by Haavard Skinnemoen, 06 Sep 2006

This patch adds support for the ATSTK1000 with the ATSTK1002 CPU
daughterboard.

ATSTK1000 is a full-featured development board for AT32AP CPUs. It
has two ethernet ports, a high quality QVGA LCD panel, a loudspeaker,
and connectors for USART, PS/2, VGA, USB, MMC/SD cards and
CompactFlash cards. For more information, please see this page:

http://www.atmel.com/dyn/products/tools.asp?family_id=682

The ATSTK1002 is a daughterboard for the ATSTK1000 supporting the
AT32AP7000 chip.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2006-10-24 14:42:37 +02:00
Marian Balakowicz
8318fbf8cc Fix sequoia separate object direcory building problems. 2006-10-23 22:17:05 +02:00
Wolfgang Denk
d67c14c0f4 Merge with http://www.jdl.com/software/u-boot-86xx.git 2006-10-20 23:52:58 +02:00
Jon Loeliger
3acb7727ce Merge branch 'i2c' 2006-10-20 15:54:48 -05:00
Jon Loeliger
f5012827df Fix compilation warnings on a few 85xx boards.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2006-10-20 15:54:34 -05:00
Jon Loeliger
2047672684 Converted all 85xx boards to use a common FSL I2C driver.
Introduced COFIG_FSL_I2C to select the common FSL I2C driver.
And removed hard i2c path from a few u-boot.lds scipts too.
Minor whitespace cleanups along the way.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
2006-10-20 15:50:15 -05:00
Wolfgang Denk
ba999c531e Cleanup compile warnings. Prepare for release 1.1.5 2006-10-20 17:54:33 +02:00
Jon Loeliger
d22200f020 Merge branch 'master' of http://www.denx.de/git/u-boot 2006-10-19 12:03:44 -05:00
Jon Loeliger
13a7fcdf37 * Fix a bunch of compiler warnings for gcc 4.0
Signed-off-by: Matthew McClintock <msm@freescale.com>
2006-10-19 11:33:52 -05:00
Wolfgang Denk
fcfed4f2f2 Coding Style cleanup. 2006-10-18 22:44:38 +02:00
Wolfgang Denk
82165a334b Merge with /home/tur/proj/051_uboot_linux_v38b/u-boot 2006-10-18 22:27:57 +02:00
Bartlomiej Sieka
4707fb50cc Preliminary patch adding support for the MarelV38B board. 2006-10-13 21:09:09 +02:00
Jon Loeliger
bf651baa36 Move "ar" flags to config.mk to allow for silent "make -s" 2006-10-11 10:10:43 -05:00
Jon Loeliger
daaba9859b Merge branch 'master' of http://www.denx.de/git/u-boot 2006-10-10 17:21:42 -05:00
Jon Loeliger
7b382b7125 Fix whitespace issues. 2006-10-10 17:14:45 -05:00
Jon Loeliger
333961ae70 Fix whitespace and 80-col issues. 2006-10-10 17:02:22 -05:00
Wolfgang Denk
1d92b2e550 TQM5200: perform POST memory test only on STK52xx carrier board.
(and then only if PSC6_3 is read as "1" when booting).
Patch by Martin Krause, 21 Jun 2006
2006-10-09 01:07:53 +02:00
Wolfgang Denk
2b208f5308 Move "ar" flags to config.mk to allow for silent "make -s"
Based on patch by Mike Frysinger, 20 Jun 2006
2006-10-09 01:02:05 +02:00
Wolfgang Denk
7ce343e499 Add missing files for EP82xxM boards
Patch by Aaron Sells, 20 Jun 2006
2006-10-09 00:48:57 +02:00
Wolfgang Denk
511d0c72b8 Coding style cleanup 2006-10-09 00:42:01 +02:00
Stefan Roese
5bc528fa4d Update ALPR code (NAND support working now)
Patch by Stefan Roese, 07 Oct 2006
2006-10-07 11:35:25 +02:00
Stefan Roese
f3443867e9 Add CONFIG_BOARD_RESET to configure board specific reset function
Patch by Stefan Roese, 07 Oct 2006
2006-10-07 11:30:52 +02:00
Wolfgang Denk
eac5ba3e59 Merge with /home/m8/git/u-boot 2006-10-05 11:10:17 +02:00
Stefan Roese
56fb6ba179 Fix TLB setup for Ocotea board
Patch by Stefan Roese, 30 Sep 2006
2006-10-04 07:12:49 +02:00
Stefan Roese
d373325efd Fix reset problem in sequoia sdram init code
Patch by Stefan Roese, 23 Sep 2006
2006-10-04 07:12:27 +02:00
Marian Balakowicz
7299712c86 Update for CAM5200 board:
- Map in a additional chip selects CS4 and CS5.
  - Modify the port configration, configure six UARTs and no PCI,
    ATA and USB.
  - Add custom flash driver to handle specific byte swapping
2006-10-03 20:28:38 +02:00
Jon Loeliger
504b5cd0e2 Merge branch 'mpc85xx'
Conflicts:

	drivers/tsec.c
2006-09-19 10:02:20 -05:00
Andy Fleming
09f3e09e9e Add support for eTSEC 3 & 4 on 8548 CDS
* Added support for using eTSEC 3 and eTSEC 4 on the 8548 CDS.
  This will only work on rev 1.3 boards (but doesn't break older boards)
* Cleaned up some comments to reflect the expanded role of tsec
  in other systems
2006-09-19 09:41:48 -05:00
Andy Fleming
084d648b10 Added code to support 2.6.18 PCI changes in u-boot
* Added code to swizzle the IRQ map for the PCI
2006-09-19 09:41:08 -05:00
Jon Loeliger
afbdc649f8 Modified makefile for new build mechanism.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2006-09-19 09:34:10 -05:00
Jon Loeliger
afa98843e4 Merge branch 'master' of http://www.denx.de/git/u-boot
Conflicts:

	board/stxxtc/Makefile
2006-09-19 08:51:24 -05:00
Stefan Roese
64cd52efd1 Merge with /home/stefan/git/u-boot/denx 2006-09-18 10:48:03 +02:00
Stefan Roese
854bc8da75 Add support for AMCC Rainier PPX440GRx eval board
Patch by Stefan Roese, 13 Sep 2006
2006-09-13 13:56:49 +02:00
Wolfgang Denk
aeec782b02 Disable autoboot abort for FO300 when silent mode is enabled
(according to S1 switch setting).
Patch by Marian Balakowicz, 12 Sep 2006
2006-09-13 10:47:05 +02:00
Stefan Roese
d12ae80889 Add NAND environment support for PPC440EPx Sequoia NAND boot config
Patch by Stefan Roese, 12 Sep 2006
2006-09-12 20:19:10 +02:00
Stefan Roese
887e2ec9ec Add support for AMCC Sequoia PPC440EPx eval board
- Add support for PPC440EPx & PPC440GRx
- Add support for PPC440EP(x)/GR(x) NAND controller
  in cpu/ppc4xx directory
- Add NAND boot functionality for Sequoia board,
  please see doc/README.nand-boot-ppc440 for details
- This Sequoia NAND image doesn't support environment
  in NAND for now. This will be added in a short while.
Patch by Stefan Roese, 07 Sep 2006
2006-09-07 11:51:23 +02:00
Wolfgang Denk
f60ba0d35e Fix build problems on sorcery board. 2006-09-04 02:01:27 +02:00
Wolfgang Denk
6741ae92f3 Merge with /home/m8/git/u-boot 2006-09-04 01:03:57 +02:00
Marian Balakowicz
f93286397e Add support for a saving build objects in a separate directory.
Modifications are based on the linux kernel approach and
support two use cases:

  1) Add O= to the make command line
  'make O=/tmp/build all'

  2) Set environement variable BUILD_DIR to point to the desired location
  'export BUILD_DIR=/tmp/build'
  'make'

The second approach can also be used with a MAKEALL script
'export BUILD_DIR=/tmp/build'
'./MAKEALL'

Command line 'O=' setting overrides BUILD_DIR environent variable.

When none of the above methods is used the local build is performed and
the object files are placed in the source directory.
2006-09-01 19:49:50 +02:00
Marian Balakowicz
24d3d37546 Remove the board/netstar/crcit binary from git repository. 2006-09-01 19:47:42 +02:00
Wolfgang Denk
e8143e72e1 Add splashscreen support for MCC200 board. 2006-08-30 23:09:00 +02:00
Stefan Roese
2b393b0f0a PCIe endpoint support for AMCC Yucca 440SPe board
Patch by Tirumala R Marri, 26 Aug 2006
2006-08-29 08:05:15 +02:00
Stefan Roese
f5577aae4a Improve DIMM detection for AMCC Yucca 440SPe board
Improved the memory DIMM detection for the Yucca 440SPe board for
the case where a memory DIMM is falsely detected as present.

This issue is seen on some AMCC Yucca 440SPe validation boards if
only one 512MB memory DIMM is installed, i.e. DIMM slot 0 is
populated and DIMM slot 1 is empty.  In this case, U-Boot does
not correctly detect that there is only one DIMM memory module
installed and will falsely detect two DIMM memory modules are
present and therefore U-Boot will not calculate the correct amount
of total memory and u-boot will not booting up.

Patch by Adam Graham, 24 Aug 2006
2006-08-29 08:04:32 +02:00
Wolfgang Denk
16850919ff Code cleanup 2006-08-27 18:10:01 +02:00
Wolfgang Denk
ed1cf8456f Updates for MCC200 / PRS200 boards:
- support for configurations with SDRAM or DDR memory,
- support for highboot and lowboot
- adjusting environment definitions
2006-08-24 00:26:42 +02:00
Jon Loeliger
f1f33de332 Merge branch 'mpc86xx' 2006-08-22 12:26:51 -05:00
Jon Loeliger
80e955c7dd General indent and whitespace cleanups. 2006-08-22 12:25:27 -05:00
Jon Loeliger
4b7576fb80 Merge branch 'master' of http://www.denx.de/git/u-boot 2006-08-22 10:17:59 -05:00
Wolfgang Denk
5196a7a03b Minor cleanup 2006-08-18 23:27:33 +02:00
Marian Balakowicz
6d3bc9b8cf Add support for WTK FO300 board (TQM5200 based). 2006-08-18 19:14:46 +02:00