]> git.karo-electronics.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
16 years agoDM9000 fix status check fail 0x6d error for trizeps board
Remy Bohmer [Thu, 5 Jun 2008 11:03:36 +0000 (13:03 +0200)]
DM9000 fix status check fail 0x6d error for trizeps board

According to the Application Notes of the DM9000, only the 2 bits 0:1 of
the status byte need to be checked to identify a valid packet in the fifo

But, The several different Application Notes do not all speak the same
language on these bits. They do not disagree, but only 1 Application Note
noted explicitly that only these 2 bits need to be checked.
Even the datasheets do not mention anything about these 2 bits.

Because the old code, and the kernel check the whole byte, I left this piece
untouched.

However, I tested all board/DM9000[A|E|EP] devices with this 2 bit check, so
it should work.

Notice, that the 2nd iteration through this receive loop (when a 2nd packet is
in the fifo) is much shorter now, compared to the older U-boot driver code,
so that we can maybe run into a hardware condition now that was never seen
before, or maybe was seen very unfrequently.

Additionaly added a cleanup of a stack variable.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoGet rid of annoying/superfluous bad-checksum warning message
Remy Bohmer [Tue, 3 Jun 2008 13:48:17 +0000 (15:48 +0200)]
Get rid of annoying/superfluous bad-checksum warning message

U-boot can complain a lot about 'checksum bad' when it is attached to the network.
It is annoying for ordinary users who start to doubt the network connection
in general when they see messages like this.

This is caused by the routine NetCksumOk() which cannot handle IP-headers longer
than 20 bytes. Those packages can be ignored anyway by U-boot, so we trash them
now before checking the checksum.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoFix order for reading rx-status registers in 32bit mode of DM9000
Remy Bohmer [Wed, 4 Jun 2008 08:47:25 +0000 (10:47 +0200)]
Fix order for reading rx-status registers in 32bit mode of DM9000

A last minute cleanup before submitting the DM9000A patch series yesterday introduced
a bug in reading the rx-status registers in 32bit mode only.
This patch repairs this.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoDM9000: Some minor code cleanups
Remy Bohmer [Tue, 3 Jun 2008 13:26:26 +0000 (15:26 +0200)]
DM9000: Some minor code cleanups

Some lines of the U-boot DM9000x driver are longer than 80 characters, or
need some other minor cleanup.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoDM9000: Make driver work properly for DM9000A
Remy Bohmer [Tue, 3 Jun 2008 13:26:25 +0000 (15:26 +0200)]
DM9000: Make driver work properly for DM9000A

The DM9000A network controller does not work with the U-boot DM9000x driver.
Analysis showed that many incoming packets are lost.

The DM9000A Application Notes V1.20 (section 5.6.1) recommend that the poll to
check for a valid rx packet be done on the interrupt status register, not
directly by performing the dummy read and the rx status check as is currently
the case in the u-boot driver.

When the recommended poll is done as suggested the driver starts working
correctly on 10Mbit/HD, but on 100MBit/FD packets come in faster so that there
can be more than 1 package in the fifo at the same time.

The driver must perform the rx-status check in a loop and read and handle all
packages until there is no more left _after_ the interrupt RX flag is set.

This change has been tested with DM9000A, DM9000E, DM9000EP.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoDM9000: Improve eth_reset() routine
Remy Bohmer [Tue, 3 Jun 2008 13:26:24 +0000 (15:26 +0200)]
DM9000: Improve eth_reset() routine

According to the application notes of the DM9000 v1.22 chapter 5.2 bullet 2, the
reset procedure must be done twice to properly reset the DM9000 by means of software.
This errata is not needed anymore for the DM9000A, but it does not bother it.

This change has been tested with DM9000A, DM9000E, DM9000EP.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoDM9000: improve eth_send() routine
Remy Bohmer [Tue, 3 Jun 2008 13:26:23 +0000 (15:26 +0200)]
DM9000: improve eth_send() routine

