karo-tx-uboot.git
12 years agoPrepare for 1.3.1-rc1 v1.3.1-rc1
Wolfgang Denk [Sun, 2 Dec 2007 23:15:28 +0000 (00:15 +0100)]
Prepare for 1.3.1-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge commit '3deca9d'
Wolfgang Denk [Mon, 26 Nov 2007 21:57:53 +0000 (22:57 +0100)]
Merge commit '3deca9d'

Conflicts:

Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoCleanup coding style; update CHANGELOG
Wolfgang Denk [Mon, 26 Nov 2007 18:18:21 +0000 (19:18 +0100)]
Cleanup coding style; update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge commit '87ddedd'
Wolfgang Denk [Mon, 26 Nov 2007 18:15:04 +0000 (19:15 +0100)]
Merge commit '87ddedd'

12 years agoMAKEALL: add missing 512x boards in ppc
Jean-Christophe PLAGNIOL-VILLARD [Sun, 25 Nov 2007 21:39:25 +0000 (22:39 +0100)]
MAKEALL: add missing 512x boards in ppc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agoMakefile : fix tags ctags etags with new drivers organization
Jean-Christophe PLAGNIOL-VILLARD [Sun, 25 Nov 2007 17:45:47 +0000 (18:45 +0100)]
Makefile : fix tags ctags etags with new drivers organization

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agoMakefile : fix tags ctags etags with new drivers organization
Jean-Christophe PLAGNIOL-VILLARD [Sun, 25 Nov 2007 17:45:47 +0000 (18:45 +0100)]
Makefile : fix tags ctags etags with new drivers organization

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/mtd : move mtd drivers to drivers/mtd
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 20:26:56 +0000 (21:26 +0100)]
drivers/mtd : move mtd drivers to drivers/mtd

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/misc : move misc drivers to drivers/misc
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 20:17:55 +0000 (21:17 +0100)]
drivers/misc : move misc drivers to drivers/misc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/block : move block drivers to drivers/block
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 20:13:59 +0000 (21:13 +0100)]
drivers/block : move block drivers to drivers/block

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/rtc : move rtc drivers to drivers/rtc
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 19:59:50 +0000 (20:59 +0100)]
drivers/rtc : move rtc drivers to drivers/rtc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/hwmon : move hardware monitor drviers to drivers/hwmon
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 19:14:44 +0000 (20:14 +0100)]
drivers/hwmon : move hardware monitor drviers to drivers/hwmon

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/input : move input drivers to drivers/input
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 18:46:45 +0000 (19:46 +0100)]
drivers/input : move input drivers to drivers/input

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/usb : move usb drivers to drivers/usb
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 18:40:11 +0000 (19:40 +0100)]
drivers/usb : move usb drivers to drivers/usb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/serial : move serial drivers to drivers/serial
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 18:33:38 +0000 (19:33 +0100)]
drivers/serial : move serial drivers to drivers/serial

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/net : move net drivers to drivers/net
Jean-Christophe PLAGNIOL-VILLARD [Wed, 21 Nov 2007 20:19:24 +0000 (21:19 +0100)]
drivers/net : move net drivers to drivers/net

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/video : move video drivers to drivers/video
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:41:48 +0000 (20:41 +0100)]
drivers/video : move video drivers to drivers/video

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/pcmcia : move pcmcia drivers to drivers/pcmcia
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:33:09 +0000 (20:33 +0100)]
drivers/pcmcia : move pcmcia drivers to drivers/pcmcia

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agodrivers/pci : move pci drivers to drivers/pci
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:28:09 +0000 (20:28 +0100)]
drivers/pci : move pci drivers to drivers/pci

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agoMerge branch 'testing' of git://www.denx.de/git/u-boot-fdt
Wolfgang Denk [Thu, 22 Nov 2007 23:55:23 +0000 (00:55 +0100)]
Merge branch 'testing' of git://denx.de/git/u-boot-fdt

12 years agoFix fdt printing for updated libfdt
Gerald Van Baren [Thu, 22 Nov 2007 22:23:23 +0000 (17:23 -0500)]
Fix fdt printing for updated libfdt

Also improve printing (adopt dtc v1 "c style" hex format), whitespace cleanup.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
12 years agoAdd additional fdt fixup helper functions
Kumar Gala [Wed, 21 Nov 2007 19:30:15 +0000 (13:30 -0600)]
Add additional fdt fixup helper functions

Added the following fdt fixup helpers:
 * do_fixup_by_prop{_u32} - Find matching nodes by property name/value
 * do_fixup_by_compat{_u32} - Find matching nodes by compat

The _u32 variants work the same only the property they are setting
is know to be a 32-bit integer instead of a byte buffer.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoAdd fdt_fixup_ethernet helper to set mac addresses
Kumar Gala [Wed, 21 Nov 2007 17:11:03 +0000 (11:11 -0600)]
Add fdt_fixup_ethernet helper to set mac addresses

Added a fixup helper that uses aliases to set mac addresses
in the device tree based on the bd_t

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoFix warnings from import of libfdt
Kumar Gala [Wed, 21 Nov 2007 20:07:46 +0000 (14:07 -0600)]
Fix warnings from import of libfdt

cmd_fdt.c: In function fdt_print:
cmd_fdt.c:586: warning: assignment discards qualifiers from pointer target type
cmd_fdt.c:613: warning: assignment discards qualifiers from pointer target type
cmd_fdt.c:635: warning: assignment discards qualifiers from pointer target type
cmd_fdt.c:636: warning: assignment discards qualifiers from pointer target type

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoUpdate libfdt from device tree compiler (dtc)
Kumar Gala [Wed, 24 Oct 2007 16:04:22 +0000 (11:04 -0500)]
Update libfdt from device tree compiler (dtc)

