Commit Graph

946 Commits

Author SHA1 Message Date
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
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
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