The eth_send routine of the U-boot DM9000x driver does not match the
DM9000 or DM9000A application notes/programming guides.

This change improves the stability of the DM9000A network controller.

This change has been tested with DM9000A, DM9000E, DM9000EP.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoDM9000: repair debug logging
Remy Bohmer [Tue, 3 Jun 2008 13:26:22 +0000 (15:26 +0200)]
DM9000: repair debug logging

It seems that the debugging code of the DM9000x driver in U-boot has not been
compiled for a long time, because it cannot compile...

Also rearranged some loglines to get more useful info while debugging.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoDM9000: Add data bus-width auto detection.
Remy Bohmer [Tue, 3 Jun 2008 13:26:21 +0000 (15:26 +0200)]
DM9000: Add data bus-width auto detection.

The U-boot DM9000x driver contains a compile time bus-width definition for
the databus connected to the network controller.

This compile check makes the code unclear, inflexible and is unneccessary.
It can be asked to the network controller what its bus-width is by reading bits
6 and 7 of the interrupt status register.

The linux kernel already uses a runtime mechanism to determine this bus-width,
so the implementation below looks somewhat like that implementation.

This change has been tested with DM9000A, DM9000E, DM9000EP.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot
Ben Warren [Tue, 3 Jun 2008 05:55:42 +0000 (22:55 -0700)]
Merge branch 'master' of git://www.denx.de/git/u-boot

