summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* ppc4xx: Correct GPIO offset in gpio_config()Stefan Roese2007-12-11-1/+1
| | | | | | Thanks to Gary Jennejohn for pointing this out. Signed-off-by: Stefan Roese <sr@denx.de>
* rtc: Fix merging problemStefan Roese2007-12-11-0/+0
| | | | Signed-off-by: Stefan Roese <sr@denx.de>
* Merge commit 'u-boot/master' into for-1.3.1Stefan Roese2007-12-11-1916/+6451
|\ | | | | | | | | | | Conflicts: drivers/rtc/Makefile
| * Release v1.3.1Wolfgang Denk2007-12-06-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * ADS5121 Board: fix compile problem.Wolfgang Denk2007-12-06-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Prepare for 1.3.1-rc1Wolfgang Denk2007-12-03-2/+26
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge commit '3deca9d'Wolfgang Denk2007-11-26-22/+36
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * MAKEALL: add missing 512x boards in ppcJean-Christophe PLAGNIOL-VILLARD2007-11-26-0/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * Makefile : fix tags ctags etags with new drivers organizationJean-Christophe PLAGNIOL-VILLARD2007-11-26-8/+33
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Cleanup coding style; update CHANGELOGWolfgang Denk2007-11-26-16/+370
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Merge commit '87ddedd'Wolfgang Denk2007-11-26-193/+544
| |\ \
| | * | Makefile : fix tags ctags etags with new drivers organizationJean-Christophe PLAGNIOL-VILLARD2007-11-25-2/+14
| | |/ | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/mtd : move mtd drivers to drivers/mtdJean-Christophe PLAGNIOL-VILLARD2007-11-25-20/+15
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/misc : move misc drivers to drivers/miscJean-Christophe PLAGNIOL-VILLARD2007-11-25-11/+49
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/block : move block drivers to drivers/blockJean-Christophe PLAGNIOL-VILLARD2007-11-25-5/+51
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/rtc : move rtc drivers to drivers/rtcJean-Christophe PLAGNIOL-VILLARD2007-11-25-3/+3
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/hwmon : move hardware monitor drviers to drivers/hwmonJean-Christophe PLAGNIOL-VILLARD2007-11-25-6/+6
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/input : move input drivers to drivers/inputJean-Christophe PLAGNIOL-VILLARD2007-11-25-9/+49
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/usb : move usb drivers to drivers/usbJean-Christophe PLAGNIOL-VILLARD2007-11-25-12/+54
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/serial : move serial drivers to drivers/serialJean-Christophe PLAGNIOL-VILLARD2007-11-25-9/+13
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/net : move net drivers to drivers/netJean-Christophe PLAGNIOL-VILLARD2007-11-25-50/+48
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/video : move video drivers to drivers/videoJean-Christophe PLAGNIOL-VILLARD2007-11-25-9/+55
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/pcmcia : move pcmcia drivers to drivers/pcmciaJean-Christophe PLAGNIOL-VILLARD2007-11-24-9/+51
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/pci : move pci drivers to drivers/pciJean-Christophe PLAGNIOL-VILLARD2007-11-24-6/+52
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * drivers/i2c : move i2c drivers to drivers/i2cJean-Christophe PLAGNIOL-VILLARD2007-11-20-8/+50
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Merge branch 'testing' of git://www.denx.de/git/u-boot-fdtWolfgang Denk2007-11-23-781/+1793
| |\ \
| | * | Fix fdt printing for updated libfdtGerald Van Baren2007-11-22-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | Also improve printing (adopt dtc v1 "c style" hex format), whitespace cleanup. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * | Add additional fdt fixup helper functionsKumar Gala2007-11-21-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Add fdt_fixup_ethernet helper to set mac addressesKumar Gala2007-11-21-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Fix warnings from import of libfdtKumar Gala2007-11-21-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Update libfdt from device tree compiler (dtc)Kumar Gala2007-11-21-533/+1589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update libfdt to commit 8eaf5e358366017aa2e846c5038d1aa19958314e from the device tree compiler (dtc) project. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | Move do_fixup* for libfdt into common codeKumar Gala2007-11-21-57/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Make no options to fdt print default to '/'Kumar Gala2007-11-21-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | Removed some nonused fdt functions and moved fdt_find_and_setprop out of libfdtKumar Gala2007-11-21-144/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | [BUILD] conditionally compile libfdt/*.c in libfdt/MakefileKumar Gala2007-11-21-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify libfdt/Makefile to conditionally compile the *.c files based on the board config. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | [BUILD] Remove libraries when updating autoconf.mkGrant Likely2007-11-21-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | [BUILD] conditionally compile common/cmd_*.c in common/MakefileGrant Likely2007-11-20-198/+46
| | | | | | | | | | | | | | | | | | | | | Modify common/Makefile to conditionally compile the cmd_*.c files based on the board config. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | [BUILD] Generate include/autoconf.mk from board config filesGrant Likely2007-11-20-1/+49
| |/ | | | | | | | | | | | | | | | | | | | | 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>
| * Merge branch 'origin' into kconfig-for-1.3.1Grant Likely2007-11-20-183/+437
| |\
| | * Prepare for 1.3.0 release.Wolfgang Denk2007-11-19-1/+68
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Move CONFIG_QE out of CONFIG_PCI wrap for MPC8568MDSHaiying Wang2007-11-19-5/+5
| | | | | | | | | | | | | | | | | | CONFIG_QE shouldn't be in the wrap of CONFIG_PCI, fix it. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
| | * [MIPS] board/gth2/lowlevel_init.S: Fix a build warningShinya Kuribayashi2007-11-19-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix build problems with mp2usb boardWolfgang Denk2007-11-19-2/+4
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * s3c24x0: Fix usb_ohci.c missing in MakefileJean-Christophe PLAGNIOL-VILLARD2007-11-18-8/+8
| | | | | | | | | | | | | | | | | | and usb_ohci.c warning differ in signedness Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * pb1x00 board: Fix u16 status declaration when PCMCIA is definedJean-Christophe PLAGNIOL-VILLARD2007-11-18-0/+2
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * Fix compiler warnings for ARM systems.Wolfgang Denk2007-11-18-8/+11
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Fix compiler warnings for PPC systems. Update CHANGELOG.Wolfgang Denk2007-11-18-12/+187
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Fix warning differ in signedness in net/net.c and net/nfs.cJean-Christophe PLAGNIOL-VILLARD2007-11-18-9/+9
| | |
| | * Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2007-11-18-134/+132
| | |\
| | | * [MIPS] cpu/mips/config.mk: Fix GNU assembler minor version pickerShinya Kuribayashi2007-11-17-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>