]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
16 years agoMerge commit 'remotes/wd/master'
Jon Loeliger [Tue, 20 Nov 2007 20:34:57 +0000 (14:34 -0600)]
Merge commit 'remotes/wd/master'

16 years agoPrepare for 1.3.0 release. v1.3.0
Wolfgang Denk [Mon, 19 Nov 2007 21:20:24 +0000 (22:20 +0100)]
Prepare for 1.3.0 release.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMove CONFIG_QE out of CONFIG_PCI wrap for MPC8568MDS
Haiying Wang [Mon, 19 Nov 2007 15:02:13 +0000 (10:02 -0500)]
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>
16 years ago[MIPS] board/gth2/lowlevel_init.S: Fix a build warning
Shinya Kuribayashi [Mon, 19 Nov 2007 02:14:16 +0000 (11:14 +0900)]
[MIPS] board/gth2/lowlevel_init.S: Fix a build warning

lowlevel_init.S: Assembler messages:
lowlevel_init.S:413: Warning: Pretending global symbol used as branch target is local.

Looking at codes, the `memtest' and `clearmem' are intentional mixed
use of `global symbols' and `label' for debugging purpose. To make it
build, just disable global-symbols-use for now. As a result `memtest'
still remains as unused, but leave it be...

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
16 years agoFix build problems with mp2usb board
Wolfgang Denk [Mon, 19 Nov 2007 11:59:14 +0000 (12:59 +0100)]
Fix build problems with mp2usb board

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agos3c24x0: Fix usb_ohci.c missing in Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 Nov 2007 17:36:11 +0000 (18:36 +0100)]
s3c24x0: Fix usb_ohci.c missing in Makefile
and usb_ohci.c warning differ in signedness

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agopb1x00 board: Fix u16 status declaration when PCMCIA is defined
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 Nov 2007 11:55:02 +0000 (12:55 +0100)]
pb1x00 board: Fix u16 status declaration when PCMCIA is defined

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoFix compiler warnings for ARM systems.
Wolfgang Denk [Sun, 18 Nov 2007 16:11:09 +0000 (17:11 +0100)]
Fix compiler warnings for ARM systems.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix compiler warnings for PPC systems. Update CHANGELOG.
Wolfgang Denk [Sun, 18 Nov 2007 15:36:27 +0000 (16:36 +0100)]
Fix compiler warnings for PPC systems. Update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix warning differ in signedness in net/net.c and net/nfs.c
Jean-Christophe PLAGNIOL-VILLARD [Sat, 17 Nov 2007 10:31:10 +0000 (11:31 +0100)]
Fix warning differ in signedness in net/net.c and net/nfs.c

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Sun, 18 Nov 2007 00:26:14 +0000 (01:26 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mips

16 years agogth2.c: Fix a warning on gth2 build.
Shinya Kuribayashi [Sat, 17 Nov 2007 11:42:45 +0000 (20:42 +0900)]
gth2.c: Fix a warning on gth2 build.

gth2.c: In function 'misc_init_r':
gth2.c:434: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoFix warning differ in signedness in common/cmd_scsi.c
Stefan Roese [Sat, 17 Nov 2007 06:58:25 +0000 (07:58 +0100)]
Fix warning differ in signedness in common/cmd_scsi.c

Signed-off-by: Stefan Roese <sr@denx.de>
16 years ago[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker
Shinya Kuribayashi [Sat, 17 Nov 2007 11:05:26 +0000 (20:05 +0900)]
[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker

Current trick to pick up GNU assembler minor version does not work with the
latest binutils (2007-03-01 or later) due to ${PKGVERSION} now default to
"(GNU Binutils) ".

  $ sde-as --version |grep "GNU assembler"
  GNU assembler 2.15.94 mipssde-6.02.02-20050602
  $ sde-as --version |grep "GNU assembler" |awk '{print $3}'
  2.15.94
  $ sde-as --version |grep "GNU assembler" |awk '{print $3}' |awk -F. '{print $2}'
  15
  $

  $ mips-linux-as --version |grep "GNU assembler"
  GNU assembler (GNU Binutils) 2.18
  $ mips-linux-as --version |grep "GNU assembler" |awk '{print $3}'
  (GNU
  $ mips-linux-as --version |grep "GNU assembler" |awk '{print $3}' |awk -F. '{print $2}'
  (no output)
  $

As a result of above, you'll see many noises with such binutils:

  make -C cpu/mips/
  /bin/sh: line 0: [: : integer expression expected
  /bin/sh: line 0: [: : integer expression expected
  make[1]: Entering directory `/home/skuribay/devel/u-boot.git/cpu/mips'
  mips-linux-gcc  -D__ASSEMBLY__ -g  -Os   -D__KERNEL__ -DTEXT_BASE=0xB0000000  -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isystem /home/skuribay/devel/buildroot/build_mips/staging_dir/usr/bin/../lib/gcc/mips-linux-uclibc/4.2.1/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4kc -EB -c -o incaip_wdt.o incaip_wdt.S
  /bin/sh: line 0: [: : integer expression expected
  mips-linux-gcc  -D__ASSEMBLY__ -g  -Os   -D__KERNEL__ -DTEXT_BASE=0xB0000000  -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isystem /home/skuribay/devel/buildroot/build_mips/staging_dir/usr/bin/../lib/gcc/mips-linux-uclibc/4.2.1/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4kc -EB -c -o cache.o cache.S
  /bin/sh: line 0: [: : integer expression expected
  mips-linux-gcc -g  -Os   -D__KERNEL__ -DTEXT_BASE=0xB0000000  -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isystem /home/skuribay/devel/buildroot/build_mips/staging_dir/usr/bin/../lib/gcc/mips-linux-uclibc/4.2.1/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4kc -EB -Wall -Wstrict-prototypes -c -o asc_serial.o asc_serial.c
  /bin/sh: line 0: [: : integer expression expected

This patch simplifies the trick and makes it work with both versions of gas.
I also replace an expensive `awk (or gawk)' with `cut'.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] Remove useless instructions for initializing $gp.
Shinya Kuribayashi [Sat, 17 Nov 2007 11:05:26 +0000 (20:05 +0900)]
[MIPS] Remove useless instructions for initializing $gp.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] MIPS 4K core: Coding style cleanups
Shinya Kuribayashi [Sat, 27 Oct 2007 06:27:06 +0000 (15:27 +0900)]
[MIPS] MIPS 4K core: Coding style cleanups

No logical changes.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] gth2.c: Fix a warning on gth2 build.
Shinya Kuribayashi [Sat, 17 Nov 2007 11:05:20 +0000 (20:05 +0900)]
[MIPS] gth2.c: Fix a warning on gth2 build.

gth2.c: In function 'misc_init_r':
gth2.c:434: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] au1x00_eth.c: Fixed a warning on pb1000 build.
Shinya Kuribayashi [Sat, 27 Oct 2007 06:22:33 +0000 (15:22 +0900)]
[MIPS] au1x00_eth.c: Fixed a warning on pb1000 build.