16 years agoE1000: Add support for the 82541GI LF Intel Pro 1000 GT Desktop Adapter
Wolfgang Grandegger [Wed, 28 May 2008 17:55:19 +0000 (19:55 +0200)]
E1000: Add support for the 82541GI LF Intel Pro 1000 GT Desktop Adapter

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoColdFire: Add 10 base ethernet support for mcf5445x
TsiChung Liew [Wed, 28 May 2008 18:06:25 +0000 (13:06 -0500)]
ColdFire: Add 10 base ethernet support for mcf5445x

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 27 May 2008 10:56:01 +0000 (12:56 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

Conflicts:

include/configs/socrates.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoSocrates: Added USB support.
Sergei Poselenov [Tue, 27 May 2008 09:49:13 +0000 (11:49 +0200)]
Socrates: Added USB support.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoUSB: add new configuration variable CONFIG_PCI_OHCI_DEVNO
Sergei Poselenov [Tue, 27 May 2008 09:35:02 +0000 (11:35 +0200)]
USB: add new configuration variable CONFIG_PCI_OHCI_DEVNO

In case of several PCI USB controllers on a board this variable
specifys which controller to use.
See doc/README.generic_usb_ohci for details.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoSocrates: add support for DS75 Digital Thermo Sensor on I2C bus.
Sergei Poselenov [Tue, 27 May 2008 08:36:07 +0000 (10:36 +0200)]
Socrates: add support for DS75 Digital Thermo Sensor on I2C bus.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoSocrates: Config file cleanup.
Sergei Poselenov [Mon, 26 May 2008 16:16:04 +0000 (18:16 +0200)]
Socrates: Config file cleanup.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoAdd Marvell 88E1118 support for TSEC
Ron Madrid [Fri, 23 May 2008 22:37:05 +0000 (15:37 -0700)]
Add Marvell 88E1118 support for TSEC

Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agosmc911x: add 16 bit support
Jens Gehrlein [Mon, 5 May 2008 12:06:11 +0000 (14:06 +0200)]
smc911x: add 16 bit support

Signed-off-by: Jens Gehrlein <sew_s@tqs.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoUSB: replace old swap_ with proper endianess conversion macros
Christian Eggers [Wed, 21 May 2008 20:12:00 +0000 (22:12 +0200)]
USB: replace old swap_ with proper endianess conversion macros

Signed-off-by: Christian Eggers <ceggers@gmx.de>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
16 years agoFix endianess conversion in usb_ohci.c
Christian Eggers [Wed, 21 May 2008 19:29:10 +0000 (21:29 +0200)]
Fix endianess conversion in usb_ohci.c

Signed-off-by: Christian Eggers <ceggers@gmx.de>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
16 years agoUSB: add support for multiple PCI OHCI controllers
Sergei Poselenov [Wed, 21 May 2008 23:15:53 +0000 (01:15 +0200)]
USB: add support for multiple PCI OHCI controllers

Add new configuration variable CONFIG_PCI_OHCI_DEVNO.
In case of several PCI USB controllers on a board this variable
specifys which controller to use.

Also add USB support for sokrates board.

See doc/README.generic_usb_ohci for details.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-testing
Wolfgang Denk [Wed, 21 May 2008 15:06:45 +0000 (17:06 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-testing

16 years agoFix some whitespace issues
Wolfgang Denk [Wed, 21 May 2008 14:56:08 +0000 (16:56 +0200)]
Fix some whitespace issues

introduced by 53677ef18 "Big white-space cleanup."

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'socrates' of /home/wd/git/u-boot/projects
Wolfgang Denk [Tue, 20 May 2008 23:13:52 +0000 (01:13 +0200)]
Merge branch 'socrates' of /home/wd/git/u-boot/projects

16 years agoMerge branch 'lwmon5' of /home/wd/git/u-boot/projects
Wolfgang Denk [Tue, 20 May 2008 23:13:39 +0000 (01:13 +0200)]
Merge branch 'lwmon5' of /home/wd/git/u-boot/projects

16 years agoMake ads5121 out-of-tree compiling safe
York Sun [Mon, 12 May 2008 19:36:39 +0000 (14:36 -0500)]
Make ads5121 out-of-tree compiling safe

Reuse the existing DIU driver in board/freescale/common.

Signed-off-by: York Sun <yorksun@freescale.com>
16 years agoAdding DIU support for Freescale 5121ADS
York Sun [Mon, 5 May 2008 15:20:01 +0000 (10:20 -0500)]
Adding DIU support for Freescale 5121ADS

Add DIU and cfb console support to FSL 5121ADS board.

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

Signed-off-by: York Sun <yorksun@freescale.com>
16 years agoReplace DPRINTF with debug
York Sun [Mon, 5 May 2008 15:20:00 +0000 (10:20 -0500)]
Replace DPRINTF with debug

Remove DPRINTF macro and replace it with generic debug macro.

Signed-off-by: York Sun <yorksun@freescale.com>
16 years agoMove pixel clock setting to board file
York Sun [Mon, 5 May 2008 15:19:59 +0000 (10:19 -0500)]
Move pixel clock setting to board file

The clock divider has different format in 5121 and 8610. This patch moves it to
board specific code.

Signed-off-by: York Sun <yorksun@freescale.com>
16 years agoBig white-space cleanup.
Wolfgang Denk [Tue, 20 May 2008 14:00:29 +0000 (16:00 +0200)]
Big white-space cleanup.

This commit gets rid of a huge amount of silly white-space issues.
Especially, all sequences of SPACEs followed by TAB characters get
removed (unless they appear in print statements).

Also remove all embedded "vim:" and "vi:" statements which hide
indentation problems.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agosocrates: fix second TSEC configuration (it is actually TSEC3)
Sergei Poselenov [Thu, 8 May 2008 15:46:23 +0000 (17:46 +0200)]
socrates: fix second TSEC configuration (it is actually TSEC3)

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoFixed reset for socrates
Sergei Poselenov [Thu, 8 May 2008 12:17:08 +0000 (14:17 +0200)]
Fixed reset for socrates

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agosocrates: changes to support FDT
Sergei Poselenov [Wed, 7 May 2008 13:10:49 +0000 (15:10 +0200)]
socrates: changes to support FDT

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoInitial support for "Socrates" board
Sergei Poselenov [Wed, 30 Apr 2008 09:42:50 +0000 (11:42 +0200)]
Initial support for "Socrates" board

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoPOST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the...
Yuri Tikhonov [Thu, 8 May 2008 13:46:42 +0000 (15:46 +0200)]
POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the GD_FLG_LOGINIT flag in gd->flags.

This way we become able to utilize the full post_log_word for POST
activities (overwise, POST ECC, which has 0x8000 ID, could be
erroneously treated as started in post_output_backlog() even if there
was actually no POST ECC run (because of OCM POST failure, for
example).

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoPOST: mark OCM test as POST_STOP
Yuri Tikhonov [Thu, 8 May 2008 13:46:02 +0000 (15:46 +0200)]
POST: mark OCM test as POST_STOP

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
16 years agoPOST: add POST_STOP flag
Yuri Tikhonov [Thu, 8 May 2008 13:45:26 +0000 (15:45 +0200)]
POST: add POST_STOP flag

Don't run futher tests in case of a test fails that is marked as
POST_STOP.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoPOST: switch CFG_POST_OCM with CFG_POST_CODEC (workaround)
Yuri Tikhonov [Thu, 8 May 2008 13:44:16 +0000 (15:44 +0200)]
POST: switch CFG_POST_OCM with CFG_POST_CODEC (workaround)

Switch the OCM testid with the codec one. The reason is that current
implementation requires the POST_ROM testid to fit into lower 16
bits, and the codec test will never run with POST_ROM hopefully.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
16 years agolwmon5: enable OCM post test on lwmon5 board
Yuri Tikhonov [Thu, 8 May 2008 13:43:28 +0000 (15:43 +0200)]
lwmon5: enable OCM post test on lwmon5 board

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
16 years agoPOST: OCM test added.
Yuri Tikhonov [Thu, 8 May 2008 13:42:47 +0000 (15:42 +0200)]
POST: OCM test added.

Added OCM test to POST layer. This version runs before all other tests
but doesn't yet interrupt post sequence on failure.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoPOST: typo fix
Yuri Tikhonov [Thu, 8 May 2008 13:40:39 +0000 (15:40 +0200)]
POST: typo fix

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
16 years agocommon/usb.c: fix incorrect escape sequence
Hebbar [Tue, 20 May 2008 09:16:36 +0000 (02:16 -0700)]
common/usb.c: fix incorrect escape sequence

Signed off by: Gururaja Hebbar <gururajakr@sanyo.co.in>

16 years agoFix 8313ERDB board configuration
York Sun [Thu, 15 May 2008 20:26:27 +0000 (15:26 -0500)]
Fix 8313ERDB board configuration

Change LCRR clock ratio from 2 to 4 to commodate VSC7385.
Correct TSEC1 vs TSEC2 assignment.
Define ETHADDR and ETH1ADDR always.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Timur Tabi <timur@freescale.com>
16 years agoRelease v1.3.3 v1.3.3
Wolfgang Denk [Mon, 19 May 2008 10:47:11 +0000 (12:47 +0200)]
Release v1.3.3

Update CHANGELOG for release.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Mon, 19 May 2008 07:42:38 +0000 (09:42 +0200)]
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

16 years agoppc4xx: Canyonlands: Disable PCIe0/SATA in dev-tree depending on selection
Stefan Roese [Mon, 19 May 2008 05:14:38 +0000 (07:14 +0200)]
ppc4xx: Canyonlands: Disable PCIe0/SATA in dev-tree depending on selection

When SATA is selected (via jumper J6) we need to disable the first PCIe
node in the device tree, so that Linux doesn't initialize it. Otherwise
the Linux SATA driver will fail to detect the devices.

The same goes the other way around too. So if PCIe is selected we need
to disable the SATA node in the device tree.

This is because PCIe port 0 and SATA on 460EX share the same pins
(multiplexed) and we have to configure in U-Boot which peripheral is
enabled.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoi386: Fix multiple definitions of __show_boot_progress
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:58 +0000 (19:09 +0200)]
i386: Fix multiple definitions of __show_boot_progress

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agosc530_spunk: add missing SOBJS entry
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:57 +0000 (19:09 +0200)]
sc530_spunk: add missing SOBJS entry

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agosc520_spunk: Fix flash
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:56 +0000 (19:09 +0200)]
sc520_spunk: Fix flash

