Commit Graph

1856 Commits

Author SHA1 Message Date
Grant Likely f92edbd8a0 Merge branch 'origin' into kconfig-for-1.3.1 2007-11-20 08:19:56 -07:00
Haiying Wang f30ad49b16 Move CONFIG_QE out of CONFIG_PCI wrap for MPC8568MDS
CONFIG_QE shouldn't be in the wrap of CONFIG_PCI, fix it.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
2007-11-19 21:53:07 +01:00
Wolfgang Denk e8da58f2bc Fix build problems with mp2usb board
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-19 12:59:14 +01:00
Grant Likely efe33035ac Merge branch 'origin' into kconfig-for-1.3.1
Conflicts:

	drivers/Makefile
2007-11-16 21:01:19 -07:00
Wolfgang Denk a75e1a3dda Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire 2007-11-17 02:28:26 +01:00
Luotao Fu fd329e6f05 Fix the i2c frequency and default address in rsdproto board
rsdproto board support has wrong I2C frequency and wrong return value
handling.

Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
2007-11-17 01:55:57 +01:00
Grant Likely 1c3dd43338 powerpc: Backout relocation changes.
Ugh.  I *hate* to back this change out, but these compiler flags don't
work for relocation on all versions of GCC.  I've not been able to
reproduce the environment in my setup (and hence, not been able to
find a combination that *does* work), so I've got no choice but to go
back to the old gcc flags and linker script.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-17 01:38:58 +01:00
Jean-Christophe PLAGNIOL-VILLARD 5c15010efa Fixed mips_io_port_base build errors.
This patch has been sent on:
- 29 Sep 2007

Although mips_io_port_base is currently a part of IDE command, it is quite
fundamental for MIPS I/O port access such as in[bwl] and out[bwl]. So move
it to MIPS general part, and introduce `set_io_port_base()' from Linux.

This patch is triggered by multiple definition of `mips_io_port_base' build
error on gth2 (and tb0229 also needs this fix.)

board/gth2/libgth2.a(gth2.o): In function `log_serial_char':
/home/skuribay/devel/u-boot.git/board/gth2/gth2.c:47: multiple definition of `mips_io_port_base'
common/libcommon.a(cmd_ide.o):/home/skuribay/devel/u-boot.git/common/cmd_ide.c:712: first defined here
make: *** [u-boot] Error 1

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-17 01:37:44 +01:00
Wolfgang Denk e5e3d7d520 Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx 2007-11-17 01:33:33 +01:00
Jason Jin db74b3c1c9 Unify pixis_reset altbank across board families
Basically, refactor the CFG_PIXIS_VBOOT_MASK values
into the separate board config files.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2007-11-17 00:57:51 +01:00
Wolfgang Denk a08ded4e63 Merge branch 'master' of git://www.denx.de/git/u-boot-net 2007-11-16 21:50:12 +01:00
Grant Likely 1b4aaffe4f Add .gitignore files
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
2007-11-15 08:46:46 -07:00
Grant Likely 955413f35f Revert "Correct relocation fixup for mpc5xx"
This reverts commit 3649cd99ba.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:27 -07:00
Grant Likely e15633888a Revert "Correct fixup relocation for MPC5xxx"
This reverts commit 6f7576b20e.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:22 -07:00
Grant Likely 139365fbe5 Revert "Correct fixup relocation for mpc8220"
This reverts commit a85dd254c0.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:21 -07:00
Grant Likely 7092234236 Revert "Correct fixup relocation for mpc824x"
This reverts commit f3a52fe059.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:19 -07:00
Grant Likely 96279ab4ca Revert "Correct fixup relocation for mpc8260"
This reverts commit 5af61b2f4b.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:18 -07:00
Grant Likely 928fe33b24 Revert "Correct fixup relocation for mpc83xx"
This reverts commit 057004f4a4.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:17 -07:00
Grant Likely c93945e8f9 Revert "[MPC512x] Correct fixup relocation"
This reverts commit 8d17979d03.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:31:16 -07:00
Stefan Roese 5c568d6a7f Merge branch 'master' of git://www.denx.de/git/u-boot 2007-11-13 08:16:40 +01:00
Heiko Schocher 1ce55151c8 [UC101] SRAM now with 2 MB working.
Signed-off-by: Heiko Schocher <hs@denx.de>
2007-11-13 07:50:29 +01:00
TsiChungLiew 8d737a2815 ColdFire: MCF5329 - Remove reset registers from CCM
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-11-08 12:50:18 -06:00
TsiChungLiew 7d7cdea769 ColdFire: MCF5329 - Add Reset structure to immap_5329.h
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-11-08 12:31:11 -06:00
TsiChungLiew 09b26cf00d ColdFire: MCF5329 - revert include/asm-m68k/m5329.h file mode
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-11-08 12:19:01 -06:00
TsiChungLiew 225a24b5e0 ColdFire: MCF5445x - Update correct RAMBAR and missing linker files
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-11-07 18:00:54 -06:00
TsiChungLiew 248c7c1483 ColdFire: MCF532x - Update do_reset() using core reset
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-11-07 17:56:15 -06:00
Larry Johnson 71bc6e6474 NET: Add Ethernet 1000BASE-X support for PPC4xx
This patch adds support for 1000BASE-X to functions "miiphy_speed ()" and
"miiphy_duplex()".  It also adds function "miiphy_is_1000base_x ()", which
returns non-zero iff the PHY registers are configured for 1000BASE-X.  The
"mii info" command is modified to distinguish between 1000BASE-T and -X.

