summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
* 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>
| | * [MIPS] Remove useless instructions for initializing $gp.Shinya Kuribayashi2007-11-17-3/+1
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * [MIPS] MIPS 4K core: Coding style cleanupsShinya Kuribayashi2007-11-17-47/+39
| | | | | | | | | | | | | | | | | | No logical changes. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * [MIPS] gth2.c: Fix a warning on gth2 build.Shinya Kuribayashi2007-11-17-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [MIPS] au1x00_eth.c: Fixed a warning on pb1000 build.Shinya Kuribayashi2007-11-17-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [MIPS] au1x00_eth.c: Fix au1x00_miiphy_{read,write} build errorShinya Kuribayashi2007-11-17-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * MAKEALL: Added missing pb1000 boardShinya Kuribayashi2007-11-17-0/+1
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * [MIPS] pb1000: Replace obsolete memsetup.S with lowlevel_init.SShinya Kuribayashi2007-11-17-3/+3
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * [MIPS] u-boot.lds: Cleanup __u_boot_cmd_{start,end}Shinya Kuribayashi2007-11-17-22/+30
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | gth2.c: Fix a warning on gth2 build.Shinya Kuribayashi2007-11-18-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix warning differ in signedness in common/cmd_scsi.cStefan Roese2007-11-18-3/+6
| |/ | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'origin' into kconfig-for-1.3.1Grant Likely2007-11-16-243/+1997
|\ \ | |/ | | | | | | | | Conflicts: drivers/Makefile
| * Update CHANGELOIG, prepare for -rc4Wolfgang Denk2007-11-17-1/+323
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2007-11-17-22/+362
| |\
| | * ColdFire: MCF5329 - Remove reset registers from CCMTsiChungLiew2007-11-08-12/+9
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5329 - Add Reset structure to immap_5329.hTsiChungLiew2007-11-08-0/+5
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5329 - revert include/asm-m68k/m5329.h file modeTsiChungLiew2007-11-08-0/+0
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5445x - Update correct RAMBAR and missing linker filesTsiChungLiew2007-11-07-3/+288
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF532x - Update do_reset() using core resetTsiChungLiew2007-11-07-7/+19
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: Update cpu flag for 4.2-xx compilerTsiChungLiew2007-11-07-0/+41
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| * | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc5xxxWolfgang Denk2007-11-17-0/+0
| |\ \
| * | | Fix the i2c frequency and default address in rsdproto boardLuotao Fu2007-11-17-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rsdproto board support has wrong I2C frequency and wrong return value handling. Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
| * | | powerpc: Backout relocation changes for MPC5121, too.Wolfgang Denk2007-11-17-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | powerpc: Backout relocation changes.Grant Likely2007-11-17-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Fixed mips_io_port_base build errors.Jean-Christophe PLAGNIOL-VILLARD2007-11-17-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2007-11-17-11/+19
| |\ \ \
| | * | | ppc4xx: lwmon5: Change PHY reset sequence for PHY MDIO address latchingStefan Roese2007-11-13-9/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| | * | | Merge branch 'master' of git://www.denx.de/git/u-bootStefan Roese2007-11-13-415/+1020
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge git://www.denx.de/git/u-bootStefan Roese2007-10-27-228/+573
| | |\ \ \
| | * | | | ppc4xx: lwmon5: Some further GPIO config changesStefan Roese2007-10-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | | | | Fix a bug in the slave serial programming mode for the XilinxWolfgang Denk2007-11-17-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | 86xx: Fix broken variable reference when #def DEBUGing.Jon Loeliger2007-11-17-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes you can't reference the DDR2 controller variables. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | | | | make 8610 board use pixis resetJason Jin2007-11-17-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * | | | | Unify pixis_reset altbank across board familiesJason Jin2007-11-17-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Merge branch 'master' of /home/wd/git/u-boot/workWolfgang Denk2007-11-17-7/+7
| |\ \ \ \ \
| | * | | | | Fix warning: pointer targets in assignment differ in signednessJean-Christophe PLAGNIOL-VILLARD2007-11-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * | | | | Fix warning differ in signedness in common/cmd_ide.cJean-Christophe PLAGNIOL-VILLARD2007-11-16-6/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | | Merge branch 'master' of git://www.denx.de/git/u-boot-netWolfgang Denk2007-11-16-179/+1227
| |\ \ \ \ \
| | * | | | | Implement general ULi 526x Ethernet driver support in U-bootRoy Zang2007-11-06-1/+1001
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>