flash.c:593: warning: dereferencing type-punned pointer will break strict-aliasing rules
flash.c:398: error: label at end of compound statement

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/pcmcia: add missing i82365
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:49 +0000 (19:09 +0200)]
drivers/pcmcia: add missing i82365

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoi386/bootm: remove unused var
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:47 +0000 (19:09 +0200)]
i386/bootm: remove unused var

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoexample/gitignore: update with all generated examples
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:45 +0000 (19:09 +0200)]
example/gitignore: update with all generated examples

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoTQM8272: fix out-of-tree building
Wolfgang Denk [Wed, 14 May 2008 22:42:45 +0000 (00:42 +0200)]
TQM8272: fix out-of-tree building

...and add to MAKEALL script

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoenvironment: fix bug introduced by commit a8409f4f1ac8
Wolfgang Denk [Wed, 14 May 2008 21:34:53 +0000 (23:34 +0200)]
environment: fix bug introduced by commit a8409f4f1ac8

env_get_char is not a function, but a pointer to one.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Wed, 14 May 2008 12:05:49 +0000 (14:05 +0200)]
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

16 years agoFix config files for out-of-tree building
Wolfgang Denk [Wed, 14 May 2008 11:55:30 +0000 (13:55 +0200)]
Fix config files for out-of-tree building