au1x00_eth.c: In function 'au1x00_miiphy_write':
au1x00_eth.c:139: warning: 'return' with no value, in function returning non-void

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] au1x00_eth.c: Fix au1x00_miiphy_{read,write} build error
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:25 +0000 (15:00 +0900)]
[MIPS] au1x00_eth.c: Fix au1x00_miiphy_{read,write} build error

au1x00_eth.c: In function 'au1x00_enet_initialize':
au1x00_eth.c:246: error: 'au1x00_miiphy_read' undeclared (first use in this function)
au1x00_eth.c:246: error: (Each undeclared identifier is reported only once
au1x00_eth.c:246: error: for each function it appears in.)
au1x00_eth.c:246: error: 'au1x00_miiphy_write' undeclared (first use in this function)
au1x00_eth.c: In function 'au1x00_miiphy_write':
au1x00_eth.c:298: warning: 'return' with no value, in function returning non-void
make[1]: *** [au1x00_eth.o] Error 1

Fixed by moving these two functions forward.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMAKEALL: Added missing pb1000 board
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:25 +0000 (15:00 +0900)]
MAKEALL: Added missing pb1000 board

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] pb1000: Replace obsolete memsetup.S with lowlevel_init.S
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:24 +0000 (15:00 +0900)]
[MIPS] pb1000: Replace obsolete memsetup.S with lowlevel_init.S

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] u-boot.lds: Cleanup __u_boot_cmd_{start,end}
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:24 +0000 (15:00 +0900)]
[MIPS] u-boot.lds: Cleanup __u_boot_cmd_{start,end}

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoUpdate CHANGELOIG, prepare for -rc4 v1.3.0-rc4
Wolfgang Denk [Sat, 17 Nov 2007 01:34:38 +0000 (02:34 +0100)]
Update CHANGELOIG, prepare for -rc4

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Wolfgang Denk [Sat, 17 Nov 2007 01:28:26 +0000 (02:28 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc5xxx
Wolfgang Denk [Sat, 17 Nov 2007 01:00:17 +0000 (02:00 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc5xxx

16 years agoFix the i2c frequency and default address in rsdproto board
Luotao Fu [Wed, 14 Nov 2007 17:58:33 +0000 (18:58 +0100)]
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>
16 years agopowerpc: Backout relocation changes for MPC5121, too.
Wolfgang Denk [Sat, 17 Nov 2007 00:45:38 +0000 (01:45 +0100)]
powerpc: Backout relocation changes for MPC5121, too.

Apply Grant Likely's backout to MPC5121 code, too.

Pointed out by Rafal Jaworowski <raj@semihalf.com>

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopowerpc: Backout relocation changes.
Grant Likely [Wed, 14 Nov 2007 05:18:33 +0000 (22:18 -0700)]
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>
16 years agoFixed mips_io_port_base build errors.
Jean-Christophe PLAGNIOL-VILLARD [Tue, 13 Nov 2007 08:11:05 +0000 (09:11 +0100)]
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>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Sat, 17 Nov 2007 00:33:33 +0000 (01:33 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

16 years agoFix a bug in the slave serial programming mode for the Xilinx
Wolfgang Denk [Sat, 17 Nov 2007 00:30:40 +0000 (01:30 +0100)]
Fix a bug in the slave serial programming mode for the Xilinx
Spartan2/3 FPGAs. The old code used "< 0" on a "char" type to test if
the most significant bit was set, which did not work on any
architecture where "char" defaulted to be an unsigned type.

Based on a patch by Angelos Manousaridis <amanous@inaccessnetworks.com>

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years ago86xx: Fix broken variable reference when #def DEBUGing.
Jon Loeliger [Thu, 1 Nov 2007 17:23:29 +0000 (12:23 -0500)]
86xx: Fix broken variable reference when #def DEBUGing.

Sometimes you can't reference the DDR2 controller variables.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years agomake 8610 board use pixis reset
Jason Jin [Fri, 26 Oct 2007 10:32:00 +0000 (18:32 +0800)]
make 8610 board use pixis reset

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
16 years agoUnify pixis_reset altbank across board families
Jason Jin [Mon, 29 Oct 2007 11:26:21 +0000 (19:26 +0800)]
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>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/work
Wolfgang Denk [Fri, 16 Nov 2007 23:38:34 +0000 (00:38 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/work

16 years agoFix warning: pointer targets in assignment differ in signedness
Jean-Christophe PLAGNIOL-VILLARD [Wed, 7 Nov 2007 07:19:21 +0000 (08:19 +0100)]
Fix warning: pointer targets in assignment differ in signedness

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoFix warning differ in signedness in common/cmd_ide.c
Jean-Christophe PLAGNIOL-VILLARD [Wed, 7 Nov 2007 07:19:19 +0000 (08:19 +0100)]
Fix warning differ in signedness in common/cmd_ide.c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-net
Wolfgang Denk [Fri, 16 Nov 2007 20:50:12 +0000 (21:50 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-net

16 years agoRevert "Correct relocation fixup for mpc5xx"
Grant Likely [Thu, 15 Nov 2007 15:27:52 +0000 (08:27 -0700)]
Revert "Correct relocation fixup for mpc5xx"

This reverts commit 3649cd99ba815b6601868735765602f00ef3692b.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoRevert "Correct fixup relocation for MPC5xxx"
Grant Likely [Thu, 15 Nov 2007 15:24:32 +0000 (08:24 -0700)]
Revert "Correct fixup relocation for MPC5xxx"

This reverts commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoRevert "Correct fixup relocation for mpc8220"
Grant Likely [Thu, 15 Nov 2007 15:21:04 +0000 (08:21 -0700)]
Revert "Correct fixup relocation for mpc8220"

This reverts commit a85dd254c0577fca13627c46e93fc2ad4c4f1f00.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoRevert "Correct fixup relocation for mpc824x"
Grant Likely [Thu, 15 Nov 2007 15:20:57 +0000 (08:20 -0700)]
Revert "Correct fixup relocation for mpc824x"

This reverts commit f3a52fe05923935db86985daf9438e2f70ac39aa.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoRevert "Correct fixup relocation for mpc8260"
Grant Likely [Thu, 15 Nov 2007 15:20:50 +0000 (08:20 -0700)]
Revert "Correct fixup relocation for mpc8260"

This reverts commit 5af61b2f4b838a05f79be274f3e5a66edd2d9c96.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoRevert "Correct fixup relocation for mpc83xx"
Grant Likely [Thu, 15 Nov 2007 15:20:43 +0000 (08:20 -0700)]
Revert "Correct fixup relocation for mpc83xx"

This reverts commit 057004f4a4863554d56cc56268bfa7c7d9738e27.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoRevert "[MPC512x] Correct fixup relocation"
Grant Likely [Thu, 15 Nov 2007 15:20:25 +0000 (08:20 -0700)]
Revert "[MPC512x] Correct fixup relocation"

This reverts commit 8d17979d0359492a822a0a409d26e3a3549b4cd4.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agoEnable ULi1575 Ethernet support in 8610HPCD config
Roy Zang [Thu, 13 Sep 2007 10:52:28 +0000 (18:52 +0800)]
Enable ULi1575 Ethernet support in 8610HPCD config

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Acked-by: Jon Loeliger <jdl@freescale.com>
16 years agoppc4xx: lwmon5: Change PHY reset sequence for PHY MDIO address latching
Stefan Roese [Tue, 13 Nov 2007 07:18:20 +0000 (08:18 +0100)]
ppc4xx: lwmon5: Change PHY reset sequence for PHY MDIO address latching

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot
Stefan Roese [Tue, 13 Nov 2007 07:16:40 +0000 (08:16 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot

16 years ago[UC101] SRAM now with 2 MB working.
Heiko Schocher [Tue, 13 Nov 2007 06:50:29 +0000 (07:50 +0100)]
[UC101] SRAM now with 2 MB working.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agoColdFire: MCF5329 - Remove reset registers from CCM
TsiChungLiew [Thu, 8 Nov 2007 18:50:18 +0000 (12:50 -0600)]
ColdFire: MCF5329 - Remove reset registers from CCM

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: MCF5329 - Add Reset structure to immap_5329.h
TsiChungLiew [Thu, 8 Nov 2007 18:31:11 +0000 (12:31 -0600)]
ColdFire: MCF5329 - Add Reset structure to immap_5329.h

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: MCF5329 - revert include/asm-m68k/m5329.h file mode
TsiChungLiew [Thu, 8 Nov 2007 18:19:01 +0000 (12:19 -0600)]
ColdFire: MCF5329 - revert include/asm-m68k/m5329.h file mode

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: MCF5445x - Update correct RAMBAR and missing linker files
TsiChungLiew [Thu, 8 Nov 2007 00:00:54 +0000 (18:00 -0600)]
ColdFire: MCF5445x - Update correct RAMBAR and missing linker files

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: MCF532x - Update do_reset() using core reset
TsiChungLiew [Wed, 7 Nov 2007 23:56:15 +0000 (17:56 -0600)]
ColdFire: MCF532x - Update do_reset() using core reset

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: Update cpu flag for 4.2-xx compiler
TsiChungLiew [Wed, 7 Nov 2007 23:51:00 +0000 (17:51 -0600)]
ColdFire: Update cpu flag for 4.2-xx compiler

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoMerge branch 'mpc8610'
Jon Loeliger [Wed, 7 Nov 2007 20:17:05 +0000 (14:17 -0600)]
Merge branch 'mpc8610'

16 years agoMerge branch 'for-1.3.0'
Jon Loeliger [Wed, 7 Nov 2007 20:16:49 +0000 (14:16 -0600)]
Merge branch 'for-1.3.0'

16 years agoMerge commit 'remotes/wd/master'
Jon Loeliger [Wed, 7 Nov 2007 20:16:14 +0000 (14:16 -0600)]
Merge commit 'remotes/wd/master'

16 years ago8610: Add console frame buffer support to FSL 8610 DIU driver.
York Sun [Wed, 31 Oct 2007 19:59:04 +0000 (14:59 -0500)]
8610: Add console frame buffer support to FSL 8610 DIU driver.

Add cfb console support to FSL 8610 DIU driver.
Inspect board version from PIXIS to obtain correct pixel format.

Use #define CONFIG_VIDEO in config file to enable fb console.

To switch monitor, set monitor variable to
0 - DVI, 1 - Single link LVDS, 2 - Double link LVDS
followed by "diufb init".

Preserve logo bitmap at the top of the fb console.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years ago8610: Add 8610 DIU display driver
York Sun [Mon, 29 Oct 2007 18:58:39 +0000 (13:58 -0500)]
8610: Add 8610 DIU display driver

1280x1024 and 1024x768 @ 32 bpp are supported now.
DVI, Single-link LVDS, Double-link LVDS are all supported.

Environmental variable "monitor" is used to specify monitor port.

A new command "diufb" is introduced to reinitialize monitor
and display a BMP file in the memory. So far, 1-bit, 4-bit,
8-bit and 24-bit BMP formats are supported.

    diufb init
        - initialize the diu driver
    Enable the port specified in the environmental variable "monitor"

    diufb addr
        - display bmp file in memory.
    The bmp image should be no bigger than the resolution, 1280x1024
    for DVI and double-link LVDS, 1024x768 for single-link LVDS.

Note, this driver allocate memory but doesn't free it after use
It is written on purpose -- to avoid a failure of reallocation
due to memory fragement.

ECC of DDR is disabled for DIU performance. L2 data cache is also disabled.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Jon loeliger <jdl@freescale.com>
16 years agoFSL: Add a freescale bitmap logo.
York Sun [Wed, 31 Oct 2007 15:43:59 +0000 (10:43 -0500)]
FSL: Add a freescale bitmap logo.

This Freescale logo is a 340 x 128 x 4bpp BMP file
that can be displayed by the DIU Framebuffer driver.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years ago8610: Make some extra debug environment variables conditional.
York Sun [Mon, 29 Oct 2007 18:57:53 +0000 (13:57 -0500)]
8610: Make some extra debug environment variables conditional.

One may #define ENV_DEBUG to get them back again.

Signed-off-by: York Sun <yorksun@freescale.com>
16 years ago8610: Actually enable pixis_reset CONFIGs
Jason Jin [Mon, 29 Oct 2007 11:26:21 +0000 (19:26 +0800)]
8610: Actually enable pixis_reset CONFIGs

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
16 years agoFix the BAT definition of PCI IO on 8610 board
Jason Jin [Fri, 26 Oct 2007 10:31:59 +0000 (18:31 +0800)]
Fix the BAT definition of PCI IO on 8610 board

The address in the BAT register is aligned with the BAT size.
The original definition actually did not define BAT for PCIE2 IO.
This patch fix this.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
16 years agoUnify pixis_reset altbank across board families
Jason Jin [Mon, 29 Oct 2007 11:26:21 +0000 (19:26 +0800)]
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>
16 years agomake 8610 board use pixis reset
Jason Jin [Fri, 26 Oct 2007 10:32:00 +0000 (18:32 +0800)]
make 8610 board use pixis reset

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
16 years ago86xx: Fix broken variable reference when #def DEBUGing.
Jon Loeliger [Thu, 1 Nov 2007 17:23:29 +0000 (12:23 -0500)]
86xx: Fix broken variable reference when #def DEBUGing.

Sometimes you can't reference the DDR2 controller variables.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years agoMerge commit 'remotes/wd/master' into newmaster
Jon Loeliger [Wed, 7 Nov 2007 20:08:15 +0000 (14:08 -0600)]
Merge commit 'remotes/wd/master' into newmaster

16 years agoImplement general ULi 526x Ethernet driver support in U-boot
Roy Zang [Mon, 5 Nov 2007 09:39:24 +0000 (17:39 +0800)]
Implement general ULi 526x Ethernet driver support in U-boot

This patch implements general ULi 526x Ethernet driver.
Until now, it is the only native Ethernet port on
MPC8610HPCD board, but it could be used on other boards
with ULi 526x Ethernet port as well.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Acked-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
16 years agoNET: Add Ethernet 1000BASE-X support for PPC4xx
Larry Johnson [Thu, 1 Nov 2007 13:46:50 +0000 (08:46 -0500)]
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>
16 years agoNET: Cosmetic changes
Larry Johnson [Wed, 31 Oct 2007 16:21:29 +0000 (11:21 -0500)]
NET: Cosmetic changes

Signed-off-by: Larry Johnson <lrj@acm.org>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
16 years agoMerge git://www.denx.de/git/u-boot
Ben Warren [Tue, 6 Nov 2007 15:17:40 +0000 (10:17 -0500)]
Merge git://www.denx.de/git/u-boot

16 years agoCleanup coding style; update CHANGELOG
Wolfgang Denk [Sat, 3 Nov 2007 22:09:27 +0000 (23:09 +0100)]
Cleanup coding style; update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agofix wording in README
Bruce Adler [Fri, 2 Nov 2007 20:15:42 +0000 (13:15 -0700)]
fix wording in README

Changed the wording to properly describe the shadowing
of the environment from ROM to RAM

Signed-off-by: Bruce Adler <bruce.adler@acm.org>
16 years agoblackfin: Move `-D__BLACKFIN__' to $(ARCH)_config.mk
Shinya Kuribayashi [Tue, 30 Oct 2007 17:18:15 +0000 (02:18 +0900)]
blackfin: Move `-D__BLACKFIN__' to $(ARCH)_config.mk

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoTrimmed some variables in ne2000.c
Vlad Lungu [Thu, 25 Oct 2007 13:08:14 +0000 (16:08 +0300)]
Trimmed some variables in ne2000.c

Signed-off-by: Vlad Lungu <vlad@comsys.ro>
16 years agoFix the issue of usb_kbd driver missing the scan code of key 'z'.
Zhang Wei [Thu, 25 Oct 2007 09:51:27 +0000 (17:51 +0800)]
Fix the issue of usb_kbd driver missing the scan code of key 'z'.

The scan code of the key 'z' is 0x1d, which should be handled.

The change has be tested on NOVATEK USB keyboard and ULI PCI OHCI
controller.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
16 years agoFix USB support issue for MPC8641HPCN board.
Zhang Wei [Thu, 25 Oct 2007 09:30:04 +0000 (17:30 +0800)]
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>
16 years agoUse config_cmd_default.h instead of config_cmd_all.h
Jean-Christophe PLAGNIOL-VILLARD [Wed, 24 Oct 2007 16:16:01 +0000 (18:16 +0200)]
Use config_cmd_default.h instead of config_cmd_all.h

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoTQM5200: Call usb_cpu_init() during board init
Marian Balakowicz [Tue, 23 Oct 2007 23:37:36 +0000 (01:37 +0200)]
TQM5200: Call usb_cpu_init() during board init

usb_cpu_init() configures GPS USB pins, clocks, etc. and
is required for proper operation of kernel USB subsystem.
This setup was previously done in the kernel by the fixup
code which is being removed, thus low level init must be
done by U-boot now.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
16 years agoFix typo in nfs.c
Guennadi Liakhovetski [Tue, 23 Oct 2007 14:25:50 +0000 (16:25 +0200)]
Fix typo in nfs.c

An obvious typo. Originally fixed in linkstation u-boot port.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agoFix a typo in cpu/mpc824x/interrupts.c
Guennadi Liakhovetski [Tue, 23 Oct 2007 12:35:05 +0000 (14:35 +0200)]
Fix a typo in cpu/mpc824x/interrupts.c

Since December 2003 the timer_interrupt_cpu() function in
cpu/mpc824x/interrupts.c contains what seems to be a superfluous
parameter. Remove it.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agoadd ft_cpu_setup(..) on mpc8260
Sergej Stepanov [Wed, 17 Oct 2007 09:13:51 +0000 (11:13 +0200)]
add ft_cpu_setup(..) on mpc8260

Add ft_cpu_setup(..)-function to adapt it for use with libfdt
based on code from mpc5xxx

Sigend-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de>
--

16 years agochanges for IDS8247 board support
Sergej Stepanov [Wed, 17 Oct 2007 09:18:42 +0000 (11:18 +0200)]
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>
--

16 years agoMerge commit 'remotes/wd/master'
Jon Loeliger [Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)]
Merge commit 'remotes/wd/master'

16 years agoMerge git://www.denx.de/git/u-boot
Ben Warren [Fri, 2 Nov 2007 15:20:41 +0000 (11:20 -0400)]
Merge git://www.denx.de/git/u-boot

16 years agoMerge branch 'master' of /home/wd/git/u-boot/work
Wolfgang Denk [Fri, 2 Nov 2007 14:09:22 +0000 (15:09 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/work

16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 2 Nov 2007 14:09:10 +0000 (15:09 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoATSTK1002: Remove default ethernet addresses
Haavard Skinnemoen [Wed, 24 Oct 2007 13:48:37 +0000 (15:48 +0200)]
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>
16 years agoDHCP Client Fix
Justin Flammia [Mon, 29 Oct 2007 21:40:35 +0000 (17:40 -0400)]
DHCP Client Fix

This is a multi-part message in MIME format.

commit e6e505eae94ed721e123e177489291fc4544b7b8
Author: Justin Flammia <jflammia@savantav.com>
Date:   Mon Oct 29 17:19:03 2007 -0400

    Found a bug in the way the DHCP Request packet is built, where the IP address
    that is offered by the server is bound to prematurely. This patch is a fix of
    that bug where the IP address offered by the DHCP server is not used until
    after the DHCP ACK from the server is received.

Signed-off-by: Justin Flammia <jflammia@savantav.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Wolfgang Denk [Thu, 1 Nov 2007 21:58:59 +0000 (22:58 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-arm
Wolfgang Denk [Thu, 1 Nov 2007 21:57:33 +0000 (22:57 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-arm

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-tq-group
Wolfgang Denk [Thu, 1 Nov 2007 21:56:16 +0000 (22:56 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group

16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Thu, 1 Nov 2007 21:55:23 +0000 (22:55 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Thu, 1 Nov 2007 21:54:31 +0000 (22:54 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mips

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Wolfgang Denk [Thu, 1 Nov 2007 21:38:01 +0000 (22:38 +0100)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

16 years agoDHCP Client Fix
Justin Flammia [Mon, 29 Oct 2007 21:40:35 +0000 (17:40 -0400)]
DHCP Client Fix

This is a multi-part message in MIME format.

commit e6e505eae94ed721e123e177489291fc4544b7b8
Author: Justin Flammia <jflammia@savantav.com>
Date:   Mon Oct 29 17:19:03 2007 -0400

    Found a bug in the way the DHCP Request packet is built, where the IP address
    that is offered by the server is bound to prematurely. This patch is a fix of
    that bug where the IP address offered by the DHCP server is not used until
    after the DHCP ACK from the server is received.

Signed-off-by: Justin Flammia <jflammia@savantav.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
16 years agoMerge git://www.denx.de/git/u-boot
Stefan Roese [Sat, 27 Oct 2007 11:43:40 +0000 (13:43 +0200)]
Merge git://www.denx.de/git/u-boot

16 years agoColdFire 54455: Fix correct boot location for atmel and intel
TsiChungLiew [Thu, 25 Oct 2007 22:16:22 +0000 (17:16 -0500)]
ColdFire 54455: Fix correct boot location for atmel and intel

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: Fix build error when CONFIG_WATCHDOG is defined
TsiChungLiew [Thu, 25 Oct 2007 22:14:00 +0000 (17:14 -0500)]
ColdFire: Fix build error when CONFIG_WATCHDOG is defined

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>