oweals/u-boot.git
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-fdt
Wolfgang Denk [Wed, 9 Jan 2008 10:28:56 +0000 (11:28 +0100)]
Merge branch 'master' of git://denx.de/git/u-boot-fdt

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Wolfgang Denk [Wed, 9 Jan 2008 10:27:02 +0000 (11:27 +0100)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx

16 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Wed, 9 Jan 2008 10:17:59 +0000 (11:17 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/master/

16 years agoMerge branch 'lwmon5-no-ocm'
Stefan Roese [Wed, 9 Jan 2008 09:43:47 +0000 (10:43 +0100)]
Merge branch 'lwmon5-no-ocm'

16 years agoPOST: Execute SPR test after relocation
Stefan Roese [Wed, 9 Jan 2008 09:38:58 +0000 (10:38 +0100)]
POST: Execute SPR test after relocation

On LWMON5 we now use d-cache as init-ram and stack. The SPR POST test uses
self modifying code and this doesn't work with stack in d-cache, since
I can't move the code from d-cache to i-cache. We move the SPR test to
be executed a little later, after relocation. Then stack is located in
SDRAM and this self-modifying code is no problem anymore.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Change LWMON5 to not use OCM for init-ram and POST anymore
Stefan Roese [Wed, 9 Jan 2008 09:28:20 +0000 (10:28 +0100)]
ppc4xx: Change LWMON5 to not use OCM for init-ram and POST anymore

This patch configures the LWMON5 port to use d-cache as init-ram and
the unused GPT0_COMP6 as POST WORD storage.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add CFG_POST_ALT_WORD_ADDR to support non OCM POST WORD storage
Stefan Roese [Wed, 9 Jan 2008 09:25:46 +0000 (10:25 +0100)]
ppc4xx: Add CFG_POST_ALT_WORD_ADDR to support non OCM POST WORD storage

The privious 4xx POST implementation only supported storing the POST
WORD in OCM. Since we need to reserve the OCM on LWMON5 for the logbuffer
we need to store the POST WORD in some other non volatile location.
This patch adds CFG_POST_ALT_WORD_ADDR to specify an address for such
a location.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add 44x cache locking to better support init-ram in d-cache
Stefan Roese [Wed, 9 Jan 2008 09:23:16 +0000 (10:23 +0100)]
ppc4xx: Add 44x cache locking to better support init-ram in d-cache

This patch adds support for locking the init-ram/stack in d-cache,
so that other regions may use d-cache as well

Note, that this current implementation locks exactly 4k of d-cache,
so please make sure that you don't define a bigger init-ram area. Take
a look at the lwmon5 440EPx implementation as a reference.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoFix memset bug in ext2fs_read_file()
Wolfgang Denk [Wed, 9 Jan 2008 09:16:33 +0000 (10:16 +0100)]
Fix memset bug in ext2fs_read_file()

ext2fs_read_file() had the function arguments swapped.

Pointed out by Mike Montour, 19 Dec 2007 22:34:25 -0800

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix problems with usb storage devices on MPC5200 /TQM5200
Markus Klotzbücher [Tue, 5 Jan 1988 07:17:15 +0000 (08:17 +0100)]
Fix problems with usb storage devices on MPC5200 /TQM5200

The MPC5200 OHCI controller operates in big endian, so
CFG_OHCI_BE_CONTROLLER must be defined for it to work properly.

Signed-off-by: Markus Klotzbuecher <mk@denx.de>
16 years agoFix compile problem with new env code.
Wolfgang Denk [Tue, 8 Jan 2008 21:58:27 +0000 (22:58 +0100)]
Fix compile problem with new env code.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agotools: fix fw_printenv tool to compile again
Markus Klotzbücher [Tue, 27 Nov 2007 09:23:20 +0000 (10:23 +0100)]
tools: fix fw_printenv tool to compile again

This patch updates the fw_printenv/fw_setenv userspace tool to include
the correct MTD header in order to compile against current kernel
headers. Backward compatibility is preserved by introducing an option
MTD_VERSION which can be set to "old" for compilation using the old MTD
headers. Along with this a number of warnings are fixed.

Signed-off-by: Markus Klotzbuecher <mk@denx.de>
16 years agoppc4xx: assign PCI interrupts on seuqoia boards
Matthias Fuchs [Tue, 8 Jan 2008 14:40:09 +0000 (15:40 +0100)]
ppc4xx: assign PCI interrupts on seuqoia boards

Some operating systems rely on assigned PCI interrupts.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Move cpu/ppc4xx/vecnum.h into include path
Matthias Fuchs [Tue, 8 Jan 2008 14:50:49 +0000 (15:50 +0100)]
ppc4xx: Move cpu/ppc4xx/vecnum.h into include path

This patch allows the use of 4xx interrupt vector number defines
in board specific code outside cpu/ppc4xx.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Fix UIC2 vector number base
Matthias Fuchs [Tue, 8 Jan 2008 14:39:01 +0000 (15:39 +0100)]
ppc4xx: Fix UIC2 vector number base

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Update PLB/PCI divider for PMC440 board
Matthias Fuchs [Tue, 8 Jan 2008 11:49:58 +0000 (12:49 +0100)]
ppc4xx: Update PLB/PCI divider for PMC440 board

This patch updates the PLB/PCI divider when running at
400MHz CPU frequency from 4 to 3 which results in 44MHz PCI sync clock.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Disable error message when no NAND chip is installed on PMC440
Matthias Fuchs [Tue, 8 Jan 2008 10:13:09 +0000 (11:13 +0100)]
ppc4xx: Disable error message when no NAND chip is installed on PMC440

Add CFG_NAND_QUIET_TEST option to disable error message when
no NAND chip is installed on PMC440 boards.

Disable a couple of config defines that are only used for NAND_U_BOOT.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoLIBFDT: use memmove() instead of memcpy()
Gerald Van Baren [Tue, 8 Jan 2008 04:47:32 +0000 (23:47 -0500)]
LIBFDT: use memmove() instead of memcpy()

This is partial patch from the DTC/libfdt
commit  67b6b33b9b413a450a72135b5dc59c0a1e33e647
Author: David Gibson <david@gibson.dropbear.id.au>
Date:   Wed Nov 21 11:56:14 2007 +1100

    The patch also fixes one genuine bug caught by valgrind -
    _packblocks() in fdt_rw.c was using memcpy() where it should have been
    using memmove().

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agolibfdt: Add more documentation (patch the seventh)
David Gibson [Mon, 17 Dec 2007 03:42:07 +0000 (14:42 +1100)]
libfdt: Add more documentation (patch the seventh)

This patch adds more documenting comments to libfdt.h.  Specifically,
these document the read/write functions (not including fdt_open_into()
and fdt_pack(), for now).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
16 years agolibfdt: Add more documentation (patch the sixth)
David Gibson [Mon, 17 Dec 2007 03:41:52 +0000 (14:41 +1100)]
libfdt: Add more documentation (patch the sixth)

This patch adds some more documenting comments to libfdt.h.
Specifically this documents all the write-in-place functions.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
16 years agoFine grained per property /chosen updating.
Gerald Van Baren [Sun, 30 Dec 2007 03:45:27 +0000 (22:45 -0500)]
Fine grained per property /chosen updating.

Implement a suggestion by Scott Wood to make the /chosen handling fine
grained.  Don't overwrite pre-existing properties on a per-property basis,
so if /chosen exists but a necessary /chosen/property doesn't, it gets
created.  If a /chosen property exists, it is NOT overwritten unless the
"force" flag is true.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agoImprove the FDT help message.
Gerald Van Baren [Sat, 5 Jan 2008 20:33:29 +0000 (15:33 -0500)]
Improve the FDT help message.

Add a note that "fdt copy" makes the new address active.
Remove most of the extra hints at the end of the fdt help.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agoSupport setting FDT properties with optional values.
Gerald Van Baren [Sat, 5 Jan 2008 19:52:04 +0000 (14:52 -0500)]
Support setting FDT properties with optional values.

Fix a bug found and documented by Bartlomiej Sieka where the optional
value on "fdt set <path> <prop> [<val>]" wasn't optional.

=> fdt mknode / testnode
=> fdt print /testnode
testnode {
};
=> fdt set /testnode testprop
=> fdt print /testnode
testnode {
        testprop;
};

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agoAdd fdt_find_and_setprop() to fdt_support.h
Matthias Fuchs [Fri, 28 Dec 2007 10:56:30 +0000 (11:56 +0100)]
Add fdt_find_and_setprop() to fdt_support.h

fdt_find_and_setprop() is used by several 4xx boards and it's
missing in the appropriate header. This patch eliminates a
warning when building U-Boot for such boards.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Acked-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Return 0 on success in 4xx ethernet driver
Stefan Roese [Tue, 8 Jan 2008 17:39:30 +0000 (18:39 +0100)]
ppc4xx: Return 0 on success in 4xx ethernet driver

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'inka4x0-ng' of /home/m8/git/u-boot/
Wolfgang Denk [Tue, 8 Jan 2008 16:15:18 +0000 (17:15 +0100)]
Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/

16 years agompc83xx: fix missed pci_hose -> hose conversion for new libfdt code
Kim Phillips [Tue, 8 Jan 2008 15:59:49 +0000 (09:59 -0600)]
mpc83xx: fix missed pci_hose -> hose conversion for new libfdt code

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: rm remaining FLAT_TREE code
Kim Phillips [Thu, 20 Dec 2007 22:28:34 +0000 (16:28 -0600)]
mpc83xx: rm remaining FLAT_TREE code

..in board pci.c files

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: remove FLAT_TREE code
Kim Phillips [Thu, 20 Dec 2007 21:57:28 +0000 (15:57 -0600)]
mpc83xx: remove FLAT_TREE code

need to rm it from pci code, too!

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: convert to using do_fixup_*()
Kim Phillips [Thu, 20 Dec 2007 20:09:22 +0000 (14:09 -0600)]
mpc83xx: convert to using do_fixup_*()

convert to using simpler mpc85xx style fdt update code; streamline by
eliminating macros OF_SOC, OF_CPU, etc. which allows us to rm
the old school FLAT_TREE code from 83xx (since the sbc8349 was just
converted over to using libfdt).

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agosbc8349: enable libfdt by default on WRS SBC8349 board.
Paul Gortmaker [Thu, 20 Dec 2007 17:58:51 +0000 (12:58 -0500)]
sbc8349: enable libfdt by default on WRS SBC8349 board.

Make libfdt the default for the WRS SBC8349 board.
Parallel of commit 35cc4e4823668e8745854899cfaedd4489beb0ef
done for the other 83xx based boards.  Also fix a typo in CONFIG_PCI.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
16 years agosbc8349: migrate board to libfdt
Paul Gortmaker [Thu, 20 Dec 2007 17:58:16 +0000 (12:58 -0500)]
sbc8349: migrate board to libfdt

This adds libfdt support code for the Wind River sbc8349 board.

Parallel of commit 3fde9e8b22cfbd7af489214758f9839a206576cb for
the other Freescale 83xx boards.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
16 years agosbc8349: Remove board specific ECC code
Paul Gortmaker [Thu, 20 Dec 2007 17:56:19 +0000 (12:56 -0500)]
sbc8349: Remove board specific ECC code

ECC code is now shared for all 83xx boards, so remove board specific one.
See commit daab8c67d2defef73dc26ab07f0c3afd1b05d019 for reference.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
16 years agompc83xx: Remove CONFIG options related to OF that we dont use (on 837x)
Kim Phillips [Thu, 20 Dec 2007 07:30:48 +0000 (01:30 -0600)]
mpc83xx: Remove CONFIG options related to OF that we dont use (on 837x)

continuation of commit 37395fa2b0d9d617f28d44ca11592260ef16105a to 837x

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoAdd support CONFIG_UEC_ETH3 in MPC83xx
Joakim Tjernlund [Thu, 6 Dec 2007 15:43:40 +0000 (16:43 +0100)]
Add support CONFIG_UEC_ETH3 in MPC83xx

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
16 years agoRemove CONFIG options related to OF that we dont use
Kumar Gala [Mon, 26 Nov 2007 17:00:54 +0000 (11:00 -0600)]
Remove CONFIG options related to OF that we dont use

The MPC8360E MDS config defined:
CONFIG_OF_HAS_BD_T
CONFIG_OF_HAS_UBOOT_ENV

Which we don't use or ever needed.  This seems like copy-paste feature creep.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agompc83xx: supress compiler warning
Kim Phillips [Mon, 10 Dec 2007 20:16:22 +0000 (14:16 -0600)]
mpc83xx: supress compiler warning

mpc8360emds.c: In function ‘ft_board_setup’:
mpc8360emds.c:335: warning: assignment discards qualifiers from pointer target type
mpc8360emds.c:345: warning: assignment discards qualifiers from pointer target type

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: fix remaining fdt_find_node_by_path references
Kim Phillips [Tue, 27 Nov 2007 20:17:29 +0000 (14:17 -0600)]
mpc83xx: fix remaining fdt_find_node_by_path references

rename to fdt_path_offset

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions for 837x
Kim Phillips [Mon, 19 Nov 2007 18:30:09 +0000 (12:30 -0600)]
mpc83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions for 837x

Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for 837x.
This change guarantees that the environment will be located on the
first flash sector after the U-Boot image.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: mpc8360 rev.2.1 erratum 2: replace rgmii-id with rgmii-rxid
Kim Phillips [Fri, 9 Nov 2007 20:28:08 +0000 (14:28 -0600)]
mpc83xx: mpc8360 rev.2.1 erratum 2: replace rgmii-id with rgmii-rxid

u-boot itself uses GMII mode on the 8360.  Fix up UCC phy-connection-type
properties in the device tree so the PHY gets configured for internal delay on
RX only by the OS, as prescribed by mpc8360 rev. 2.1 pb mds erratum #2.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: update the CREDITS and MAINTAINERS
Dave Liu [Tue, 18 Sep 2007 04:41:15 +0000 (12:41 +0800)]
mpc83xx: update the CREDITS and MAINTAINERS

update the CREDITS and MAINTAINERS.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: add MAINTAINER and MAKEALL entries for the mpc837xemds
Dave Liu [Tue, 18 Sep 2007 04:40:21 +0000 (12:40 +0800)]
mpc83xx: add MAINTAINER and MAKEALL entries for the mpc837xemds

Add the MAINTAINER and MAKEALL entries for mpc837xemds

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: Add the MPC837xEMDS board readme
Dave Liu [Tue, 18 Sep 2007 04:38:53 +0000 (12:38 +0800)]
mpc83xx: Add the MPC837xEMDS board readme

Add the README.mpc837xemds to /doc

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: Add the support of MPC837xEMDS board
Dave Liu [Tue, 18 Sep 2007 04:37:57 +0000 (12:37 +0800)]
mpc83xx: Add the support of MPC837xEMDS board

The MPC837xEMDS board support:
* DDR2 400MHz hardcoded and SPD init
* Local bus NOR Flash
* I2C, UART, MII and RTC
* eTSEC RGMII
* PCI host

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: Add the support of MPC8315E SoC
Dave Liu [Tue, 18 Sep 2007 04:36:58 +0000 (12:36 +0800)]
mpc83xx: Add the support of MPC8315E SoC

The MPC8315E SoC including e300c3 core and new IP blocks,
such as TDM, PCI Express and SATA controller.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: Add the support of MPC837x SoC
Dave Liu [Tue, 18 Sep 2007 04:36:11 +0000 (12:36 +0800)]
mpc83xx: Add the support of MPC837x SoC

The MPC837x SoC including e300c4 core and new IP blocks,
such as SDHC, PCI Express and SATA controller.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agoMPC8360E-MDS: configure and enable second UART
Anton Vorontsov [Wed, 14 Nov 2007 15:54:53 +0000 (18:54 +0300)]
MPC8360E-MDS: configure and enable second UART

Despite user manual, BCSR9.7 is negated (high) on HRST, so
UART2 is disabled. Fix that and configure QE pins properly.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
16 years ago83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions
Timur Tabi [Mon, 5 Nov 2007 15:34:06 +0000 (09:34 -0600)]
83xx: fix CFG_ENV_ADDR and CFG_ENV_SECT_SIZE definitions

Fix the definitions of CFG_ENV_ADDR and CFG_ENV_SECT_SIZE for all of the
currently-defined 83xx boards.  This change guarantees that the environment
will be located on the first flash sector after the U-Boot image.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Tue, 8 Jan 2008 12:41:42 +0000 (13:41 +0100)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoppc4xx: Remove weak binding from common Denali data-eye search code
Larry Johnson [Fri, 4 Jan 2008 18:27:02 +0000 (13:27 -0500)]
ppc4xx: Remove weak binding from common Denali data-eye search code

Now that there are no board-specific versions of
"denali_core_search_data_eye()", the weak binding on the common version
can be removed.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoMerge branch 'katmai-ddr-gda'
Stefan Roese [Sat, 5 Jan 2008 09:13:40 +0000 (10:13 +0100)]
Merge branch 'katmai-ddr-gda'

16 years agoppc4xx: Remove unused CONFIG_ECC_ERROR_RESET from 44x_spd_ddr2.c
Stefan Roese [Sat, 5 Jan 2008 08:13:46 +0000 (09:13 +0100)]
ppc4xx: Remove unused CONFIG_ECC_ERROR_RESET from 44x_spd_ddr2.c

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Update Katmai/44x_spd_ddr2.c code for optimal DDR2 setup
Stefan Roese [Sat, 5 Jan 2008 08:12:41 +0000 (09:12 +0100)]
ppc4xx: Update Katmai/44x_spd_ddr2.c code for optimal DDR2 setup

On Katmai the complete auto-calibration somehow doesn't seem to
produce the best results, meaning optimal values for RQFD/RFFD.
This was discovered by GDA using a high bandwidth scope,
analyzing the DDR2 signals. GDA provided a fixed value for RQFD,
so now on Katmai "only" RFFD is auto-calibrated.

This patch also adds RDCC calibration as mentioned on page 7 of
the AMCC PowerPC440SP/SPe DDR2 application note:
"DDR1/DDR2 Initialization Sequence and Dynamic Tuning"

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Remove sdram.h from PMC440 board
Matthias Fuchs [Wed, 2 Jan 2008 15:48:42 +0000 (16:48 +0100)]
ppc4xx: Remove sdram.h from PMC440 board

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: use common denali core defines and data eye search code for PMC440
Matthias Fuchs [Wed, 2 Jan 2008 15:48:34 +0000 (16:48 +0100)]
ppc4xx: use common denali core defines and data eye search code for PMC440

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: More cleanup for esd's LCD code
Matthias Fuchs [Wed, 2 Jan 2008 11:05:14 +0000 (12:05 +0100)]
ppc4xx: More cleanup for esd's LCD code

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Fix Sequoia NAND booting target
Stefan Roese [Fri, 4 Jan 2008 11:00:01 +0000 (12:00 +0100)]
ppc4xx: Fix Sequoia NAND booting target

The Sequoia NAND booting target now uses the recently extracted
cpu/ppc4xx/denali_data_eye.c file too.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Use CFG_4xx_GPIO_TABLE to configure Korat board
Lawrence R. Johnson [Thu, 3 Jan 2008 20:02:02 +0000 (15:02 -0500)]
ppc4xx: Use CFG_4xx_GPIO_TABLE to configure Korat board

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoppc4xx: Use CFG_4xx_GPIO_TABLE to configure Sequoia board
Lawrence R. Johnson [Fri, 4 Jan 2008 07:11:56 +0000 (02:11 -0500)]
ppc4xx: Use CFG_4xx_GPIO_TABLE to configure Sequoia board

Note: this patch changes the configuration of some GPIO registers:

   Register      Old Value   New Value
---------------  ----------  ----------
DCR GPIO0_TCR    0x0000000F  0x0000F0CF
DCR GPIO0_TSRH   0x55005000  0x00000000
DCR GPIO1_TCR    0xC2000000  0xE2000000
DCR GPIO1_TSRL   0x0C000000  0x00200000
DCR GPIO1_ISR2L  0x00050000  0x00110000

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoppc4xx: Add functionality to GPIO support
Lawrence R. Johnson [Thu, 3 Jan 2008 23:54:00 +0000 (18:54 -0500)]
ppc4xx: Add functionality to GPIO support

This patch makes two additions to GPIO support:

First, it adds function gpio_read_in_bit() to read the a bit from the
GPIO Input Register (GPIOx_IR) in the same way that function
gpio_read_out_bit() reads a bit from the GPIO Output Register
(GPIOx_OR).

Second, it modifies function gpio_set_chip_configuration() to provide
an additional option for configuring the GPIO from the
"CFG_4xx_GPIO_TABLE".

According to the 440EPx User's Manual, when an alternate output is used,
the three-state control is configured in one of two ways, depending on
the particular output.  The first option is to select the corresponding
alternate three-state control in the GPIOx_TRSH/L registers.  The second
option is to select the GPIO Three-State Control Register (GPIOx_TCR) in
the GPIOx_TRSH/L registers, and set the corresponding bit in the
GPIOx_TCR register to enable the output.  For example, the Manual
specifies configuring the GPIO00 Alternate 1 Signal (PreAddr07) to use
the alternate three-state control (first option), and specifies
configuring the GPIO32 Alternate 1 Signal (USB2OM0) with the output
enabled in the GPIOx_TCR register (second option).

Currently, gpio_set_chip_configuration() configures all alternate signal
outputs to use the first option.  This patch allow the second option to
be selected by setting the "out_val" element in the table entry to
"GPIO_OUT_1".  The first option is used when the "out_val" element is
set to "GPIO_OUT_0".  Because "out_val" is not currently used when an
alternate signal is selected, and because all current GPIO tables set
"out_val" to "GPIO_OUT_0" for all alternate signals, this patch should
not change any existing configurations.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoPPC4xx: Remove sdram.h from board/lwmon5
Larry Johnson [Sun, 30 Dec 2007 06:01:54 +0000 (01:01 -0500)]
PPC4xx: Remove sdram.h from board/lwmon5

These definitions are now in "include/ppc440.h".

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoPPC4xx: Use common code for LWMON5 board SDRAM support
Larry Johnson [Sun, 30 Dec 2007 06:01:32 +0000 (01:01 -0500)]
PPC4xx: Use common code for LWMON5 board SDRAM support

This patch also modifies the functionality of the code so that the data-eye
search is now done with with the cache disabled.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoPPC4xx: Remove sdram.h from board/amcc/sequoia
Larry Johnson [Sun, 30 Dec 2007 06:01:14 +0000 (01:01 -0500)]
PPC4xx: Remove sdram.h from board/amcc/sequoia

These definitions are now in "include/ppc440.h".

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoPPC4xx: Use common code for Sequoia board SDRAM support
Larry Johnson [Sun, 30 Dec 2007 06:00:50 +0000 (01:00 -0500)]
PPC4xx: Use common code for Sequoia board SDRAM support

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agonet: Add CONFIG_NET_DO_NOT_TRY_ANOTHER option
Matthias Fuchs [Thu, 27 Dec 2007 15:58:41 +0000 (16:58 +0100)]
net: Add CONFIG_NET_DO_NOT_TRY_ANOTHER option

When CONFIG_NET_DO_NOT_TRY_ANOTHER is defined U-Boot's
networking stack does not automatically switch to
another interface. This patch does not touch the default
behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoNET: Proper return code handling in eth_init() function in file eth.c
Upakul Barkakaty [Thu, 29 Nov 2007 06:46:13 +0000 (12:16 +0530)]
NET: Proper return code handling in eth_init() function in file eth.c

This patch modifies the return code handling in the eth_init()
function, to be compatible with the handling of the return codes in
the other network stack files. It now returns a 0 on Success and -1 on
error.

Signed-off-by: Upakul Barkakaty <upakul.barkakaty@conexant.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet/eth.c: Fix env_enetaddr signed overflow
Shinya Kuribayashi [Mon, 19 Nov 2007 11:27:04 +0000 (20:27 +0900)]
net/eth.c: Fix env_enetaddr signed overflow

Assigning the output of simple_strtoul(CB:A9:87:65:43:21) to `char', we are
warned as below:

  U-Boot 1.2.0 (Aug 30 2007 - 08:27:37)

  DRAM:  256 MB
  Flash: 32 MB
  In:    serial
  Out:   serial
  Err:   serial
  Net:   NEC-Candy
  Warning: NEC-Candy MAC addresses don't match:
  Address in SROM is         00:00:4C:80:92:A2
  Address in environment is  FFFFFFCB:FFFFFFA9:FFFFFF87:65:43:21

This patch changes env_enetaddr type from `char' to `unsigned char'.

Cc: Masaki Ishikawa <ishikawa-masaki@cnt.mxe.nes.nec.co.jp>
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoIntroduce new eth_receive routine
Rafal Jaworowski [Thu, 27 Dec 2007 17:19:02 +0000 (18:19 +0100)]
Introduce new eth_receive routine

The purpose of this routine is receiving a single network frame, outside of
U-Boot's NetLoop(). Exporting it to standalone programs that run on top of
U-Boot will let them utilise networking facilities. For sending a raw frame
the already existing eth_send() can be used.

The direct consumer of this routine is the newly introduced API layer for
external applications (enabled with CONFIG_API).

Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years ago8610: Move include of config.h earlier.
Jon Loeliger [Thu, 3 Jan 2008 16:41:04 +0000 (10:41 -0600)]
8610: Move include of config.h earlier.

Include config.h earlier in the set of #includes
so as to avoid a incidental and duplicate definition
of CFG_CACHELINE_SIZE.

Signed-off-by: Jon Loeliger
16 years agoDon't slam #undef DEBUG in the 8641HPCN config file.
Jon Loeliger [Tue, 4 Dec 2007 16:53:34 +0000 (10:53 -0600)]
Don't slam #undef DEBUG in the 8641HPCN config file.

Doing so prevents it from being individually set
and useful in other files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years agoConvert MPC8641HPCN to use libfdt.
Jon Loeliger [Wed, 28 Nov 2007 20:47:18 +0000 (14:47 -0600)]
Convert MPC8641HPCN to use libfdt.

Assumes the presence of the aliases node in the DTS to
locate the ethernet, pci and serial nodes for fixups.

Use consistent fdtaddr and fdtfile in environment variables.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years agoMerge commit 'wd/master'
Jon Loeliger [Thu, 3 Jan 2008 15:46:55 +0000 (09:46 -0600)]
Merge commit 'wd/master'

16 years agocfi_flash: Fix bug in flash_isset() to use correct 32bit function
Stefan Roese [Wed, 2 Jan 2008 13:06:26 +0000 (14:06 +0100)]
cfi_flash: Fix bug in flash_isset() to use correct 32bit function

This bug was detected on the LWMON5 target which has 2 Intel 16bit wide
flash chips connected to a 32bit wide port.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoFix compile problem introduced by "cleanup" commit 3dfd708c
Wolfgang Denk [Wed, 2 Jan 2008 14:58:44 +0000 (15:58 +0100)]
Fix compile problem introduced by "cleanup" commit 3dfd708c

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMake scripts and Makefiles POSIX compliant
Wolfgang Denk [Wed, 2 Jan 2008 14:54:45 +0000 (15:54 +0100)]
Make scripts and Makefiles POSIX compliant

The bash builtin versions of the "test" (resp. "[") command allow
using "==" for string comparisons, but POSIX compatible implemen-
tations (like /usr/bin/test) insist on using "=" only. On such systems
you will see:

$ /usr/bin/test a == a && echo OK
/usr/bin/test: ==: binary operator expected

This patch fixes Makefiles and scripts to use POSIX style.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 2 Jan 2008 11:39:04 +0000 (12:39 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMinor coding style cleanup.
Wolfgang Denk [Wed, 2 Jan 2008 11:38:43 +0000 (12:38 +0100)]
Minor coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Wed, 2 Jan 2008 10:30:58 +0000 (11:30 +0100)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash

16 years agoMerge branch 'for-1.3.2-ver2'
Stefan Roese [Sat, 29 Dec 2007 08:23:11 +0000 (09:23 +0100)]
Merge branch 'for-1.3.2-ver2'

Conflicts:

cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Coding style cleanup
Stefan Roese [Fri, 28 Dec 2007 16:29:56 +0000 (17:29 +0100)]
ppc4xx: Coding style cleanup

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Complete PMC440 board support
Matthias Fuchs [Fri, 28 Dec 2007 16:07:24 +0000 (17:07 +0100)]
ppc4xx: Complete PMC440 board support

This patch brings the PMC440 board configuration file.
Finally it enables the PMC440 board support.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Add FPGA support and BSP commands for PMC440 boards
Matthias Fuchs [Fri, 28 Dec 2007 16:07:18 +0000 (17:07 +0100)]
ppc4xx: Add FPGA support and BSP commands for PMC440 boards

This patch adds some BSP commands and FPGA booting support
for esd's PMC440 boards.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Add initial esd PMC440 board files
Matthias Fuchs [Fri, 28 Dec 2007 16:07:14 +0000 (17:07 +0100)]
ppc4xx: Add initial esd PMC440 board files

This patch adds the first files for the new esd PMC440 boards.
The next two patches will complete the PMC440 board support.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Add EEPROM write protection for PLU405 boards + misc. updates
Matthias Fuchs [Fri, 28 Dec 2007 16:10:36 +0000 (17:10 +0100)]
ppc4xx: Add EEPROM write protection for PLU405 boards + misc. updates

- add EEPROM write protection for esd PLU405 boards.
- initialize NAND GPIOs
- use correct io accessors
- cleanup

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: use correct io accessors for esd's LCD code
Matthias Fuchs [Fri, 28 Dec 2007 16:10:44 +0000 (17:10 +0100)]
ppc4xx: use correct io accessors for esd's LCD code

This patch fixes esd's LCD dectection code to work correctly with
newer gcc versions.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Maintenance patch for VOH405 boards
Matthias Fuchs [Fri, 28 Dec 2007 16:10:42 +0000 (17:10 +0100)]
ppc4xx: Maintenance patch for VOH405 boards

- add EEPROM write protection
- initialize NAND GPIOs
- use correct io accessors
- slow down I2C clock to 100kHz
- enable ext. I2C bus
- cleanup

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Enable 405EP PCI arbiter per default on all boards
Stefan Roese [Fri, 28 Dec 2007 15:08:08 +0000 (16:08 +0100)]
ppc4xx: Enable 405EP PCI arbiter per default on all boards

In an attmemt to clean up the 4xx start.S file, I removed the enabling
of the internal 405EP PCI arbiter. This is needed for multiple other
405EP platforms, like most of the esd 405EP. Now the internal PCI
arbiter is enabled again per default as it has been before.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Fix bug in cpu_init.c (405EP instead of 450EP)
Stefan Roese [Fri, 28 Dec 2007 14:53:46 +0000 (15:53 +0100)]
ppc4xx: Fix bug in cpu_init.c (405EP instead of 450EP)

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Fix compilation problem of kilauea/haleakala nand booting target
Stefan Roese [Fri, 28 Dec 2007 05:06:04 +0000 (06:06 +0100)]
ppc4xx: Fix compilation problem of kilauea/haleakala nand booting target

Use correct link to nand_ecc now located in drivers/mtd/nand/ for the
platforms mentioned above.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2
Stefan Roese [Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)]
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2

16 years agoRemove CPCI440 board
Matthias Fuchs [Thu, 27 Dec 2007 16:03:46 +0000 (17:03 +0100)]
Remove CPCI440 board

This board never left prototyping state and it
became a millstone round my neck. So remove it.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoAdd support for Korat PPC440EPx board
Larry Johnson [Thu, 27 Dec 2007 16:28:51 +0000 (11:28 -0500)]
Add support for Korat PPC440EPx board

These patches add support for the PPC440EPx-based "Korat" board to
U-Boot.  They are based primarily on support for the Sequoia board.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd configuration file for Korat board
Larry Johnson [Sat, 22 Dec 2007 20:16:25 +0000 (15:16 -0500)]
Add configuration file for Korat board

This patch supplies the configuration file for the Korat PPC440EPx-
processor board.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd denali_data_eye.o and denali_spd_ddr2.o to PPC4xx Makefile
Larry Johnson [Sat, 22 Dec 2007 20:16:11 +0000 (15:16 -0500)]
Add denali_data_eye.o and denali_spd_ddr2.o to PPC4xx Makefile

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd 440EPx DDR2 SPD DIMM support
Larry Johnson [Thu, 27 Dec 2007 15:54:48 +0000 (10:54 -0500)]
Add 440EPx DDR2 SPD DIMM support

This patch adds SPD DDR2 support for the 440EPx ("Denali") SDRAM
controller.  It should also work on the 440GRx.  It is based on the DDR2
SPD code for the 440EP/440EPx, but makes no provision for DDR1 support.

This code has been tested on prototype Korat boards with three Kingston
DIMMS: 512 MiB ECC (one rank), 512 MiB non-ECC (one rank) and 1 GiB ECC
(two ranks).  The Korat board has a single DIMM socket, but support has
been provided (though not tested) for boards with two DIMM sockets.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoCopy 440EPx/GRx SDRAM data-eye search to common directory
Larry Johnson [Sat, 22 Dec 2007 20:15:30 +0000 (15:15 -0500)]
Copy 440EPx/GRx SDRAM data-eye search to common directory

This patch creates a non-board-specific file for performing the SDRAM
data-eye search.  It also adds ECC error checking to the test of valid
data on readback when ECC is enabled.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd definitions for 440EPx/GRx SDRAM controller to ppc440.h
Larry Johnson [Sat, 22 Dec 2007 20:15:13 +0000 (15:15 -0500)]
Add definitions for 440EPx/GRx SDRAM controller to ppc440.h

This patch adds the Denali SDRAM controller definitions to "ppc440.h".
It also fixes two typos in the definitions, so the board-specific
"sdram.h" files containing these definitions are also fixed to avoid
compiler warnings.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd Ethernet 1000BASE-X support for PPC4xx
Larry Johnson [Thu, 27 Dec 2007 15:50:55 +0000 (10:50 -0500)]
Add Ethernet 1000BASE-X support for PPC4xx

This patch adds a new switch: "CONFIG_PHY_DYNAMIC_ANEG".  When this symbol
is defined, the PHY will advertise it's capabilities for autonegotiation
based on the capabilities shown in the PHY's status registers, including
1000BASE-X.  When "CONFIG_PHY_DYNAMIC_ANEG" is not defined, the PHY will
advertise hard-coded capabilities, as before.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd driver for National Semiconductor LM73 temperature sensor
Larry Johnson [Thu, 27 Dec 2007 14:52:17 +0000 (09:52 -0500)]
Add driver for National Semiconductor LM73 temperature sensor

This driver is based on the driver for the LM75.

Signed-off-by: Larry Johnson <lrj@acm.org>
16 years agoAdd driver for STMicroelectronics M41T60 RTC
Larry Johnson [Sat, 22 Dec 2007 20:14:00 +0000 (15:14 -0500)]
Add driver for STMicroelectronics M41T60 RTC

This driver is based on the driver for the M41T11.  In the intended
application, the RTC will be powered by a large capacitor, rather than a
battery.  The driver therefore checks to see whether the RTC has lost
power.  The chip's OUT bit is normally reset from its power-up state.  If
the OUT bit is read as set, or if the date and time are not valid, then the
RTC is assumed to have lost power, and its date and time are reset to
1900-01-01 00:00:00.

Support for adjusting the speed of the clock to improve accuracy is
provided through an environment variable.

Signed-off-by: Larry Johnson <lrj@acm.org>