Gururaja Hebbar K R [Wed, 2 Apr 2008 05:34:43 +0000 (11:04 +0530)]
Remove duplicate #undef SHOW_INFO in drivers/usb/usb_ohci.c
Signed-off-by: gururaja hebbar <gururajakr@sanyo.co.in>
Jean-Christophe PLAGNIOL-VILLARD [Tue, 1 Apr 2008 12:07:10 +0000 (14:07 +0200)]
s3c4510b_eth: fix 'packed' attribute ignored for fields of MACFrame
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Guennadi Liakhovetski [Tue, 15 Apr 2008 08:24:14 +0000 (10:24 +0200)]
Additional PCI IDs for IDE and network controllers
These PCI IDs are required by the Linkstation platforms.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Joakim Tjernlund [Mon, 14 Apr 2008 21:01:50 +0000 (23:01 +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>
Sascha Laue [Tue, 1 Apr 2008 13:13:03 +0000 (15:13 +0200)]
Fix watchdog POST for lwmon5
If the hardware watchdog detects a voltage error, the watchdog sets
GPIO62 to low. The watchdog POST has to detect this low level.
Signed-off-by: Sascha Laue <leglas0@legpc180.leg.liebherr.i>
Dave Liu [Tue, 1 Apr 2008 07:22:11 +0000 (15:22 +0800)]
ata: update the libata.h from ata.h of linux kernel
Current libata.h of u-boot is out of sync from linux kernel,
this patch make it be consistent with linux kernel.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Tor Krill <tor@excito.com>
Kumar Gala [Mon, 31 Mar 2008 16:59:27 +0000 (11:59 -0500)]
Allow use of ARCH=powerpc when building
The linux kernel is now mostly ARCH=powerpc, so to make life easier
allow use to use ARCH=powerpc and convert it to ARCH=ppc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kyungmin Park [Mon, 31 Mar 2008 01:40:54 +0000 (10:40 +0900)]
Add apollon board MAINTAINERS entry
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Mon, 31 Mar 2008 01:40:36 +0000 (10:40 +0900)]
Fix OneNAND read
It should access with 16-bit instead of 8-bit
Now it uses the generic memcpy with 8-bit access. It means it reads wrong data from OneNAND.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kyungmin Park [Mon, 31 Mar 2008 01:40:19 +0000 (10:40 +0900)]
Fix OneNAND erase command
It mis-calculates the block address.
Also fix DECLARE_GLOBAL_DATA_PTR in env_onenand.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Guennadi Liakhovetski [Sun, 30 Mar 2008 23:32:15 +0000 (01:32 +0200)]
Support for LinkStation / KuroBox HD and HG PPC models
This patch is based on the port by Mihai Georgian (see linkstation.c for
Copyright information) and implements support for LinkStation / KuroBox HD
and HG PPC models from Buffalo Technology, whereby HD is deactivated at
the moment, pending network driver fixing.
Notice to users: this is pretty much a barebone port. Support for network
on HG models is already in the U-Boot mainline, but you might also want
patches to switch fan / phy modes depending on the negotiated ethernet
parameters. This patch also doesn't support console switching, booting EM
mode, Buffalo specific ext2 magic number. So, if you want to use any of
those, you need additional patches. Otherwise this patche provides a fully
functional u-boot with a network console on your system.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
TsiChung Liew [Sun, 30 Mar 2008 06:22:13 +0000 (01:22 -0500)]
Add CONFIG_MII_INIT support to related boards
Replace CONFIG_8xx and CONFIG_MCF532x to CONFIG_MII_INIT in
cmd_init.c. Add CONFIG_MII_INIT to board configuration files
that use mii_init() in cmd_init.c.
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
TsiChung Liew [Sun, 30 Mar 2008 06:19:06 +0000 (01:19 -0500)]
Update CONFIG_PCIAUTO_SKIP_HOST_BRIDGE to related boards
Remove test for CONFIG_MPC5200 in drivers/pci/pci_auto.c and define
CONFIG_PCIAUTO_SKIP_HOST_BRIDGE in related board configuration files.
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Kumar Gala [Thu, 27 Mar 2008 16:46:38 +0000 (11:46 -0500)]
Introduce phys_size_t and move phys_addr_t into asm/types.h
Also add CONFIG_PHYS_64BIT on powerpc to deal with 32-bit ppc's
that have larger physical addresses like 44x, 85xx, and 86xx.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Andy Fleming [Wed, 2 Apr 2008 21:19:07 +0000 (16:19 -0500)]
Rename include/md5.h to include/u-boot/md5.h
Some systems have md5.h installed in /usr/include/. This isn't the
desired file (we want the one in include/md5.h). This will avoid the
conflict. This fixes the host tools building problem by creating a new
directory for U-Boot specific header files.
[Patch by Andy Fleming, modified to use separate directory by Wolfgang
Denk]
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
Dave Liu [Thu, 27 Mar 2008 10:51:17 +0000 (18:51 +0800)]
drivers: code clean up
Signed-off-by: Dave Liu <daveliu@freescale.com>
Dave Liu [Thu, 27 Mar 2008 10:50:41 +0000 (18:50 +0800)]
drivers: clean up the ata_piix.h
Signed-off-by: Dave Liu <daveliu@freescale.com>
Dave Liu [Thu, 27 Mar 2008 10:49:56 +0000 (18:49 +0800)]
doc: english polishing for README.sata
according to gvb's suggestion, polishing for the doc.
Signed-off-by: Jerry Van Baren <gerald.vanbaren@ge.com>
Signed-off-by: Dave Liu <daveliu@freescale.com>
Kumar Gala [Wed, 26 Mar 2008 23:53:28 +0000 (18:53 -0500)]
Fix warnings introduced by I2C bus speed setting patch
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
eran liberty [Wed, 26 Mar 2008 23:50:49 +0000 (00:50 +0100)]
Altera Stratix II support
Adds Support for Altera's Stratix II.
Within your board specific init file you will have to call
1. fpga_init (/* relocated code offset. usually => */ gd->reloc_off);
2. fpga_add (fpga_altera, (Altera_desc*)&altera_desc);
Altera_desc* contines (for example):
{
Altera_StratixII, /* part type */
passive_serial, /* interface type */
1, /* bytes of data part can accept */
(void *)(&funcs), /* interface function table */
0L, /* base interface address */
0 /* implementation specific cookie */
}
funcs is the interface. It is of type altera_board_specific_func.
It looks like this:
altera_board_specific_func func = {
pre_fn,
config_fn,
status_fn,
done_fn,
clk_fn,
data_fn,
abort_fn,
post_fn,
};
you will have to implement these functions, which is usually bit
banging some gpio.
Signed-off-by: Eran Liberty <liberty@extricom.com>
Wolfgang Denk [Sun, 13 Apr 2008 21:32:54 +0000 (14:32 -0700)]
Update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Sascha Hauer [Wed, 26 Mar 2008 19:41:17 +0000 (20:41 +0100)]
Phytec Phycore-i.MX31 support
This patch adds support for the Phytec Phycore-i.MX31 board
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Sascha Hauer [Wed, 26 Mar 2008 19:41:09 +0000 (20:41 +0100)]
mx31 litekit support
This patch adds support for the mx31 litekit board
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Sascha Hauer [Wed, 26 Mar 2008 19:40:49 +0000 (20:40 +0100)]
add an i2c driver for mx31
This patch adds an i2c driver for Freescale i.MX processors
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Sascha Hauer [Wed, 26 Mar 2008 19:40:42 +0000 (20:40 +0100)]
core support for Freescale mx31
This patch adds the core support for Freescale mx31
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Wolfgang Denk [Sun, 13 Apr 2008 21:19:23 +0000 (14:19 -0700)]
Fix compile error
...as suggested by Peter Pearse
Signed-off-by: Wolfgang Denk <wd@denx.de>
Sascha Hauer [Wed, 26 Mar 2008 19:40:36 +0000 (20:40 +0100)]
Separate omap24xx specific code from arm1136
Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136
to cpu/arm1136/omap24xx.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Mike Frysinger [Tue, 29 Jan 2008 23:21:05 +0000 (18:21 -0500)]
disable caches before booting an app for Blackfin apps
It isn't generally save to execute applications outside of U-Boot with caches
enabled due to the way the Blackfin processor handles caches (requires
software assistance). This patch disables caches before booting an ELF or
just booting raw code. The previous discussion on the patch was that we
wanted to use weaks instead, but that proved to not be feasible when multiple
symbols are involved, which puts us back at the ifdef solution. I've
minimized the ugliness by moving the setup step outside of the main function.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Sun, 13 Apr 2008 17:03:54 +0000 (10:03 -0700)]
ppc: Get rid of unused machine type definitions
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 13 Apr 2008 16:59:26 +0000 (09:59 -0700)]
Coding Style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 13 Apr 2008 16:42:35 +0000 (09:42 -0700)]
Merge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 13 Apr 2008 16:40:35 +0000 (09:40 -0700)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Sun, 13 Apr 2008 16:39:26 +0000 (09:39 -0700)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx
Wolfgang Denk [Sun, 13 Apr 2008 16:38:13 +0000 (09:38 -0700)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc85xx
Wolfgang Denk [Sun, 13 Apr 2008 16:34:11 +0000 (09:34 -0700)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Sun, 13 Apr 2008 16:30:26 +0000 (09:30 -0700)]
Merge branch 'master' of git://denx.de/git/u-boot-microblaze
Wolfgang Denk [Sun, 13 Apr 2008 16:21:00 +0000 (09:21 -0700)]
Merge branch 'master' of git://denx.de/git/u-boot-sparc
Larry Johnson [Thu, 21 Feb 2008 18:58:11 +0000 (13:58 -0500)]
LM73 bug fix for negative temperatures and cleanup
When the LM73 temperature sensor measures a temperature below 0 C, the
current driver does not perform sign extension, so the result returned is
512 C too high. This patch fixes the problem, and does general cleanup
of the code.
Signed-off-by: Larry Johnson <lrj@acm.org>
Guennadi Liakhovetski [Thu, 3 Apr 2008 11:36:02 +0000 (13:36 +0200)]
cfi_flash: Support buffered writes on non-standard Spansion NOR flash
Some NOR flash chip from Spansion, for example, the s29ws-n MirrorBit
series require different addresses for buffered write commands. Define a
configuration option to support buffered writes on those chips. A more
elegant solution would be to automatically detect those chips by parsing
their CFI records, but that would require introduction of a fixup table
into the cfi_flash driver.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Lee Nipper [Thu, 10 Apr 2008 14:35:06 +0000 (09:35 -0500)]
mpc83xx: Update DIMM data bus width test to support 40-bit width
32-bit wide ECC memory modules report 40-bit width.
Changed the DIMM data bus width test to 'less than 64' instead of 'equal 32'.
Signed-off-by: Lee Nipper <lee.nipper@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Dave Liu [Mon, 31 Mar 2008 09:05:12 +0000 (17:05 +0800)]
mpc83xx: Fix the bug of serdes initialization
Currently the serdes will not be initializated due to the
partid's error.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Dave Liu [Thu, 3 Apr 2008 08:28:29 +0000 (16:28 +0800)]
mpc83xx: Fix the SATA clock setting of 837x targets
Currently the SATA controller clock is configured as CSB clock,
usually the CSB clock is 400/333/266MHz.
However, The SATA IP block is only guaranteed to operate up to
200 MHz as stated in the HW spec.
The bug is reported by Joe D'Abbraccio <ljd015@freescale.com>
This patch makes the SATA clock as half of CSB clock.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Jean-Christophe PLAGNIOL-VILLARD [Wed, 2 Apr 2008 11:41:21 +0000 (13:41 +0200)]
mpc837xerdb: Fix warning: implicit declaration of function 'fdt_fixup_dr_usb'
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Kumar Gala [Wed, 9 Apr 2008 09:20:57 +0000 (04:20 -0500)]
85xx: Fix detection of MP cpu spin up
We were looking at the wrong memory offset to determine of a secondary
cpu had been spun up or not. Also added a warning message if the
all the secondary cpus we expect don't spin up.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala [Tue, 8 Apr 2008 15:45:50 +0000 (10:45 -0500)]
85xx: Use SVR_SOC_VER instead of SVR_VER
The recent change introduced by 'Update SVR numbers to expand support'
now requires that we use SVR_SOC_VER instead of SVR_VER if we want
to compare against a particular processor id.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Eugene O'Brien [Fri, 11 Apr 2008 14:00:35 +0000 (10:00 -0400)]
ppc4xx: Fix power mgt definitions for PPC440
Corrected DCR addresses of PPC440EP power management registers.
Signed-off-by: Eugene O'Brien <eugene.obrien@advantechamt.com>
Wolfgang Denk [Fri, 11 Apr 2008 13:11:26 +0000 (15:11 +0200)]
Stefan Roese [Fri, 11 Apr 2008 05:02:29 +0000 (07:02 +0200)]
ppc4xx: Update Kilauea defconfig to use device-tree booting as default
This patch reworks the default environment on Kilauea/Haleakala. Now
"net_nfs" for exmaple 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 togeet adjusted.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 9 Apr 2008 09:58:02 +0000 (11:58 +0200)]
ppc4xx: Fix Canyonlands default environment to work with new image support
Since the new image support checks for image overwriting, the default
environment needs to get adjusted to use correct addresses.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 9 Apr 2008 09:54:11 +0000 (11:54 +0200)]
ppc: Revert patch
70431e8a that used _start instead of CFG_MONITOR_BASE
The patch
70431e8a7393b6b793f77957f95b999fc9a269b8 (Make MPC83xx one step
closer to full relocation.) doesn't use CFG_MONITOR_BASE anymore. But
on 4xx systems _start currently cannot be used for this calculation.
So revert back to the original version for now.
Signed-off-by: Stefan Roese <sr@denx.de>
Michal Simek [Fri, 28 Mar 2008 11:49:52 +0000 (12:49 +0100)]
microblaze: Sort microblaze boards in MAKEALL script
Michal Simek [Fri, 28 Mar 2008 10:58:45 +0000 (11:58 +0100)]
microblaze: clean microblaze_config.mk
FLAGS are generated by U-BOOT generator.
Board specific FLAGS are in board directory
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 11:47:19 +0000 (12:47 +0100)]
microblaze: xupv2p fix config file for supporting FDT
Michal Simek [Fri, 28 Mar 2008 10:53:02 +0000 (11:53 +0100)]
microblaze: ml401 fix config file for supporting FDT
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 10:22:48 +0000 (11:22 +0100)]
microblaze: ml401 - add ifdef for GPIO
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 11:13:03 +0000 (12:13 +0100)]
microblaze: clean uart16550 and uartlite handling
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 10:08:31 +0000 (11:08 +0100)]
microblaze: Add Emaclite driver to Makefile
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 10:08:01 +0000 (11:08 +0100)]
microblaze: Add Emac driver to Makefile
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 11:42:29 +0000 (12:42 +0100)]
microblaze: add Emac ethernet driver
Michal Simek [Fri, 28 Mar 2008 11:41:56 +0000 (12:41 +0100)]
microblaze: add Emaclite ethernet driver
Michal Simek [Fri, 28 Mar 2008 10:04:01 +0000 (11:04 +0100)]
microblaze: ML401 and XUPV2P remove emac and emaclite reference
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 09:59:32 +0000 (10:59 +0100)]
microblaze: remove old setting for emac driver
Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek [Fri, 28 Mar 2008 09:58:15 +0000 (10:58 +0100)]
microblaze: Clean Makefile from ancient emac driver
Signed-off-by: Michal Simek <monstr@monstr.eu>
Daniel Hellstrom [Fri, 28 Mar 2008 09:20:43 +0000 (10:20 +0100)]
SPARC/LEON2: added support for Gaisler simulator GRSIM/TSIM for SPARC/LEON2 targets. See gaisler.com for information.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Wed, 26 Mar 2008 22:38:48 +0000 (23:38 +0100)]
SPARC/LEON3: added support for GR-CPCI-AX2000 FPGA AX board. The FPGA is exchangeable but a standard LEON3 design is assumed. See gaisler.com for information.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Wed, 26 Mar 2008 22:34:47 +0000 (23:34 +0100)]
SPARC/LEON3: added support for Altera NIOS Development kit (STRATIX II Edition) with GRLIB template design. See gaisler.com for information.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Fri, 28 Mar 2008 09:06:52 +0000 (10:06 +0100)]
SPARC/LEON3: added support for Gaisler GRSIM/TSIM2 SPARC/LEON3 simulatorn. See gaisler.com for information.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Wed, 26 Mar 2008 22:26:48 +0000 (23:26 +0100)]
SPARC/LEON3: added support for GR-XC3S-1500 board with GRLIB template design. See gaisler.com for board information.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Fri, 28 Mar 2008 09:00:33 +0000 (10:00 +0100)]
SPARC: Added support for SPARC LEON2 SOC Processor.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Wed, 26 Mar 2008 22:00:38 +0000 (23:00 +0100)]
SPARC/LEON3: Added AMBA Bus Plug&Play information print command (ambapp). It can print available cores (type: AHB Master, AHB Slave, APB Slave), their address ranges, IRQ number and version.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Wed, 26 Mar 2008 21:51:29 +0000 (22:51 +0100)]
SPARC: Added support for SPARC LEON3 SOC processor.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Fri, 28 Mar 2008 07:29:26 +0000 (08:29 +0100)]
SPARC: added SPARC support for new uimage in common code.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Wed, 26 Mar 2008 21:36:03 +0000 (22:36 +0100)]
SPARC: added SPARC board information to the command bdinfo.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Daniel Hellstrom [Fri, 28 Mar 2008 08:47:00 +0000 (09:47 +0100)]
SPARC: Added generic support for SPARC architecture.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Wolfgang Denk [Mon, 7 Apr 2008 22:20:52 +0000 (00:20 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-fdt
Wolfgang Denk [Mon, 7 Apr 2008 22:16:36 +0000 (00:16 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-at91
Wolfgang Denk [Mon, 7 Apr 2008 22:11:22 +0000 (00:11 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-net
Wolfgang Denk [Mon, 7 Apr 2008 22:10:17 +0000 (00:10 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-coldfire
Wolfgang Denk [Mon, 7 Apr 2008 22:06:47 +0000 (00:06 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-blackfin
Wolfgang Denk [Mon, 7 Apr 2008 22:05:42 +0000 (00:05 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-arm
Wolfgang Denk [Mon, 7 Apr 2008 22:04:39 +0000 (00:04 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-sh
Wolfgang Denk [Mon, 7 Apr 2008 21:59:10 +0000 (23:59 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx
Conflicts:
lib_ppc/board.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 7 Apr 2008 21:55:47 +0000 (23:55 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Mon, 7 Apr 2008 21:52:32 +0000 (23:52 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx
Stefan Roese [Thu, 3 Apr 2008 12:50:34 +0000 (14:50 +0200)]
ppc4xx: Fix 4xx enet driver to support 460GT EMAC2+3
This patch fixes a problem with the RGMII setup of the 460GT. The 460GT
has 2 RGMII instances and we need to configure the 2nd RGMII instance
for the EMAC2+3 channels.
Signed-off-by: Stefan Roese <sr@denx.de>
Jean-Christophe PLAGNIOL-VILLARD [Wed, 2 Apr 2008 06:03:56 +0000 (08:03 +0200)]
MPC8xx: Fix libfdt support introduced in commit
77ff7b74
fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32'
fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32'
fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet'
fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Andy Fleming [Tue, 1 Apr 2008 01:45:56 +0000 (20:45 -0500)]
Fix fdt set command to conform to dts spec
The fdt set command was treating properties specified as <00> and <0011>
as byte streams, rather than as an array of cells. As we already have
syntax for expressing the desire for a stream of bytes ([ xx xx ...]),
we should use the <> syntax to describe arrays of cells, which are always
32-bits per element. If we imagine this likely (IMHO) scenario:
> fdt set /ethernet-phy@1 reg <1>
With the old code, this would create a bad fdt, since the reg cell would be
made to be one byte in length. But the cell must be 4 bytes, so this would
break mysteriously.
Also, the dts spec calls for constants inside the angle brackets (<>)
to conform to C constant standards as they pertain to base.
Take this scenario:
> fdt set /ethernet@f00 reg <0xe250000\ 0x1000>
The old fdt command would complain that it couldn't parse that. Or, if you
wanted to specify that a certain clock ran at 33 MHz, you'd be required to
do this:
> fdt set /mydev clock <
1f78a40>
Whereas the new code will accept decimal numbers.
While I was in there, I extended the fdt command parser to handle property
strings which are split across multiple arguments:
> fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 >
> fdt p /ethernet@f00
ethernet@f00 {
interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>;
};
Lastly, the fdt print code was rearranged slightly to print arrays of cells
if the length of the property is a multiple of 4 bytes, and to not print
leading zeros.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Stefan Roese [Wed, 2 Apr 2008 06:39:33 +0000 (08:39 +0200)]
ppc4xx: Canyonlands: Init SATA/PCIe port correctly
Canyonlands (460EX) shares the first PCIe interface with the SoC SATA
interface. This usage can be configured with the jumper J6. This patch
correctly configures the SATA/PCIe PHY for SATA usage when this jumper
is installed.
Signed-off-by: Stefan Roese <sr@denx.de>
Kim Phillips [Fri, 28 Mar 2008 22:37:49 +0000 (17:37 -0500)]
remove remaining CONFIG_OF_HAS_{UBOOT_ENV,BD_T} code
finish off what commit
43ddd9c820fec44816188f53346b464e20b3142d,
"Remove deprecated CONFIG_OF_HAS_UBOOT_ENV and CONFIG_OF_HAS_BD_T"
started.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Jean-Christophe PLAGNIOL-VILLARD [Tue, 1 Apr 2008 05:30:51 +0000 (07:30 +0200)]
dataflash: Move CONFIG_HAS_DATAFLASH to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tor Krill [Fri, 28 Mar 2008 14:29:45 +0000 (15:29 +0100)]
Add Vitesse 8601 support to TSEC driver
Add phy_info for Vitesse VSC8601.
Add config option, CFG_VSC8601_SKEWFIX, to enable RGMII skew timing compensation.
Signed-off-by: Tor Krill <tor@excito.com>
Reviewed-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Daniel Hellstrom [Mon, 31 Mar 2008 14:25:00 +0000 (14:25 +0000)]
SPARC: added SMC91111 driver in and out macros for LEON processors.
This patch makes SPARC/LEON processors able to read and write
to the SMC91111 chip using the chip external I/O bus of the memory
controller. This patchs defines the standard in and out macros
expected by the SMC9111 driver.
To access that I/O bus one must set up the memory controller
(MCTRL or FTMCTRL) correctly. It is assumed that the user sets
up this correctly when the other MCTRL parameters are set up. It
can be set up from the board configuration header file.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Stelian Pop [Wed, 26 Mar 2008 17:52:34 +0000 (18:52 +0100)]
Add maintainership information for AT91CAP9ADK and AT91SAM9260EK boards
Signed-off-by: Stelian Pop <stelian@popies.net>
Jean-Christophe PLAGNIOL-VILLARD [Mon, 31 Mar 2008 19:31:04 +0000 (21:31 +0200)]
AT91SAM9260EK: Move CONFIG_CMD_NAND to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Stelian Pop [Wed, 26 Mar 2008 17:52:33 +0000 (18:52 +0100)]
Add support for AT91SAM9260EK
Support for booting from internal DataFlash, external DataFlash card
or NAND flash is available.
Signed-off-by: Stelian Pop <stelian@popies.net>
Jean-Christophe PLAGNIOL-VILLARD [Mon, 31 Mar 2008 19:20:49 +0000 (21:20 +0200)]
AT91SAM9: Move CONFIG_HAS_DATAFLASH to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD [Mon, 31 Mar 2008 19:12:17 +0000 (21:12 +0200)]
AT91CAP9ADK: Move CONFIG_CMD_NAND to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Stelian Pop [Wed, 26 Mar 2008 19:52:32 +0000 (20:52 +0100)]
Port AT91CAP9 to the new headers
Adapt the existing AT91CAP9 code to the new headers and APIs.
Signed-off-by: Stelian Pop <stelian@popies.net>
Stelian Pop [Wed, 26 Mar 2008 18:52:31 +0000 (19:52 +0100)]
Finish header files reworking
Replace AT91CAP9.h file with several splitted header files coming
from the Linux kernel.
This is part 2 of the replacement: more header imports and edits.
Signed-off-by: Stelian Pop <stelian@popies.net>
Stelian Pop [Wed, 26 Mar 2008 18:52:30 +0000 (19:52 +0100)]
Import several header files from Linux
Replace AT91CAP9.h file with several splitted header files coming
from the Linux kernel.
This is part 1 of the replacement: pristine header files import.
Signed-off-by: Stelian Pop <stelian@popies.net>