Several board/<...>/config.mk files include dynamically built (by
the Makefile) config files but used the wrong file name of
$(TOPDIR)/board/$(BOARDDIR)/config.tmp
instead if the correct
$(OBJTREE)/board/$(BOARDDIR)/config.tmp

The bug is nasty because the build result is correct for the (normal)
in-tree builds, and because 'sinclude' is used no errors get raised
even for out-of-tree build tests. But out-of-tree builds use an
incomplete and thus usually incorrect configuration...

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Fix bogus Canyonlands config.mk
Stefan Roese [Wed, 14 May 2008 11:40:03 +0000 (13:40 +0200)]
ppc4xx: Fix bogus Canyonlands config.mk

This patch fixes the canyonlands config.mk file to enable correct
out-of-tree builds. Thanks to Wolfgang Denk for spotting this.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand build
Stefan Roese [Wed, 14 May 2008 08:32:32 +0000 (10:32 +0200)]
ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand build

Canyonlands has a file ddr2_fixed.c which needs special treatment when
building in separate directory. It has to be linked to build directory
otherwise it is not seen.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoenvironment: cleanup prototype declarations of env functions.
Wolfgang Denk [Wed, 14 May 2008 10:22:49 +0000 (12:22 +0200)]
environment: cleanup prototype declarations of env functions.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agolinkstation_HGLAN: Fix out of tree building.
Wolfgang Denk [Wed, 14 May 2008 10:21:48 +0000 (12:21 +0200)]
linkstation_HGLAN: Fix out of tree building.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand build
Stefan Roese [Wed, 14 May 2008 08:32:32 +0000 (10:32 +0200)]
ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand build

Canyonlands has a file ddr2_fixed.c which needs special treatment when
building in separate directory. It has to be linked to build directory
otherwise it is not seen.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMakefile: fix "error: version_autogenerated.h: No such file or directory"
Wolfgang Denk [Tue, 13 May 2008 21:15:52 +0000 (23:15 +0200)]
Makefile: fix "error: version_autogenerated.h: No such file or directory"

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Add 405EX(r) revision C PVR definitions and detection code
Stefan Roese [Tue, 13 May 2008 18:22:01 +0000 (20:22 +0200)]
ppc4xx: Add 405EX(r) revision C PVR definitions and detection code

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoRevert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option"
Wolfgang Denk [Sun, 11 May 2008 23:11:21 +0000 (01:11 +0200)]
Revert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option"

