Commit Graph

3565 Commits

Author SHA1 Message Date
Kumar Gala
e93becf80d 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>
2007-11-21 14:01:49 -06:00
Kumar Gala
f738b4a759 Make no options to fdt print default to '/'
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2007-11-21 14:01:49 -06:00
Kumar Gala
a3c2933e02 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>
2007-11-21 14:01:49 -06:00
Grant Likely
98e2867cc8 [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>
2007-11-21 09:19:37 -07:00
Kumar Gala
ed1353d74b [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>
2007-11-21 08:49:50 -06:00
Grant Likely
4a43719a77 [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>
2007-11-20 22:33:54 -07:00
Grant Likely
2f155f6c0a [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>
2007-11-20 22:33:38 -07:00
Jean-Christophe PLAGNIOL-VILLARD
080c646dbf drivers/i2c : move i2c drivers to drivers/i2c
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-20 20:14:18 +01:00
Grant Likely
f92edbd8a0 Merge branch 'origin' into kconfig-for-1.3.1 2007-11-20 08:19:56 -07:00
Wolfgang Denk
9a337ddc15 Prepare for 1.3.0 release.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-19 22:20:24 +01: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
Shinya Kuribayashi
f8c3206093 [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>
2007-11-19 21:49:51 +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
Jean-Christophe PLAGNIOL-VILLARD
6bf4c686af 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>
2007-11-18 21:50:07 +01:00
Jean-Christophe PLAGNIOL-VILLARD
6073f61e07 pb1x00 board: Fix u16 status declaration when PCMCIA is defined
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-18 21:49:00 +01:00
Wolfgang Denk
8412d814ce Fix compiler warnings for ARM systems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-18 17:11:09 +01:00
Wolfgang Denk
409ecdc0bb Fix compiler warnings for PPC systems. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-18 16:36:27 +01:00
Jean-Christophe PLAGNIOL-VILLARD
079c2c4fa7 Fix warning differ in signedness in net/net.c and net/nfs.c 2007-11-18 01:29:38 +01:00
Wolfgang Denk
0b20335015 Merge branch 'master' of git://www.denx.de/git/u-boot-mips 2007-11-18 01:26:14 +01:00
Shinya Kuribayashi
7e14fc6536 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>
2007-11-18 01:22:29 +01:00
Stefan Roese
2309c130aa Fix warning differ in signedness in common/cmd_scsi.c
Signed-off-by: Stefan Roese <sr@denx.de>
2007-11-18 01:20:41 +01:00
Shinya Kuribayashi
7e1d884b7c [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>
2007-11-17 20:05:26 +09:00
Shinya Kuribayashi
16664f7285 [MIPS] Remove useless instructions for initializing $gp.
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2007-11-17 20:05:26 +09:00
Shinya Kuribayashi
03c031d566 [MIPS] MIPS 4K core: Coding style cleanups
No logical changes.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2007-11-17 20:05:26 +09:00
Shinya Kuribayashi
f5e429d386 [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>
2007-11-17 20:05:20 +09:00
Shinya Kuribayashi
4fbd0741b2 [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>
2007-11-17 18:54:16 +09:00
Shinya Kuribayashi
f013204597 [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>
2007-11-17 18:54:16 +09:00
Shinya Kuribayashi
b09258c539 MAKEALL: Added missing pb1000 board
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2007-11-17 18:54:16 +09:00
Shinya Kuribayashi
2e4a6e3667 [MIPS] pb1000: Replace obsolete memsetup.S with lowlevel_init.S
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2007-11-17 18:54:16 +09:00
Shinya Kuribayashi
662e5cb397 [MIPS] u-boot.lds: Cleanup __u_boot_cmd_{start,end}
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2007-11-17 18:54:15 +09: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
5947f6999a Update CHANGELOIG, prepare for -rc4
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-17 02:34:38 +01:00
Wolfgang Denk
a75e1a3dda Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire 2007-11-17 02:28:26 +01:00
Wolfgang Denk
9e5285eca4 Merge branch 'master' of git://www.denx.de/git/u-boot-mpc5xxx 2007-11-17 02:00:17 +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
Wolfgang Denk
429c180eda 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>
2007-11-17 01:45:38 +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
Wolfgang Denk
6ecbb7a3fa 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>
2007-11-17 01:30:40 +01:00
Jon Loeliger
d08b7233bc 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>
2007-11-17 00:58:10 +01:00
Jason Jin
f9d9164d9c make 8610 board use pixis reset
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-11-17 00:58:02 +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
ee1f5e3bfe Merge branch 'master' of /home/wd/git/u-boot/work 2007-11-17 00:38:34 +01:00
Jean-Christophe PLAGNIOL-VILLARD
64bf555465 Fix warning: pointer targets in assignment differ in signedness
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-17 00:26:36 +01:00
Jean-Christophe PLAGNIOL-VILLARD
7a60ee7c62 Fix warning differ in signedness in common/cmd_ide.c
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-16 22:42:03 +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
4d4faae65e Group PCI and PCMCIA drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:31:23 -07:00
Grant Likely
5798f87dc1 Group block/flash drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:22:48 -07:00
Grant Likely
df58c81551 Group USB drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:22:48 -07:00