Signed-off-by: Larry Johnson <lrj@acm.org>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-11-06 10:25:33 -05:00
Larry Johnson 298035df49 NET: Cosmetic changes
Signed-off-by: Larry Johnson <lrj@acm.org>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-11-06 10:25:29 -05:00
Wolfgang Denk 992742a5b0 Cleanup coding style; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-03 23:09:27 +01:00
Zhang Wei bbf4796f64 Fix USB support issue for MPC8641HPCN board.
The configuration file has already enabled USB, but it
missed definition of CFG_OHCI_SWAP_REG_ACCESS, the USB
on MPC8641HPCN can not work because of the wrong USB
register endian.

And add the USB command to U-Boot commands list.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
2007-11-03 22:15:12 +01:00
Jean-Christophe PLAGNIOL-VILLARD 4e62041023 Use config_cmd_default.h instead of config_cmd_all.h
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-03 22:12:01 +01:00
Sergej Stepanov 6abd82e19a changes for IDS8247 board support
To get the IDS8247 board working following are done:
 - FCC2 is deactivated
 - FCC1 is activated
 - I2C is activated
 - CFI driver is activated
 - Adapted for use with LIBFDT

Signed-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de>
--
2007-11-03 22:02:37 +01:00
Wolfgang Denk e60adeac2d Merge branch 'master' of /home/wd/git/u-boot/work 2007-11-02 15:09:22 +01:00
Wolfgang Denk f0516920f6 Merge branch 'master' of /home/wd/git/u-boot/custodians 2007-11-02 15:09:10 +01:00
Haavard Skinnemoen 8b6684a698 ATSTK1002: Remove default ethernet addresses
Wolfgang is right: It's not a good idea to set up default initial
ethernet addresses for a board, even though they belong to the local
range.

This will change the failure mode from "IT manager screams at you for
using duplicate ethernet addresses" to a nice error message explaining
that the ethernet address hasn't been set properly.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2007-11-01 23:29:21 +01:00
Wolfgang Denk 8287b3b564 Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire 2007-11-01 22:58:59 +01:00
Wolfgang Denk 8410d39070 Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group 2007-11-01 22:56:16 +01:00
Wolfgang Denk 5b746c3ea8 Merge branch 'master' of /home/wd/git/u-boot/custodians 2007-11-01 22:55:23 +01:00
Wolfgang Denk 2fa0dd158c Merge branch 'master' of git://www.denx.de/git/u-boot-mips 2007-11-01 22:54:31 +01:00
Wolfgang Denk 0f8b8d0f4c Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx 2007-11-01 22:38:01 +01:00
Stefan Roese 4980102871 Merge git://www.denx.de/git/u-boot 2007-10-27 13:43:40 +02:00
TsiChungLiew e8ee8f3ade ColdFire 54455: Fix correct boot location for atmel and intel
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-10-25 17:16:22 -05:00
TsiChungLiew c67e12e705 ColdFire 5329: Assign correct SDRAM size and fix cache
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-10-25 17:12:36 -05:00
TsiChungLiew 95e9f2c212 ColdFire 5253: Assign correct SDRAM size
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-10-25 17:10:23 -05:00
TsiChungLiew 2acefa72ee ColdFire 5282: Fix external flash boot and return dramsize
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-10-25 17:09:17 -05:00
Bartlomiej Sieka d78791ae91 TQM5200: increase kernel_addr_r and fdt_addr_r (hinted by Wolfgang Denk).
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2007-10-25 17:20:01 +02:00
Wolfgang Denk 53acfb2983 Merge branch 'motionpro_ng' of /home/tur/git/u-boot 2007-10-24 11:05:28 +02:00
Martin Krause 1a0ce20aa4 TQM5200: fix spurious characters on second serial interface
With this patch PSC3 is configured as UART. This is done, because if
the pins of PSC3 are not configured at all (-> all pins are GPI),
due to crosstalk, spurious characters may be send over the RX232_2_TXD
signal line.

Signed-off-by: Martin Krause <martin.krause@tqs.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-10-24 09:30:13 +02:00
Martin Krause b31f64343e TQM5200: fix spurious characters on second serial interface
With this patch PSC3 is configured as UART. This is done, because if
the pins of PSC3 are not configured at all (-> all pins are GPI),
due to crosstalk, spurious characters may be send over the RX232_2_TXD
signal line.

Signed-off-by: Martin Krause <martin.krause@tqs.de>
2007-10-24 00:29:51 +02:00
Jean-Christophe PLAGNIOL-VILLARD 7b0a42219f Mips: Fix string functions differ prototype declaration
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-10-24 00:29:31 +02:00