This reverts commit 55774b512fdf63c0516d441cc5da7c54bbffb7f2
which broke many PowerPC boards.

16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 11 May 2008 23:02:40 +0000 (01:02 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoRevert "Avoid initrd and logbuffer area overlaps"
Wolfgang Denk [Sun, 11 May 2008 22:56:28 +0000 (00:56 +0200)]
Revert "Avoid initrd and logbuffer area overlaps"

This reverts commit 1b5605ca57fbb364f4d78eeee28b974ed875e888
which breaks building on all PPC boards that don't use a log buffer.

16 years agoFix offset calculation for multi-type legacy images.
Nick Spence [Sat, 10 May 2008 21:02:04 +0000 (14:02 -0700)]
Fix offset calculation for multi-type legacy images.

Calculation of tail was incorrect when size % 4 == 0.

New code removes the conditional and does the same thing but with arithmetic

Signed-off-by: Nick Spence <nick.spence@freescale.com>
16 years agoRevert "Change env_get_char from a global function ptr to a function."
Wolfgang Denk [Sun, 11 May 2008 22:40:58 +0000 (00:40 +0200)]
Revert "Change env_get_char from a global function ptr to a function."

This reverts commit c0559be371b2a64b1a817088c3308688e2182f93
which is known to break booting from dataflash and NAND.

16 years agoAPI: remove duplicate syscall check
Jean-Christophe PLAGNIOL-VILLARD [Sun, 11 May 2008 21:13:57 +0000 (23:13 +0200)]
API: remove duplicate syscall check

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoppc4xx: Kilauea: Add CONFIG_BOOTP_SUBNETMASK to Kilauea board config
Markus Klotzbücher [Thu, 8 May 2008 14:00:55 +0000 (16:00 +0200)]
ppc4xx: Kilauea: Add CONFIG_BOOTP_SUBNETMASK to Kilauea board config

When using dhcp/bootp the "netmask" environment variable is not set
because CONFIG_BOOTP_SUBNETMASK is not defined. But usually this is
desireable, so the following patch adds this this option to the board
config.

Signed-off-by: Markus Klotzbuecher <mk@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Update Makalu defconfig to use device-tree booting as default
Stefan Roese [Sat, 10 May 2008 08:30:36 +0000 (10:30 +0200)]
ppc4xx: Update Makalu defconfig to use device-tree booting as default

This patch reworks the default environment on Makalu. Now "net_nfs" for
example uses the device-tree style booting formerly know as "net_nfs_fdt".
Also the addresses in RAM were changed because of the new image booting
support, which check for image overwriting. So the addresses needed to
get adjusted.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoPPC: fix map_physmem build warning
Becky Bruce [Wed, 7 May 2008 18:28:16 +0000 (13:28 -0500)]
PPC: fix map_physmem build warning

map_physmem currently generates a warning when CONFIG_PHYS_64BIT is
enabled.  This quiets the warning.

Signed-off-by: Becky Bruce <Becky.Bruce@freescale.com>
16 years agoUpdate pci code to use phys_addr_t
Becky Bruce [Wed, 7 May 2008 18:24:57 +0000 (13:24 -0500)]
Update pci code to use phys_addr_t

Physical addrs need to be represented by phys_addr_t, not
unsigned long.  Otherwise, systems that use CONFIG_PHYS_64BIT
are going to fail mightily.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoSupport legacy multi-type images without FDT section.
Nick Spence [Fri, 9 May 2008 05:32:22 +0000 (22:32 -0700)]
Support legacy multi-type images without FDT section.

This patch enables legacy multi-type images containing only a Linux kernel
and root file system to be loaded, maintaining compatibility with previous
versions of u-boot.

This is required when using old image files such as a Linux 2.4 kernel /
filesystem.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Acked-by: Bartlomiej Sieka <tur@semihalf.com>
16 years agoUpdate CHANGELOG.
Wolfgang Denk [Fri, 9 May 2008 22:38:02 +0000 (00:38 +0200)]
Update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopost/cpu/ppc4xx/Makefile: line length cleanup
Wolfgang Denk [Fri, 9 May 2008 22:36:09 +0000 (00:36 +0200)]
post/cpu/ppc4xx/Makefile: line length cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Wolfgang Denk [Fri, 9 May 2008 22:34:05 +0000 (00:34 +0200)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

16 years agoFix @ -> <at> substitution
Stelian Pop [Thu, 8 May 2008 20:52:09 +0000 (22:52 +0200)]
Fix @ -> <at> substitution

When applying the AT91CAP9 patches upstream, something transformed
the '@' character into the ' <at> ' sequence.

The patch below restores the original form in all the places where
it has been modified (the AT91CAP9 files, the AT91SAM9260 files which
were copied from AT91CAP9, and a couple of other files where the
' <at> ' sequence was present).

Signed-off-by: Stelian Pop <stelian@popies.net>
16 years agoUpdate origin and copyright information in arch-at91sam9 header files
Stelian Pop [Thu, 8 May 2008 20:52:10 +0000 (22:52 +0200)]
Update origin and copyright information in arch-at91sam9 header files

When doing the AT91CAP9/AT91SAM9 port, a number of header files were
copied from the Linux kernel sources. This patch explicitly specifies
this origin for all the copied headers, and for those missing copyright
information, adds it.

Additionaly, the header file 'at91sam926x_mc.h' has been superceeded
in the latest kernel sources by 'at91sam9_smc.h'.

The copyright information has been confirmed by the AT91 Linux kernel
maintainer, Andrew Victor <avictor.za@gmail.com>.

Signed-off-by: Stelian Pop <stelian@popies.net>
16 years agoAdd copyright information in Atmel boards partition.c
Stelian Pop [Thu, 8 May 2008 20:52:11 +0000 (22:52 +0200)]
Add copyright information in Atmel boards partition.c

When Ulf did the dataflash.c cleanup, he didn't add his copyright on
the new created files. This patch fixes the problem.

Signed-off-by: Stelian Pop <stelian@popies.net>
16 years agomx31ads: fix 32kHz clock handling
Guennadi Liakhovetski [Thu, 8 May 2008 08:09:27 +0000 (10:09 +0200)]
mx31ads: fix 32kHz clock handling

According to schematics and to RedBoot sources, the MX31ADS uses a 32768Hz
oscillator as a SKIL source. Fix previously wrongly assumed 32000Hz value.
Also fix a typo when verifying a jumper configuration. While at it, make
two needlessly global functions static.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Wolfgang Denk [Fri, 9 May 2008 22:18:22 +0000 (00:18 +0200)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

16 years agoAvoid initrd and logbuffer area overlaps
Marian Balakowicz [Wed, 7 May 2008 11:10:04 +0000 (13:10 +0200)]
Avoid initrd and logbuffer area overlaps

Add logbuffer to reserved LMB areas to prevent initrd allocation
from overlaping with it.

Make sure to use correct logbuffer base address.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
16 years agoppc: Cleanup get_effective_memsize() use
Marian Balakowicz [Wed, 7 May 2008 11:08:54 +0000 (13:08 +0200)]
ppc: Cleanup get_effective_memsize() use

Removed duplicated effective memory size calculation code.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
16 years agoFix build errors when CONFIG_LOGBUFFER and CONFIG_FIT are enabled
Marian Balakowicz [Wed, 7 May 2008 07:03:53 +0000 (09:03 +0200)]
Fix build errors when CONFIG_LOGBUFFER and CONFIG_FIT are enabled

Recent modifcations to LOGBUFFER handling code were incorrecly
introduced to fit_check_kernel() routine during
"Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing",
commit 27f33e9f45ef7f9685cbdc65066a1828e85dde4f.

This patch cleans up this merge issue.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
16 years agoPropagate Error Status to the Shell on fw_printenv Errors
Grant Erickson [Wed, 7 May 2008 03:16:15 +0000 (20:16 -0700)]
Propagate Error Status to the Shell on fw_printenv Errors

Changed implementation such that fw_printenv returns failure status
when one or more specified variables do not exist or when incorrect
command syntax is used.

This aids scripting fw_printenv such that the script can key of the
return status rather than relying on standard error "scraping".

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix Compilation Errors with 'tools/env/fw_printenv'
Grant Erickson [Tue, 6 May 2008 23:18:00 +0000 (16:18 -0700)]
Fix Compilation Errors with 'tools/env/fw_printenv'

In the current top-of-tree, 1.3.3.-rc2, the optional tool
'tools/env/fw_printenv' fails to compile for two reasons:

1) The header watchdog.h cannot be found.
2) The header zlib.h is picked up from the tool chain rather than the
   project causing a prototype conflict for crc32.

This patch addresses both of these issues.

Platforms Tested On:
- AMCC "Kilauea"

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Fri, 9 May 2008 20:19:29 +0000 (22:19 +0200)]
Merge branch 'master' of git://www.denx.de/git/u-boot-mips