Update libfdt to commit 8eaf5e358366017aa2e846c5038d1aa19958314e from
the device tree compiler (dtc) project.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoMove do_fixup* for libfdt into common code
Kumar Gala [Sun, 4 Nov 2007 00:46:28 +0000 (19:46 -0500)]
Move do_fixup* for libfdt into common code

Moved the generic fixup handling code out of cpu/mpc5xxx and cpu/mpc8260
into common/fdt_support.c and renamed:

do_fixup() -> do_fixup_by_path()
do_fixup_u32()  -> do_fixup_by_path_u32()

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoMake no options to fdt print default to '/'
Kumar Gala [Thu, 25 Oct 2007 21:15:07 +0000 (16:15 -0500)]
Make no options to fdt print default to '/'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoRemoved some nonused fdt functions and moved fdt_find_and_setprop out of libfdt
Kumar Gala [Wed, 24 Oct 2007 15:21:57 +0000 (10:21 -0500)]
Removed some nonused fdt functions and moved fdt_find_and_setprop out of libfdt

Removed:
fdt_node_is_compatible
fdt_find_node_by_type
fdt_find_compatible_node

To ease merge of newer libfdt as we aren't using them anywhere at this time.

Also moved fdt_find_and_setprop out of libfdt into fdt_support.c for the same
reason.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years ago[BUILD] Remove libraries when updating autoconf.mk
Grant Likely [Wed, 21 Nov 2007 16:19:37 +0000 (09:19 -0700)]
[BUILD] Remove libraries when updating autoconf.mk

Fix library problems caused by conditional compilation.  Using
autoconf.mk to decide which files to compile has caused a problem when
changing configuration from one board to another without clearing out
the library (*.a) files.

It used to be that the linker was always passed the same list of .o
files when building the .a files.  However, that is not longer true
with conditional compilation.  Now, a different board config will have
a different file list passed to the linker.  The problem occurs when
a library has already been built and the board config is changed.

Since the linker will update instead of replace a preexisting library,
then if the file list changes to remove some object files the old
objects will still exist in the library.

The solution is to remove all old library files when autoconf.mk is
made.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years ago[BUILD] conditionally compile libfdt/*.c in libfdt/Makefile
Kumar Gala [Wed, 21 Nov 2007 14:49:50 +0000 (08:49 -0600)]
[BUILD] conditionally compile libfdt/*.c in libfdt/Makefile

Modify libfdt/Makefile to conditionally compile the *.c files based
on the board config.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years ago[BUILD] conditionally compile common/cmd_*.c in common/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
[BUILD] conditionally compile common/cmd_*.c in common/Makefile

Modify common/Makefile to conditionally compile the cmd_*.c files based
on the board config.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years ago[BUILD] Generate include/autoconf.mk from board config files
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
[BUILD] Generate include/autoconf.mk from board config files

Use cpp and sed to postprocess config.h and import the defined values
into include/autoconf.mk.  autoconf.mk is then included by config.mk to
give 'make' access to the board configuration.

Doing this enables conditional compilation at the Makefile level instead
of by wrapping every .c file with #ifdef/#endif wrappers.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agodrivers/i2c : move i2c drivers to drivers/i2c
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:14:18 +0000 (20:14 +0100)]
drivers/i2c : move i2c drivers to drivers/i2c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12 years agoMerge branch 'origin' into kconfig-for-1.3.1
Grant Likely [Tue, 20 Nov 2007 15:19:56 +0000 (08:19 -0700)]
Merge branch 'origin' into kconfig-for-1.3.1

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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

12 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://denx.de/git/u-boot-mips

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agoMerge branch 'origin' into kconfig-for-1.3.1
Grant Likely [Sat, 17 Nov 2007 04:01:19 +0000 (21:01 -0700)]
Merge branch 'origin' into kconfig-for-1.3.1

Conflicts:

drivers/Makefile

12 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>
12 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://denx.de/git/u-boot-coldfire

12 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://denx.de/git/u-boot-mpc5xxx

12 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>
12 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>
12 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>
12 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>
12 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://denx.de/git/u-boot-ppc4xx

12 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>
12 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>
12 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>
12 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>
12 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

12 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>
12 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>
12 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://denx.de/git/u-boot-net

12 years agoGroup PCI and PCMCIA drivers in drivers/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
Group PCI and PCMCIA drivers in drivers/Makefile

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoGroup block/flash drivers in drivers/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
Group block/flash drivers in drivers/Makefile

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoGroup USB drivers in drivers/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
Group USB drivers in drivers/Makefile

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoGroup i2c drivers in drivers/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:30 +0000 (09:05 -0600)]
Group i2c drivers in drivers/Makefile

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoGroup console drivers in drivers/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:30 +0000 (09:05 -0600)]
Group console drivers in drivers/Makefile

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoGroup network drivers in drivers/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:30 +0000 (09:05 -0600)]
Group network drivers in drivers/Makefile

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoBuild: split COBJS value into multiple lines
Grant Likely [Mon, 24 Sep 2007 15:05:30 +0000 (09:05 -0600)]
Build: split COBJS value into multiple lines

This change is in preparation for condtitionial compile support in the
build system.  By spliting them all into seperate lines now, subsequent
patches that change 'COBJS-y += ' into 'COBJS-$(CONFIG_<blah>) += ' will
be less invasive and easier to review

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
12 years agoAdd .gitignore files
Grant Likely [Mon, 24 Sep 2007 15:05:30 +0000 (09:05 -0600)]
Add .gitignore files

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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://denx.de/git/u-boot

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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