Stefan Roese [Tue, 24 Jun 2008 15:18:50 +0000 (17:18 +0200)]
ppc4xx: Consolidate PPC4xx EBC defines
This patch removes all EBC related defines from the PPC4xx headers
ppc405.h and ppc440.h and introduces a new header
include/asm-ppc/ppc4xx-ebc.h
with all those defines.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 10 Jul 2008 11:52:44 +0000 (13:52 +0200)]
ppc4xx: Remove redundant ft_board_setup() functions from some 4xx boards
This patch removes some ft_board_setup() functions from some 4xx boards.
This can be done since we now have a default weak implementation for this
in cpu/ppc4xx/fdt.c. Only board in need for a different/custom
implementation like canyonlands need their own version.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 10 Jul 2008 13:32:32 +0000 (15:32 +0200)]
ppc4xx: Fix merge problems in 44x_spd_ddr2.c
Signed-off-by: Stefan Roese <sr@denx.de>
Grant Erickson [Tue, 8 Jul 2008 15:35:00 +0000 (08:35 -0700)]
ppc4xx: Add MII mode support to the EMAC RGMII Bridge
This patch adds support for placing the RGMII bridge on the
PPC405EX(r) into MII/GMII mode and allows a board-specific
configuration to specify the bridge mode at compile-time.
Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Grant Erickson [Wed, 9 Jul 2008 23:46:35 +0000 (16:46 -0700)]
ppc4xx: Add Mnemonics for AMCC/IBM DDR2 SDRAM Controller
This patch completes the preprocessor mneomics for the IBM DDR2 SDRAM
controller registers (MODT and INITPLR) used by the
PowerPC405EX(r). The MMODE and MEMODE registers are unified with their
peer values used for the INITPLR MR and EMR registers,
respectively. Finally, a spelling typo is correct (MANUEL to MANUAL).
With these mnemonics in place, the CFG_SDRAM0_* magic numbers for
Kilauea are replaced by equivalent mnemonics to make it easier to
compare and contrast other 405EX(r)-based boards (e.g. during board
bring-up).
Finally, unified the SDRAM controller register dump routine such that
it can be used across all processor variants that utilize the IBM DDR2
SDRAM controller core. It produces output of the form:
PPC4xx IBM DDR2 Register Dump:
...
SDRAM_MB0CF[40] = 0x00006701
...
which is '<mnemonic>[<DCR #>] = <value>'. The DCR number is included
since it is not uncommon that the DCR values in header files get mixed
up and it helps to validate, at a glance, they match what is printed
in the user manual.
Tested on:
AMCC Kilauea/Haleakala:
- NFS Linux Boot: PASSED
- NAND Linux Boot: PASSED
Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Grant Erickson [Wed, 9 Jul 2008 23:31:59 +0000 (16:31 -0700)]
ppc4xx: Add AMCC/IBM DDR2 SDRAM ECC Field Mnemonics
Add additional DDR2 SDRAM memory controller DCR mneomnics, condition
revision ID DCR based on 405EX, and add field mnemonics for bus error
status and ECC error status registers.
Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Grant Erickson [Wed, 9 Jul 2008 23:31:36 +0000 (16:31 -0700)]
ppc4xx: Add SDR0_SRST Mnemonics for the 405EX(r)
This patch adds bit field mnemonics for the 405EX(r) SDR0_SRST soft reset register.
Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Grant Erickson [Wed, 9 Jul 2008 18:55:46 +0000 (11:55 -0700)]
PPC4xx: Correct SDRAM_MCSTAT for PPC405EX(r)
While the PowerPC 405EX(r) shares in common the AMCC/IBM DDR2 SDRAM
controller core also used in the 440SP, 440SPe, 460EX, and 460GT, in
the 405EX(r), SDRAM_MCSTAT has a different DCR value.
Its present value on the 405EX(r) causes a read back of 0xFFFFFFFF
which causes SDRAM initialization to periodically fail since it can
prematurely indicate SDRAM ready status.
Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Feng Kan [Wed, 9 Jul 2008 05:48:42 +0000 (22:48 -0700)]
ppc4xx: Initial framework of the AMCC PPC460SX redwood reference board.
Add AMCC Redwood reference board that uses the latest
PPC 464 CPU processor combined with a rich mix of peripheral
controllers. The board will support PCIe, mutiple Gig ethernet
ports, advanced hardware RAID assistance and IEEE 1588.
Signed-off-by: Feng Kan <fkan@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Feng Kan [Wed, 9 Jul 2008 05:48:07 +0000 (22:48 -0700)]
ppc4xx: Add initial 460SX reference board (redwood) config file and defines.
Signed-off-by: Feng Kan <fkan@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Feng Kan [Wed, 9 Jul 2008 05:47:31 +0000 (22:47 -0700)]
ppc4xx: Add initial 460SX defines for the cpu/ppc4xx directory.
Signed-off-by: Feng Kan <fkan@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Thu, 10 Jul 2008 23:16:00 +0000 (01:16 +0200)]
Fix some more print() format errors.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Kim Phillips [Thu, 10 Jul 2008 19:00:15 +0000 (14:00 -0500)]
silence misc printf formatting compiler warnings
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Wolfgang Denk [Thu, 10 Jul 2008 20:09:39 +0000 (22:09 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc512x
Wolfgang Denk [Thu, 10 Jul 2008 19:53:51 +0000 (21:53 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc86xx
Markus Klotzbücher [Thu, 10 Jul 2008 12:47:09 +0000 (14:47 +0200)]
USB: shutdown USB before booting
This patch fixes a potentially serious issue related to USB which was
discouvered by Martin Krause <martin.krause@tqs.de> and fixed for
ARM920T. Martin wrote:
Turn off USB to prevent the host controller from writing to the
SDRAM while Linux is booting. This could happen, because the HCCA
(Host Controller Communication Area) lies within the SDRAM and the
host controller writes continously to this area (as busmaster!), for
example to increase the HccaFrameNumber variable, which happens
every 1 ms.
This is a slightly modified version of the patch in order to shutdown
USB when booting on all architectures.
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
Martha Marx [Thu, 29 May 2008 18:23:25 +0000 (14:23 -0400)]
Configuration changes for ADS5121 Rev 3
ADS5121 Rev 3 board is now the default config
config targets are now
ads5121_config
Rev 3 board with
PCI
M41T62 on board RTC
512MB DRAM
ads5121_rev2_config
Rev 2 board with
No PCI
256MB DRAM
Signed-off-by: Martha Marx <mmarx@silicontkx.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: John Rigby <jrigby@freescale.com>
Martha Marx [Thu, 29 May 2008 19:37:21 +0000 (15:37 -0400)]
Consolidate ADS5121 IO Pin configuration
Consolidate ADS5121 IO Pin configuration to one file
board/ads5121/iopin.c.
Remove pin config from cpu/mpc512x/fec.c
Signed-off-by: Martha Marx <mmarx@silicontkx.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: John Rigby <jrigby@freescale.com>
Jon Loeliger [Thu, 10 Jul 2008 17:05:32 +0000 (12:05 -0500)]
Merge commit 'wd/master'
Christian Eggers [Fri, 27 Jun 2008 17:46:51 +0000 (19:46 +0200)]
Fix "usb part" command
Only print partition for selected device if user supplied the <dev>
arg with the "usb part [dev]" command.
Signed-off-by: Christian Eggers <ceggers@gmx.de>
Acked-by: Markus Klotzbuecher <mk@denx.de>
Harald Welte [Sun, 6 Jul 2008 16:58:05 +0000 (00:58 +0800)]
fix USB devices with multiple configurations
This patch fixes bugs in usbdcore*.c related to the use of devices
with multiple configurations.
The original code made mistakes about the meaning of configuration value and
configuration index, and the resulting off-by-one errors resulted in:
* SET_CONFIGURATION always selected the first configuration, no matter what
wValue is being passed.
* GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first
configuration (index 0).
Signed-off-by: Harald Welte <laforge@openmoko.org>
Acked-by: Markus Klotzbuecher <mk@denx.de>
Wolfgang Denk [Thu, 10 Jul 2008 11:16:34 +0000 (13:16 +0200)]
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Thu, 10 Jul 2008 11:16:09 +0000 (13:16 +0200)]
Fix some more print() format errors.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Christian Eggers [Fri, 27 Jun 2008 17:46:51 +0000 (19:46 +0200)]
Fix "usb part" command
Only print partition for selected device if user supplied the <dev>
arg with the "usb part [dev]" command.
Signed-off-by: Christian Eggers <ceggers@gmx.de>
Acked-by: Markus Klotzbuecher <mk@denx.de>
Harald Welte [Sun, 6 Jul 2008 16:58:05 +0000 (00:58 +0800)]
fix USB devices with multiple configurations
This patch fixes bugs in usbdcore*.c related to the use of devices
with multiple configurations.
The original code made mistakes about the meaning of configuration value and
configuration index, and the resulting off-by-one errors resulted in:
* SET_CONFIGURATION always selected the first configuration, no matter what
wValue is being passed.
* GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first
configuration (index 0).
Signed-off-by: Harald Welte <laforge@openmoko.org>
Acked-by: Markus Klotzbuecher <mk@denx.de>
Wolfgang Denk [Thu, 10 Jul 2008 08:50:38 +0000 (10:50 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx
Stefan Roese [Thu, 10 Jul 2008 08:10:54 +0000 (10:10 +0200)]
MTD/NAND: Fix printf format warning in nand code
This patch fixes NAND related printf format warning. Those warnings are
now visible since patch
dc4b0b38d4aadf08826f6c31270f1eecd27964fd
[Fix printf errors.] by Andrew Klossner has been applied. Thanks, this is
really helpful.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 10 Jul 2008 08:00:45 +0000 (10:00 +0200)]
rtc: Fix printf format warning in m41t60.c
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Tue, 8 Jul 2008 10:01:47 +0000 (12:01 +0200)]
pci: Move PCI device configuration check into a separate weak function
This patch moves the check, if a device should be skipped in PCI PNP
configuration into the function pci_skip_dev(). This function is defined
as weak so that it can be overwritten by a platform specific one if
needed. The check if the device should get printed in the PCI summary upon
bootup (when CONFIG_PCI_SCAN_SHOW is defined) is moved to the function
pci_print_dev() which is also defined as weak too.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 10 Jul 2008 07:58:06 +0000 (09:58 +0200)]
ppc4xx: Fix printf format warnings now visible with the updated format check
This patch fixes ppc4xx related printf format warning. Those warnings are
now visible since patch
dc4b0b38d4aadf08826f6c31270f1eecd27964fd
[Fix printf errors.] by Andrew Klossner has been applied. Thanks, this is
really helpful.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 9 Jul 2008 15:33:57 +0000 (17:33 +0200)]
ppc4xx: Enable support for > 2GB SDRAM on AMCC Katmai
Newer PPC's like 440SPe, 460EX/GT can be equipped with more than 2GB of SDRAM.
To support such configurations, we "only" map the first 2GB via the TLB's. We
need some free virtual address space for the remaining peripherals like, SoC
devices, FLASH etc.
Note that ECC is currently not supported on configurations with more than 2GB
SDRAM. This is because we only map the first 2GB on such systems, and therefore
the ECC parity byte of the remaining area can't be written.
Signed-off-by: Stefan Roese <sr@denx.de>
Larry Johnson [Sat, 14 Jun 2008 21:02:49 +0000 (17:02 -0400)]
ppc4xx: Remove implementation of testdram() from Korat board support
Signed-off-by: Larry Johnson <lrj@acm.org>
Signed-off-by: Stefan Roese <sr@denx.de>
Larry Johnson [Sat, 14 Jun 2008 20:53:02 +0000 (16:53 -0400)]
ppc4xx: Update and add FDT to Korat board support
Signed-off-by: Larry Johnson <lrj@acm.org>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Thu, 10 Jul 2008 07:09:45 +0000 (09:09 +0200)]
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Wolfgang Denk [Wed, 9 Jul 2008 23:13:30 +0000 (01:13 +0200)]
Minor coding style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Wed, 9 Jul 2008 22:59:04 +0000 (00:59 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash
Paul Gortmaker [Wed, 9 Jul 2008 21:50:45 +0000 (17:50 -0400)]
e1000: add support for 82545GM 64bit PCI-X copper variant
This PCI-X e1000 variant works by just adding in the correct
PCI IDs in the appropriate places.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Daniel Hellstrom [Wed, 9 Jul 2008 12:34:11 +0000 (12:34 +0000)]
SPARC: Build error fix
(introduced by commit
391fd93ab23e15ab3dd58a54f5b609024009c378)
This patch makes SPARC targets build again. It is caused by
phys_addr_t and phys_size_t being defined in the wrong header
file. include/lmb.h need those typedefs to build.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Marcel Ziswiler [Wed, 9 Jul 2008 06:17:15 +0000 (08:17 +0200)]
Many spelling fixes in README.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Marcel Ziswiler [Wed, 9 Jul 2008 06:17:06 +0000 (08:17 +0200)]
Minor spelling fix in comment.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Hugo Villeneuve [Tue, 8 Jul 2008 18:54:58 +0000 (14:54 -0400)]
Round the serial port clock divisor value returned by calc_divisor()
Round the serial port clock divisor value returned by
calc_divisor().
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: John Roberts <john.roberts@pwav.com>
Scott Wood [Wed, 9 Jul 2008 22:47:52 +0000 (17:47 -0500)]
NAND: ifdef-protect most of nand.h when using legacy NAND.
Some macros such as NAND_CTL_SETALE conflict between current and legacy
NAND, being defined by the subsystem in the former case and the board
config file in the latter.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Hugo Villeneuve [Tue, 8 Jul 2008 15:02:05 +0000 (11:02 -0400)]
ARM: Fix for wrong patch version applied for Lyrtech SFF-SDR board (ARM926EJS)
ARM: Fix for incorrect version of patch applied when
adding support for the Lyrtech SFF-SDR board.
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Philip Balister, OpenSDR <philip@opensdr.com>
Kyungmin Park [Tue, 8 Jul 2008 00:08:40 +0000 (09:08 +0900)]
Remove useless print message at apollon
Remove useless print message at apollon
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Andy Fleming [Mon, 7 Jul 2008 19:24:39 +0000 (14:24 -0500)]
Fix LMB type issues
The LMB code now uses phys_addr_t and phys_size_t. Also, there were a couple
of casting problems in the bootm code that called the LMB functions.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Kumar Gala [Mon, 7 Jul 2008 14:39:06 +0000 (09:39 -0500)]
Fix compiler warnings
gcc-4.3.x generates the following:
bootm.c: In function 'do_bootm_linux':
bootm.c:208: warning: cast from pointer to integer of different size
bootm.c:215: warning: cast from pointer to integer of different size
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Harald Welte [Mon, 7 Jul 2008 07:40:39 +0000 (15:40 +0800)]
Remove code duplication for setting the default environment
common/env_common.c (default_env): new function that resets the environment to
the default value
common/env_common.c (env_relocate): use default_env instead of own copy
common/env_nand.c (env_relocate_spec): use default_env instead of own copy
include/environment.h: added default_env prototype
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Signed-off-by: Harald Welte <laforge@openmoko.org>
Marcel Ziswiler [Sun, 22 Jun 2008 14:13:46 +0000 (16:13 +0200)]
NAND: Fix warning due to missing env_ptr casts to u_char * in env_nand.c.
The writeenv() and readenv() calls introduced by the recently added bad block
management for environment variables were missing casts therefore producing
compile time warnings.
While at it fixing some typo in a comment and indentation.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Scott Wood [Fri, 20 Jun 2008 17:38:57 +0000 (12:38 -0500)]
NAND: Rename DEBUG to MTDDEBUG to avoid namespace pollution.
This is particularly problematic now that non-NAND-specific code is
including <nand.h>, and thus all debugging code is being compiled
regardless of whether it was requested, as reported by Scott McNutt
<smcnutt@psyent.com>.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Haavard Skinnemoen [Thu, 12 Jun 2008 17:27:58 +0000 (19:27 +0200)]
mmc: Move atmel_mci driver into drivers/mmc
This makes it easier to use the driver on other platforms.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Haavard Skinnemoen [Thu, 12 Jun 2008 17:27:57 +0000 (19:27 +0200)]
avr32: Use CONFIG_ATMEL_MCI to select the atmel_mci driver
After we move the atmel_mci driver into drivers/mmc, we can't select
it with CONFIG_MMC anymore. Introduce a new symbol specifically for
this driver so that there's no ambiguity.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Haavard Skinnemoen [Thu, 12 Jun 2008 17:27:56 +0000 (19:27 +0200)]
Create drivers/mmc subdirectory
In order to consolidate more of the various MMC drivers around the
tree, we must first have a common place to put them.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Joakim Tjernlund [Sun, 6 Jul 2008 10:30:09 +0000 (12:30 +0200)]
Change env_get_char from a global function ptr to a function
This avoids an early global data reference.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Matvejchikov Ilya [Sun, 6 Jul 2008 09:57:58 +0000 (13:57 +0400)]
Some copy-n-paste fixes in printf usage
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
Matvejchikov Ilya [Sun, 6 Jul 2008 09:57:00 +0000 (13:57 +0400)]
FDT memory and pci node fixes for MPC8260ADS
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
Andrew Klossner [Mon, 7 Jul 2008 13:41:14 +0000 (06:41 -0700)]
Fix printf errors.
The compiler will help find mismatches between printf formats and
arguments if you let it. This patch adds the necessary attributes to
declarations in include/common.h, then begins to correct the resulting
compiler warnings. Some of these were bugs, e.g., "$d" instead of
"%d" and incorrect arguments. Others were just annoying, like
int-long mismatches on a system where both are 32 bits. It's worth
fixing the annoying errors to catch the real ones.
Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
Wolfgang Denk [Wed, 9 Jul 2008 21:24:23 +0000 (23:24 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mips
Wolfgang Denk [Wed, 9 Jul 2008 21:23:39 +0000 (23:23 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Wed, 9 Jul 2008 21:22:54 +0000 (23:22 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-net
Wolfgang Denk [Wed, 9 Jul 2008 21:09:36 +0000 (23:09 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-sh
Becky Bruce [Wed, 9 Jul 2008 16:09:41 +0000 (11:09 -0500)]
Allow print_size to print in GB
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Jason McMullan [Mon, 9 Jun 2008 03:56:00 +0000 (23:56 -0400)]
mips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environment
Add 'ethaddr' and 'eth1addr' to the Linux kernel environment if
they are set in the U-Boot environment.
Signed-off-by: Jason McMullan <mcmullan@netapp.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Stefan Roese [Tue, 8 Jul 2008 10:57:14 +0000 (12:57 +0200)]
jedec_flash: Fix AM29DL800BB device ID
As pointed out by Jerry Hicks, this patch corrects the device ID of
the Spansion AM29DL800BB NOR device. Verified against latest Spansion
datasheet (rev C4 from Dezember 2006).
Signed-off-by: Stefan Roese <sr@denx.de>
Nobuhiro Iwamatsu [Mon, 7 Jul 2008 02:22:37 +0000 (11:22 +0900)]
sh: Fix compile error sh7763rdp board
Disable SH ether driver.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 8 Jul 2008 03:03:24 +0000 (12:03 +0900)]
sh: Fix SH-boards compile error
By Cleanup out-or-tree building for some boards (.depend)
(commit:
c8a3b109f07f02342d097b30908965f7261d9f15)
because filse ware changed, some SH-boards have compile error.
I revised this problem.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Jason Jin [Tue, 13 May 2008 03:50:36 +0000 (11:50 +0800)]
Feed the watchdog in u-boot for 8610 board.
The watchdog on 8610 board is enabled by setting sw[6]
to on. Once enabled, the watchdog can not be disabled
by software. So feed the dog in u-boot is necessary for
normal operation.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
Stefan Roese [Mon, 7 Jul 2008 07:51:25 +0000 (09:51 +0200)]
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Hugo Villeneuve [Wed, 18 Jun 2008 16:10:33 +0000 (12:10 -0400)]
Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c.
Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c.
Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/lxt972.c.
Fixed style issues.
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Hugo Villeneuve [Wed, 18 Jun 2008 16:10:31 +0000 (12:10 -0400)]
Remove duplicate definitions in include/lxt971a.h.
Remove duplicate definitions in include/lxt971a.h.
Remove duplicate registers and bits definitions in
include/lxt971a.h for standard MII registers, and
use values in include/miiphy.h instead.
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Nobuhiro Iwamatsu [Wed, 11 Jun 2008 12:05:00 +0000 (21:05 +0900)]
net: sh: Renesas SH7763 Ethernet device support
Renesas SH7763 has 2 channel Ethernet device.
This is 10/100/1000 Base support.
But this patch check 10/100 Base only.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:28:05 +0000 (16:28 +0900)]
sh: Update Renesas R2DPlus board
New NOR Flash board support and remove old type flash board config.
And Remove network setting from config file.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:28:01 +0000 (16:28 +0900)]
sh: Update Renesas R7780MP board
New NOR Flash board support and remove network setting from config file.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:56 +0000 (16:27 +0900)]
sh: Update Renesas Migo-R board
Remove network setting from config file.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:52 +0000 (16:27 +0900)]
sh: Update Hitachi MS7722SE board
Remove network setting from config file.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:48 +0000 (16:27 +0900)]
sh: Cleanup source code of SH7763RDP
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:44 +0000 (16:27 +0900)]
sh: Cleanup source code of R2DPlus
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:41 +0000 (16:27 +0900)]
sh: Cleanup source code of R7780MP
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:38 +0000 (16:27 +0900)]
sh: Cleanup source code of MS7722SE
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:34 +0000 (16:27 +0900)]
sh: Cleanup source code of MS7720SE
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wolfgang Denk [Sun, 6 Jul 2008 22:48:02 +0000 (00:48 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 6 Jul 2008 22:47:58 +0000 (00:47 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-at91
Wolfgang Denk [Sun, 6 Jul 2008 22:45:03 +0000 (00:45 +0200)]
SH: fix out of tree building
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 6 Jul 2008 22:39:50 +0000 (00:39 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 6 Jul 2008 22:39:43 +0000 (00:39 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-avr32
Wolfgang Denk [Sun, 6 Jul 2008 22:33:07 +0000 (00:33 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 6 Jul 2008 22:32:47 +0000 (00:32 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx
Nobuhiro Iwamatsu [Thu, 3 Jul 2008 14:16:06 +0000 (23:16 +0900)]
net: smc911x: Fix typo
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Andre Schwarz [Wed, 2 Jul 2008 16:54:08 +0000 (18:54 +0200)]
update mvBL-M7 board config
update mvBL-M7 config file to use UBOOT_VERSION and define
CONFIG_HIGH_BATS.
Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Nobuhiro Iwamatsu [Mon, 30 Jun 2008 08:45:01 +0000 (17:45 +0900)]
net: fix compile problem in smc911x driver.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
Michal Simek [Tue, 24 Jun 2008 07:54:09 +0000 (09:54 +0200)]
ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405
This change helps with better handling with others
Xilinx based platform.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stefan Roese <sr@denx.de>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 04:07:11 +0000 (13:07 +0900)]
net: ne2000: Move dev_addr variable from grobal to local.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 04:07:15 +0000 (13:07 +0900)]
net: ne2000: Fix compile error of NE2000
If enable DEBUG, can not compile ne2000 driver.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Ben Warren [Tue, 24 Jun 2008 05:57:27 +0000 (22:57 -0700)]
Add mechanisms for CPU and board-specific Ethernet initialization
This patch is the first step in cleaning up net/eth.c, by moving Ethernet
initialization to CPU or board-specific code. Initial implementation is
only on the Freescale TSEC controller, but others will be added soon.
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Wolfgang Denk [Sat, 5 Jul 2008 23:21:46 +0000 (01:21 +0200)]
include/sha256.h: fix file permissions.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sat, 5 Jul 2008 23:15:17 +0000 (01:15 +0200)]
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Patrice Vilchez [Tue, 27 May 2008 09:15:29 +0000 (11:15 +0200)]
[AT91SAM9] Fix NAND FLASH timings
Fix NAND FLASH timings for at91sam9x evaluation kits.
New timings are based on application note
"NAND Flash Support on AT91SAM9 Microcontrollers" available at
http://atmel.com/dyn/resources/prod_documents/doc6255.pdf
Signed-off-by: Patrice Vilchez <patice.vilchez@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Stelian Pop <stelian@popies.net>
Stelian Pop [Wed, 21 May 2008 22:15:40 +0000 (00:15 +0200)]
Fix boot from NOR due to incorrect reset delay.
AT91 RSTC registers are battery-backuped, so their values
are not reset across power cycles. One of those registers,
the AT91_RSTC_MR register, is being modified by U-Boot, in
the ethernet initialisation routine, to generate a 500ms
user reset.
Unfortunately, this value is not being restored afterwards,
causing subsequent resets to also last for 500ms.
This long reset sequence causes problems (at least) in the
boot sequence from NOR: by the time the CPU tries to load
a program from the NOR flash, the latter is still in reset
and not yet available.
Additionaly, this patch fixes a bug in the original code which
caused the reset delay to last for 2s instead of 500ms.
Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Wolfgang Denk [Fri, 4 Jul 2008 18:11:49 +0000 (20:11 +0200)]
Update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Fri, 4 Jul 2008 18:07:35 +0000 (20:07 +0200)]
CCM/SCM boards: fix out of tree building
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Thu, 3 Jul 2008 21:22:27 +0000 (23:22 +0200)]
SCM board: fix build errors.
Signed-off-by: Wolfgang Denk <wd@denx.de>