Wolfgang Denk [Tue, 24 Feb 2009 21:52:16 +0000 (22:52 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Anton Vorontsov [Thu, 19 Feb 2009 15:20:52 +0000 (18:20 +0300)]
mpc83xx: MPC837XERDB: Add PCIe support
On MPC8377E-RDB and MPC8378E-RDB boards we have PCIe and mini-PCIe
slots. Let's support them.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Anton Vorontsov [Thu, 19 Feb 2009 15:20:50 +0000 (18:20 +0300)]
mpc83xx: PCI: Fix hard-coded first_busno value
We should use pci_last_busno() in pci_init_bus(), otherwise we'll
erroneously re-use PCI0's first_busno for PCI1 hoses.
NOTE: The patch is untested. All MPC83xx FSL boards I have have
PCI1 in miniPCI form, for which I don't have any cards handy.
But looking in cpu/mpc85xx/pci.c:
...
#ifdef CONFIG_MPC85XX_PCI2
hose = &pci_hose[1];
hose->first_busno = pci_hose[0].last_busno + 1;
And considering that we do the same for MPC83xx PCI-E support,
I think this patch is correct.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Anton Vorontsov [Thu, 19 Feb 2009 15:20:46 +0000 (18:20 +0300)]
mpc83xx: PCI: Fix bus-range fdt fixups for PCI1 controllers
This patch fixes copy-paste issue: pci_hose[0]'s first and last
busnos were used to fixup pci1's nodes.
We don't see this bug triggering only because Linux reenumerate
buses anyway.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Anton Vorontsov [Thu, 19 Feb 2009 15:20:44 +0000 (18:20 +0300)]
mpc83xx: PCIe: Fix CONFIG_PCI_SCAN_SHOW reporting bogus values
This patch fixes an issue in config space read accessors: we should
fill-in the value even if we fail (e.g. skipping devices), otherwise
CONFIG_PCI_SCAN_SHOW reports bogus values during boot up.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Anton Vorontsov [Thu, 19 Feb 2009 15:20:42 +0000 (18:20 +0300)]
mpc83xx: PCIe: Don't start bus enumeration at 0
Currently we assign first_busno = 0 for the first PCIe hose, but this
scheme won't work if we have ordinary PCI hose already registered (its
first_busno value is 0 too).
The old code worked fine only because we have PCI disabled on
MPC837XEMDS boards in stand-alone mode (see commit
00f7bbae92e3b13f2b3
"mpc83xx: fix PCI scan hang on the standalone MPC837xE-MDS boards").
But on MPC837XERDB boards we have PCI and PCIe, so the bug actually
triggers.
So, to fix the issue, we should use pci_last_busno() + 1 for the
first_busno (i.e. last available busno).
Reported-by: Huang Changming <Chang-Ming.Huang@freescale.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Anton Vorontsov [Thu, 19 Feb 2009 15:20:41 +0000 (18:20 +0300)]
PCI: Add pci_last_busno() helper
This is just a handy routine that reports last PCI busno: we walk
down all the hoses and return last hose's last_busno.
Will be used by PCI/PCIe initialization code.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Becky Bruce [Mon, 23 Feb 2009 19:56:51 +0000 (13:56 -0600)]
MPC86xx: set CONFIG_MAX_MEM_MAPPED to 2G by default
Currently, we get 256MB as the default, but since all the 86xx
board configs define a 2G BAT mapping for RAM, raise default
to 2G.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
Becky Bruce [Thu, 12 Feb 2009 16:43:32 +0000 (10:43 -0600)]
mpc8641hpcn: Indicate 36-bit addr map in boot messages
If 36-bit addressing is enabled, print a message on the console
when we boot.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Kim Phillips [Mon, 23 Feb 2009 21:42:44 +0000 (15:42 -0600)]
Merge branch 'master' of git://git.denx.de/u-boot
Heiko Schocher [Tue, 10 Feb 2009 08:38:52 +0000 (09:38 +0100)]
netloop: speed up NetLoop
NetLoop polls every cycle with getenv some environment variables.
This is horribly slow, especially when the environment is big.
This patch reads only the environment variables in NetLoop,
when they were changed.
Also moved the init part of the NetLoop function in a seperate
function.
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Mike Frysinger [Mon, 22 Dec 2008 07:56:07 +0000 (02:56 -0500)]
smc911x_eeprom: new example app for managing newer SMC parts
A forward port of the last version to work with the newer smc911x driver.
I only have a board with a LAN9218 part on it, so that is the only one
I've tested. But there isn't anything in this that would make it terribly
chip specific afaik.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Sascha Hauer <s.hauer@pengutronix.de>
CC: Guennadi Liakhovetski <lg@denx.de>
CC: Magnus Lilja <lilja.magnus@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Pieter Henning [Mon, 23 Feb 2009 07:17:15 +0000 (23:17 -0800)]
Added Vitesse VSC8211 definitions to TSEC driver
Added the struct containing PHY settings for the Vitesse VSC8211 phy to
the phy_info list in tsec.c
Signed-off-by: Pieter Henning <phenning@vastech.co.za>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Wolfgang Denk [Sun, 22 Feb 2009 23:22:21 +0000 (00:22 +0100)]
Update CHANGELOG; Prepare 2009.03-rc1
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 22 Feb 2009 22:45:40 +0000 (23:45 +0100)]
ARM: synchronize mach-types.h with linux v2.6.29-rc5-315-g683fdc5
The file was generated from building versatile_defconfig.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 22 Feb 2009 21:51:32 +0000 (22:51 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 22 Feb 2009 21:51:25 +0000 (22:51 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sun, 22 Feb 2009 21:01:01 +0000 (22:01 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 22 Feb 2009 21:00:58 +0000 (22:00 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb
Shinya Kuribayashi [Sun, 22 Feb 2009 05:24:11 +0000 (14:24 +0900)]
MIPS: Fix GCC-4.2 'discards qualifiers from pointer target type' warnings
Compiling dbau1x00 and gth2 boards with GCC-4.2, you would see new warnings
like this:
skuribay@ubuntu:u-boot.git$ ./MAKEALL dbau1000
Configuring for dbau1x00 board...
au1x00_eth.c: In function 'au1x00_send':
au1x00_eth.c:158: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type
au1x00_eth.c: In function 'au1x00_recv':
au1x00_eth.c:211: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type
au1x00_eth.c: In function 'au1x00_init':
au1x00_eth.c:252: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type
au1x00_eth.c: In function 'au1x00_recv':
au1x00_eth.c:211: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type
au1x00_eth.c: In function 'au1x00_init':
au1x00_eth.c:252: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type
au1x00_eth.c: In function 'au1x00_send':
au1x00_eth.c:158: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type
We're passing a volatile pointer to a function which is expecting a non-
volatile pointer. That's potentially dangerous, so gcc warns about it.
Confirmed with ELDK 4.2 (GCC 4.2.2) and Sourcey G++ 4.2 (GCC 4.2.3).
To fix this, we add a volatile attribute to the argument in question.
The virt_to_phys function in Linux kernel also does the same thing.
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Wolfgang Denk [Sun, 22 Feb 2009 20:13:35 +0000 (21:13 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Dirk Behme [Fri, 20 Feb 2009 16:51:28 +0000 (17:51 +0100)]
OMAP3: Clean up MMC code
Clean up OMAP3 MMC code:
* Convert register access to struct & readx/writex style
* Replace hardcode values by macros
* Remove macro defined twice
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Dirk Behme [Thu, 12 Feb 2009 17:55:43 +0000 (18:55 +0100)]
OMAP3: Pandora: Update pin mux
Clock pin must have input enabled for MMC3 to work.
Also enable pull-ups for cmd/data lines to be consistent
with remaining MMC host pin setup.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Dirk Behme [Thu, 12 Feb 2009 17:55:42 +0000 (18:55 +0100)]
OMAP3: Add OMAP3 auto detection
This patch adds OMAP3 cpu type auto detection based on OMAP3 register
and removes hardcoded values.
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Dirk Behme [Thu, 12 Feb 2009 17:55:41 +0000 (18:55 +0100)]
OMAP3: Beagle: Add board revision detection
With BeagleBoard revision C some HW changes are introduced (e.g. PinMUX)
which might need different software handling. For this, GPIO pin 171 (GPIO
module 6, offset 11) can be used to check for board revision. If this pin
is low, we have a rev C board. Else it must be a revision Ax or Bx board.
To handle board differences you can call function beagle_get_revision().
E.g.:
if (beagle_get_revision()) {
/* do special revision C stuff here */
}
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Dirk Behme [Thu, 12 Feb 2009 17:55:40 +0000 (18:55 +0100)]
OMAP3: Overo: Clean up pin mux and GPIO configuration
* Make Overo GPIO114 an input for touchscreen PENDOWN
* Make Overo GPIO144-147 readable
* Make Overo EHCI pinmux match beagle rev c setup
* Adjust pinmux for SMSC911X network chip support
* Remove unnecessary GPIO setup
* Fix merge error in Makefile
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Jean-Christophe PLAGNIOL-VILLARD [Sun, 22 Feb 2009 16:08:41 +0000 (17:08 +0100)]
nmdk8815: fix onenand support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD [Sun, 22 Feb 2009 16:56:50 +0000 (17:56 +0100)]
nomadik/nand: fix 'ecc512' discards qualifiers from pointer target type
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD [Sun, 22 Feb 2009 16:49:43 +0000 (17:49 +0100)]
davinci: fix implicit declaration of function 'davinci_errata_workarounds'
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD [Sun, 22 Feb 2009 14:49:28 +0000 (15:49 +0100)]
arm: add uart dcc support
Serial driver via the EmbeddedICE macrocell's DCC channel using
co-processor 14.
It does include a timeout to ensure that the system does not
totally freeze when there is nothing connected to read.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Hugo Villeneuve [Fri, 21 Nov 2008 19:35:56 +0000 (14:35 -0500)]
ARM DaVinci: Add common peripherals and modules enable functions.
Taken all the duplicated code for enabling common modules and apply
software workarounds from the board specific code into common
functions. Also added comments explaining the workarounds
(from TI errata documents) and replaced some numerical bit numbers
with more meaningful defines.
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Alessandro Rubini [Mon, 9 Feb 2009 14:53:33 +0000 (15:53 +0100)]
Enable Ethernet for Nomadik 8815 Evaluation Kit
This trivially enables Ethernet support in the debug board
by setting up the proper chip select.
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stnwireless.com>
Alessandro Rubini [Mon, 9 Feb 2009 14:53:31 +0000 (15:53 +0100)]
Nand driver for Nomadik SoC
This driver implements the ECC algorithm described in
the CPU data sheet and uses the OOB layout chosen in
already-released development systems (shipped with a custom-made
u-boot 1.3.1).
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stnwireless.com>
Alessandro Rubini [Mon, 9 Feb 2009 14:53:31 +0000 (15:53 +0100)]
Added nomadik.h header
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stnwireless.com>
Yoshihiro Shimoda [Wed, 29 Oct 2008 11:05:18 +0000 (20:05 +0900)]
r8a66597-hcd: fix cannot use external hub
Fix the problem that cannot use external hub, because this driver
did not control correctly a DEVADDx register.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
Mike Frysinger [Thu, 19 Feb 2009 06:20:27 +0000 (01:20 -0500)]
Blackfin: disable syscontrol code for now
Looks like the initcode updates fell out of order during my merges. The
patch that really fixes up this code is part of power-on overhaul and so
is too large for merging at this point. Instead, we can disable the code
as no currently in-tree board depends on it. The next merge window will
fix things up properly.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Thu, 19 Feb 2009 06:19:49 +0000 (01:19 -0500)]
Blackfin: bf537-stamp: fix I2C board defines
The previous merge for cleaning up the I2C driver incorrectly reverted the
CFG_xxx rename for some of the I2C defines.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Heiko Schocher <hs@denx.de>
Wolfgang Denk [Sun, 22 Feb 2009 00:19:52 +0000 (01:19 +0100)]
Coding Style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 22 Feb 2009 00:17:47 +0000 (01:17 +0100)]
Makefile: fix cleanup
Commit
e4943ec5 moved the ARM boards to a vendor directory but forgot
to adapt the cleanup rules in the Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Richard Retanubun [Fri, 20 Feb 2009 18:01:56 +0000 (13:01 -0500)]
Cleanup the comment for m68k linux boot argument passing.
This patch clarifies the way m68k passes linux boot argument.
The one gotcha here is that the assembly instruction that
the compiler uses to jump to the kernel is 'jsr' which pushes the
program counter for the instruction after the jsr into the stack pointer.
Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Peter Griffin [Tue, 10 Feb 2009 16:44:45 +0000 (16:44 +0000)]
sh: Fix rsk7203 in tree build
Signed-off-by: Peter Griffin <pgriffin@mpc-data.co.uk>
Minkyu Kang [Wed, 18 Feb 2009 00:05:52 +0000 (09:05 +0900)]
bootm: Reduce the unnecessary memmove
Although load address and image start address are same address,
bootm command always does memmove.
That is unnecessary memmove and can be taken few milliseconds
(about 500 msec to 1000 msec).
If skip this memmove, we can reduce the boot time.
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Matthias Fuchs [Sun, 15 Feb 2009 21:29:15 +0000 (22:29 +0100)]
fpga: Fix Spartan III FPGA booting
This patch does some minor fixing of the Xilinx Spartan III
FPGA boot code:
- Fixed call order of post configuration callback and
success message printing (result of copy-paste?)
- remove obsolete comment
- minor coding style cleanup
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Matthias Fuchs [Sun, 15 Feb 2009 21:28:36 +0000 (22:28 +0100)]
fpga: Fix Spartan II FPGA booting
This patch does some minor fixing of the Xilinx Spartan II
FPGA boot code:
- Fixed call order of post configuration callback and
success message printing (result of copy-paste?)
- relocate post configuration callback only when it
is implemented
- remove obsolete comment
- minor coding style cleanup
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Mike Frysinger [Thu, 12 Feb 2009 01:26:52 +0000 (20:26 -0500)]
drivers/serial/ns16550: move ifdef into Makefile COBJS-$(...)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Derek Ou [Tue, 3 Feb 2009 23:00:07 +0000 (16:00 -0700)]
lcd_putc bug fix for tab.
Signed-off-by: Derek Ou <dou@siconix.com>
Shinya Kuribayashi [Mon, 2 Feb 2009 00:46:21 +0000 (09:46 +0900)]
MIPS: cpu/mips/Makefile: Add a missing START line
In the commit
79b51ff8205f0354d5300570614c1d2db499679c ([MIPS] cpu/mips/
Makefile: Split [CS]OBJS onto separate lines), I wrongly deleted a START
line. This patch puts it back.
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Wolfgang Denk [Sat, 21 Feb 2009 20:51:21 +0000 (21:51 +0100)]
Enable ext2 support for TQM8xxL/M based boards
Signed-off-by: Wolfgang Denk <wd@denx.de>
Tom Rix [Fri, 20 Feb 2009 02:47:50 +0000 (03:47 +0100)]
ARM:PXA Use new definitions in mmc.h
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Andy Fleming [Fri, 20 Feb 2009 02:47:50 +0000 (03:47 +0100)]
Reduce the scope of PXA's mmc_read/mmc_write/mmc_bread functions
These names are being taken over by the new MMC framework. Hopefuly
the PXA can be easily ported, and these functions will go away entirely.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD [Fri, 20 Feb 2009 02:47:50 +0000 (03:47 +0100)]
pxa: move mmc drivers to drivers/mmc
introduce new macro CONFIG_PXA_MMC to activate it
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tom Rix [Fri, 20 Feb 2009 01:27:22 +0000 (19:27 -0600)]
ARM:PXA Remove redefinition of mmc_cid and mmc_csd.
These structures are defined in the common mmc.h
This was compile checked on cerf250.
Micha Kalfon [Wed, 11 Feb 2009 17:50:11 +0000 (19:50 +0200)]
pxa: fixing get_timer to return time in miliseconds.
Fixing the get_timer function to return time in miliseconds instead of
ticks. Also fixed PXA boards to use the conventional value of 1000 for
CONFIG_SYS_HZ.
Signed-off-by: Micha Kalfon <smichak.uv@gmail.com>
Tom Rix [Thu, 19 Feb 2009 22:45:43 +0000 (16:45 -0600)]
ARM:OMAP3 Change mmc_init to mmc_legacy_init
omap3_mmc.c was changed to define mmc_legacy_init.
Remove unused functions.
Compile tested on all arm
Runtime tested on Zoom1.
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Heiko Schocher [Thu, 19 Feb 2009 16:23:58 +0000 (17:23 +0100)]
82xx, mgcoge: updates for 2009.03
- activate CS4 for accessing the FPGA
- activate Rx buf len > 1 on SMC
- pram activated
- MTDPARTS_DEFAULT defined
- update the size of the flashes in the DTS
before booting Linux
- MONITOR_LEN updated to 384k
- added CONFIG_HOSTNAME
- added CONFIG_ENV_BUFFER_PRINT
- Environment size reduced to 16k
Signed-off-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Thu, 19 Feb 2009 16:24:01 +0000 (17:24 +0100)]
8xx, mgsuvd: updates for 2009.03
- activate Rx buf len > 1 on SMC
- pram activated
- MTDPARTS_DEFAULT defined
- update the size of the flash in the DTS
before booting Linux
- MONITOR_LEN updated to 384k
- added CONFIG_HOSTNAME
- added CONFIG_ENV_BUFFER_PRINT
- Environment size reduced to 16k
Signed-off-by: Heiko Schocher <hs@denx.de>
Dirk Behme [Wed, 18 Feb 2009 18:59:39 +0000 (19:59 +0100)]
MMC: Don't use new framework code if not enabled
Don't use code of new MMC framework in cmd_mmc if CONFIG_GENERIC_MMC
isn't enabled.
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Kim Phillips [Thu, 19 Feb 2009 17:06:58 +0000 (11:06 -0600)]
Merge branch 'master' of git://git.denx.de/u-boot
Wolfgang Denk [Thu, 19 Feb 2009 12:53:29 +0000 (13:53 +0100)]
TQM8xxL: make some room in low memory for future needs
THe TQM8xxL use a ahnd-optimized linker script to efficiently use the
small boot sectors in the flash. This patch makes some room in the
first sector to prepare for a size increase of lib_generic/vsprintf.o
by a future patch.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Kim Phillips [Thu, 19 Feb 2009 00:06:18 +0000 (18:06 -0600)]
README: remove duplicate entry
it's been around since the original commit (
2ad6b513) that added two
identical entries.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Wolfgang Denk [Wed, 18 Feb 2009 23:50:08 +0000 (00:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 18 Feb 2009 23:41:08 +0000 (00:41 +0100)]
Coding style cleanup, update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Kim Phillips [Wed, 18 Feb 2009 23:43:59 +0000 (17:43 -0600)]
sata_sil3114: fix compiler warning
judging from other printfs in the same file, it seems ata should be
postpended with the interface number, not the address of the global
port variable. Fixes this for current u-boot-mpc83xx tree:
Configuring for MPC8349ITX board...
sata_sil3114.c: In function 'sata_bus_softreset':
sata_sil3114.c:99: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'struct sata_port *'
sata_sil3114.c:108: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'struct sata_port *'
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Ron Madrid [Wed, 18 Feb 2009 22:30:44 +0000 (14:30 -0800)]
Create configuration option for restricted ns16550 functions
This patch will create a configuration option for a minimum configuration for
the ns16550 serial driver at drivers/serial/ns16550.c and will apply this new
configuration option to the SIMPC8313.h config file in order to fix the NAND
bootstrap build error. This option will exclude all functions with exception of
NS16550_putc and NS16550_init. This will be used primarily to save space and
remove unused code from builds in which space is limited.
Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Kim Phillips [Wed, 18 Feb 2009 22:14:29 +0000 (16:14 -0600)]
mkconfig: include board config.h before asm/config.h
swapping the include order suppresses warnings for board configs
that define their own CONFIG_MAX_MEM_MAPPED:
In file included from /home/r1aaha/git/u-boot/include/config.h:5,
from /home/r1aaha/git/u-boot/include/common.h:35,
from simpc8313.c:26:
/home/r1aaha/git/u-boot/include/configs/SIMPC8313.h:81:1: warning:
"CONFIG_MAX_MEM_MAPPED" redefined
In file included from /home/r1aaha/git/u-boot/include/config.h:4,
from /home/r1aaha/git/u-boot/include/common.h:35,
from simpc8313.c:26:
/home/r1aaha/git/u-boot/include/asm/config.h:28:1: warning: this is
the location of the previous definition
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Wolfgang Denk [Wed, 18 Feb 2009 20:35:38 +0000 (21:35 +0100)]
Fix build errors after making flash_get_info() non-static
Fix for these build problems:
error: static declaration of 'flash_get_info' follows non-static declaration
Signed-off-by: Wolfgang Denk <wd@denx.de>
Stefan Roese [Wed, 18 Feb 2009 12:18:00 +0000 (13:18 +0100)]
ppc4xx: PCIe: Change 16GB inbound memory to 4GB
This patch fixes a problem recently seen on some 4xx platforms. For
example on Kilauea PCIe slot #0.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 18 Feb 2009 13:05:37 +0000 (14:05 +0100)]
ppc4xx: Some more PMC405 coding-style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Sun, 15 Feb 2009 21:27:47 +0000 (22:27 +0100)]
ppc4xx: Update PMC405 board support
This patch prepares the good old PMC405 board support for
upcoming PMC405V2 patches.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Sun, 15 Feb 2009 21:26:54 +0000 (22:26 +0100)]
ppc4xx: Cleanup PMC405 board support
This patch fixes coding style for PMC405 board support.
Also some unneeded features/code is removed.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Ilya Yanok [Thu, 5 Feb 2009 03:08:20 +0000 (04:08 +0100)]
qong: changes to Dave/DENX Qong configuration
1. Changes to the default environment:
- "bootcmd" defined as "run flash_self"
- "saveenv" command removed from "update"
- "uboot" changed to "u-boot" (also in "load")
- "addmtd" variable defined (and added to all boot commands)
2. CONFIG_CMD_JFFS2 defined to enable "mtdparts" command
3. MTDIDS_DEFAULT and MTDPARTS_DEFAULT defined
4. CONFIG_SYS_CBSIZE changed from 256 to 512. That solves the problem
with truncated "bootargs" environment variable.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Jean-Christophe PLAGNIOL-VILLARD [Sun, 1 Feb 2009 16:07:52 +0000 (17:07 +0100)]
common/console: avoid ifdef CONFIG_CONSOLE_MUX when it's possible
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD [Sun, 1 Feb 2009 16:07:51 +0000 (17:07 +0100)]
common/console: coding style cleanup
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Mike Frysinger [Fri, 30 Jan 2009 01:02:23 +0000 (20:02 -0500)]
mpc8xx_pcmcia: move CONFIG_8xx out of .c file and into Makefile
Move the CONFIG_8xx mpc8xx_pcmcia.c protection out of the C file and
into the Makefile so we avoid pointless compiling of the file.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Fri, 30 Jan 2009 01:02:07 +0000 (20:02 -0500)]
disk: convert part_* files to COBJ-$(CONFIG_XXX) style
Move the CONFIG_XXX out of the part_XXX.c file and into Makefile to
avoid pointless compiles.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Petri Lehtinen [Thu, 29 Jan 2009 08:35:40 +0000 (10:35 +0200)]
include/image.h: Ease grepping of image_* functions
Because the functions have been defined using macros, grepping for
their definitions is not possible. This patch adds the real function
names in comments.
Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Thu, 29 Jan 2009 00:08:14 +0000 (19:08 -0500)]
rename CONFIG_CMD_ENV to CONFIG_CMD_SAVEENV
The CONFIG_CMD_ENV option controls enablement of the `saveenv` command
rather than a generic "env" command, or anything else related to the
environment. So, let's make sure the define is named accordingly.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Valeriy Glushkov [Fri, 23 Jan 2009 18:02:17 +0000 (20:02 +0200)]
disable imls command if no flash is defined
Default CONFIG_CMD_IMLS must be disabled when CONFIG_SYS_NO_FLASH is defined
Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Rafal Jaworowski [Fri, 23 Jan 2009 12:27:18 +0000 (13:27 +0100)]
API: Improve glue mid-layer of the API demo application.
- Extend ub_dev_read() and ub_dev_recv() so they return the length actually
read, which allows for better control and error handling (this introduces
additional error code API_ESYSC returned by the glue mid-layer).
- Clean up definitions naming and usage.
- Other minor cosmetics.
Note these changes do not touch the API proper, so the interface between
U-Boot and standalone applications remains unchanged.
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Rafal Jaworowski [Fri, 23 Jan 2009 12:27:17 +0000 (13:27 +0100)]
API: Only output test data when reading was successful.
Signed-off-by: Rafal Czubak <rcz@semihalf.com>
Rafal Jaworowski [Fri, 23 Jan 2009 12:27:16 +0000 (13:27 +0100)]
API: Provide syscall entry point for the ARM architecture.
Signed-off-by: Rafal Czubak <rcz@semihalf.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>
Rafal Jaworowski [Fri, 23 Jan 2009 12:27:15 +0000 (13:27 +0100)]
API: Use stack pointer as API signature search hint in the glue layer.
De-hardcode range in RAM we search for the API signature. Instead use the stack
pointer as a hint to narrow down the range in which the signature could reside
(it is malloc'ed on the U-Boot heap, and is hoped to remain in some proximity
from stack area). Adjust PowerPC code in API demo to the new scheme.
Signed-off-by: Rafal Czubak <rcz@semihalf.com>
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Wolfgang Denk [Tue, 17 Feb 2009 09:26:38 +0000 (10:26 +0100)]
TQM8260: fix locations of kernel and ramdisk images in flash
After introducing redundant environment the kernel images was
overlapping with environment.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Heiko Schocher [Wed, 11 Feb 2009 18:26:15 +0000 (19:26 +0100)]
83xx: add missing TIMING_CFG1_CASLAT_* defines
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Valeriy Glushkov [Thu, 5 Feb 2009 12:35:21 +0000 (14:35 +0200)]
mpc8349itx: allow SATA boot from the onboard SIL1334
This patch allows using of SATA devices connected
to the onboard PCI SIL1334 SATA controller.
Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:50:14 +0000 (16:50 -0500)]
83xx: Add eSDHC support on 8379 EMDS board
Signed-off-by: Andy Fleming <afleming@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:51:33 +0000 (16:51 -0500)]
85xx: Add eSDHC support for 8536 DS
Signed-off-by: Andy Fleming <afleming@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:47:16 +0000 (16:47 -0500)]
Add support for the Freescale eSDHC found on 8379 and 8536 SoCs
This uses the new MMC framework
Some contributions by Dave Liu <daveliu@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:41:01 +0000 (16:41 -0500)]
Add MMC Framework
Here's a new framework (based roughly off the linux one) for managing
MMC controllers. It handles all of the standard SD/MMC transactions,
leaving the host drivers to implement only what is necessary to
deal with their specific hardware.
This also hooks the infrastructure into the PowerPC board code
(similar to how the ethernet infrastructure now hooks in)
Some of this code was contributed by Dave Liu <daveliu@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:31:39 +0000 (16:31 -0500)]
Eliminated arch-specific mmc header requirement
The current MMC infrastructure relies on the existence of an
arch-specific header file. This isn't necessary, and a couple
drivers were forced to implement dummy files to meet this requirement.
Instead, we move the stuff in those header files into a more appropriate
place, and eliminate the stubs and the #include of asm/arch/mmc.h
Signed-off-by: Andy Fleming <afleming@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:21:00 +0000 (16:21 -0500)]
Convert mmc_init to mmc_legacy_init
This is to get it out of the way of incoming MMC framework
Signed-off-by: Andy Fleming <afleming@freescale.com>
Andy Fleming [Thu, 30 Oct 2008 21:19:25 +0000 (16:19 -0500)]
Eliminate support for using MMC as memory
MMC cards are not memory, so we stop treating them that way.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Poonam_Aggrwal-b10812 [Sun, 4 Jan 2009 03:16:38 +0000 (08:46 +0530)]
32bit BUg fix for DDR2 on 8572
This errata fix is required for 32 bit DDR2 controller on 8572.
May also be required for P10XX20XX platforms
Signed-off-by: Poonam_Agarwal-b10812 <b10812@lc1106.zin33.ap.freescale.net>
Andy Fleming [Mon, 16 Feb 2009 15:40:20 +0000 (09:40 -0600)]
TQM85xx: Fix a couple warnings in TQM8548 build
The ecm variable in sdram.c was being declared for all 8548, but only
used by specific 8548 boards, so we make that variable require those
specific boards, too
The nand code was using an index "i" into a table, and then re-using "i"
to set addresses for each upm. However, then it relied on the old value
of i still being there to enable things. Changed the second "i" to "j"
Signed-off-by: Andy Fleming <afleming@freescale.com>
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:26 +0000 (18:38 +0100)]
MPC85xx: TQM8548: workaround for erratum DDR 19 and 20
This patch adds the workaround for erratum DDR20 according to MPC8548
Device Errata document, Rev. 1: "CKE signal may not function correctly
after assertion of HRESET". Furthermore, the bug DDR19 is fixed in
processor version 2.1 and the work-around must be removed.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:25 +0000 (18:38 +0100)]
MPC85xx: TQM8548: use cache for AG and BE variants
This patch makes accesses to the system memory cachable by removing the
caching-inhibited and guarded flags from the relevant TLB entries for
the TQM8548_BE and TQM8548_AG modules. FYI, the Freescale MPC85* boards
are configured similarly.
This results in a big averall performace improvement. TFTP downloads,
NAND Flash accesses, kernel boots, etc. are much faster.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:24 +0000 (18:38 +0100)]
MPC85xx: TQM8548_AG: add 1 GiB DDR2-SDRAM configuration
This patch add support for the 1 GiB DDR2-SDRAM on the TQM8548_AG
module.
Signed-off-by: Jens Gehrlein <sew_s@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:23 +0000 (18:38 +0100)]
MPC85xx: TQM8548: fix SDRAM timing for 533 MHz
According to new TQM8548 timing specification:
Refresh Recovery: 34 -> 53 clocks
CKE pulse width: 1 -> 3 cycles
Window for four activities: 13 -> 14 cycles
Signed-off-by: Jens Gehrlein <sew_s@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:22 +0000 (18:38 +0100)]
MPC85xx: TQM8548: add support for the TQM8548_AG module
The TQM8548_AG is a variant of the TQM8548 module with 1 GiB memory,
CAN and without PCI/PCI-X and RTC. U-Boot can be built for this module
with "$ make TQM8548_AG_config".
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>