16 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Fri, 9 May 2008 20:19:16 +0000 (22:19 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master/

16 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Fri, 9 May 2008 20:18:58 +0000 (22:18 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master/

16 years agoFix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocating
James Yang [Mon, 5 May 2008 15:22:53 +0000 (10:22 -0500)]
Fix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocating

When CONFIG_CMDLINE_EDITING is enabled, readline_into_buffer() doesn't
work before relocating to RAM because command history is written into
a global array that is not writable before relocation.  This patch
defers to the no-editing and no-history code in readline_into_buffer()
if it is called before relocation.

Signed-off-by: James Yang <James.Yang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agocosmetic: Adjust coding style for switch statements to be consistent
Detlev Zundel [Mon, 5 May 2008 14:11:22 +0000 (16:11 +0200)]
cosmetic: Adjust coding style for switch statements to be consistent

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoFix disk type output in disk/part.c
Detlev Zundel [Mon, 5 May 2008 14:11:21 +0000 (16:11 +0200)]
Fix disk type output in disk/part.c

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoMail address change, documentation modified
Vlad Lungu [Mon, 5 May 2008 11:20:03 +0000 (14:20 +0300)]
Mail address change, documentation modified

Signed-off-by: Vlad Lungu <vlad.lungu@windrvier.com>
16 years agomicroblaze: Repare intc handling
Michal Simek [Sun, 4 May 2008 13:42:41 +0000 (15:42 +0200)]
microblaze: Repare intc handling

Signed-off-by: Michal Simek <monstr@monstr.eu>
16 years agoinclude/gitignore: update to all architectures
Jean-Christophe PLAGNIOL-VILLARD [Sun, 4 May 2008 13:17:52 +0000 (15:17 +0200)]
include/gitignore: update to all architectures

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoide: Remove spurious second include of io.h
Marcel Ziswiler [Mon, 5 May 2008 00:12:06 +0000 (02:12 +0200)]
ide: Remove spurious second include of io.h

Removed the second include, with all the #ifdef around as suggested by Wolfgang.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
16 years agoFix some typos
Adrian Filipi [Tue, 6 May 2008 20:46:37 +0000 (16:46 -0400)]
Fix some typos

This patch fixes three typos.
The first is a repetition of CONFIG_CMD_BSP.
The second makes the #endif comment match its #if.
The third is a spelling error.

Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
16 years agoRecognize 'powerpc' As an Alias for IH_ARCH_PPC
Grant Erickson [Sun, 4 May 2008 23:45:01 +0000 (16:45 -0700)]
Recognize 'powerpc' As an Alias for IH_ARCH_PPC

Add support for the recognition of 'powerpc' as an alias for the PowerPC
architecture type since Linux is already trending in that direction,
preferring 'powerpc' to 'ppc'.

Signed-off-by: Grant Erickson <gerickson@nuovations.com>