Commit graph

3242 commits

Author SHA1 Message Date
Peter Pearse
d94c79e470 Final tidy 2007-09-11 15:35:01 +01:00
Peter Pearse
1fc11f736c Merge with git://www.denx.de/git/u-boot.git 2007-09-11 15:31:55 +01:00
Grzegorz Bernacki
38ad82da0c [GP3SSA] Add define CONFIG_MPC85XX_PCI2 in config file to allow u-boot to
scan on second pci bus.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-11 15:42:11 +02:00
Peter Pearse
9d3cb9febe Merge with git://www.denx.de/git/u-boot.git 2007-09-11 14:26:23 +01:00
Grzegorz Bernacki
6c2f4f388e [ppc4xx] Individual handling of sdram.c for bamboo_nand build
Bamboo has a file sdram.c which needs special treatment when building in
separate directory. It has to be linked to build directory otherwise it is
not seen.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-11 12:57:52 +02:00
Wolfgang Denk
978aec12fa Merge with /home/raj/git/u-boot#ads5121_fec_optimize 2007-09-10 23:21:16 +02:00
Sean MCGOOGAN
38c1ef728d Allocate CPU Architecture Code for STMicroelectronics' ST200.
Signed-off-by: Sean McGoogan <Sean.McGoogan@st.com>
---------------------------------------------------
2007-09-10 22:24:23 +02:00
Wolfgang Denk
754bac4815 Update version to match current state.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-10 20:42:31 +02:00
Grzegorz Bernacki
7a888d6b3c [MPC512x] Streamline frame handling in the FEC driver
- convert frame size settings to be derived from a single base
- set frame size to the recommended default value

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-10 17:39:08 +02:00
Peter Pearse
7d54d64e9c Merge with git://www.denx.de/git/u-boot.git 2007-09-10 10:11:15 +01:00
Kyungmin Park
e251e00d0d Remove compiler warning: target CPU does not support interworking
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
2007-09-10 09:26:35 +02:00
Wolfgang Denk
1d9e31e049 Fix compile error in spc1920 config.
Signed-off-by: Markus Klotzbücher <mk@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-09 21:21:33 +02:00
Grant Likely
a7d7eca791 Bugfix: make bootm+libfdt compile on boards with no flash
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-09-09 00:41:52 +02:00
Wolfgang Denk
87eb200ea8 Merge with /home/raj/git/u-boot#440SPe_PCIe_fixes 2007-09-08 20:52:57 +02:00
Wolfgang Denk
fd63d832cd Merge with /home/raj/git/u-boot#ads5121_fixes 2007-09-08 20:45:59 +02:00
Grzegorz Bernacki
6efc1fc0b6 [PPC440SPe] PCIe environment settings for Katmai and Yucca
- 'pciconfighost' is set by default in order to be able to scan bridges
behind the primary host/PCIe

- 'pciscandelay' env variable is recognized to allow for user-controlled
delay before the PCIe bus enumeration; some peripheral devices require a
significant delay before they can be scanned (e.g. LSI8408E); without the
delay they are not detected

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-07 18:35:37 +02:00
Grzegorz Bernacki
7f19139389 [PPC440SPe] Improve PCIe configuration space access
- correct configuration space mapping
- correct bus numbering
- better access to config space

Prior to this patch, the 440SPe host/PCIe bridge was able to configure only the
first device on the first bus. We now allow to configure up to 16 buses;
also, scanning for devices behind the PCIe-PCIe bridge is supported, so
peripheral devices farther in hierarchy can be identified.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-07 18:20:23 +02:00
Grzegorz Bernacki
15ee4734e4 [PPC440SPe] Convert machine check exceptions handling
Convert using fixup mechanism to suppressing MCK for the duration of config
read/write transaction: while fixups work fine with the case of a precise
exception, we identified a major drawback with this approach when there's
an imprecise case. In this scenario there is the following race condition:
the fixup is (by design) set to catch the instruction following the one
actually causing the exception; if an interrupt (e.g. decrementer) happens
between those two instructions, the ISR code is executed before the fixup
handler the machine check is no longer protected by the fixup handler as it
appears as within the ISR code. In consequence the fixup approach is being
phased out and replaced with explicit suppressing of MCK during a PCIe
config read/write cycle.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-07 17:46:18 +02:00
Wolfgang Denk
ff7640c9ea Fix typo in MAKEALL script.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-07 17:43:36 +02:00
Grzegorz Bernacki
08e2e5fcd2 [MPC512x] Proper handling of larger frames in the FEC driver
When frame larger than local RX buffer is received, it is split and handled
by two buffer descriptors. Prior to this patch the FEC driver discarded
contents of a buffer descriptor without the 'LAST' bit set, so the first
part of the frame was lost in case of larger frames. This fix allows to
safely combine the two pieces into the whole frame.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-07 17:09:21 +02:00
Rafal Jaworowski
8d17979d03 [MPC512x] Correct fixup relocation
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
2007-09-07 17:05:36 +02:00
Peter Pearse
470ffef72c Merge with git://www.denx.de/git/u-boot.git 2007-09-07 13:26:51 +01:00
Wolfgang Denk
a89cbbd27a Update CHANGELOG, minor coding style cleanup. 2007-09-07 01:21:25 +02:00
stefano babic
5e5803e119 PXA270: Added support for TrizepsIV board.
This patch add support for the Trizeps IV module (520Mhz).

Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07 01:06:19 +02:00
stefano babic
80172c6181 PXA270: Add support for multiple serial ports.
This patch adds support for multiple serial ports to the PXA target.
FFUART, BTUART and STUART are supported.

Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07 01:04:59 +02:00
stefano babic
28bb3f72c6 PXA270: fix compile issue (invalid lvalue)
Code is broken for PXA270 due to "invalid lvalue in assignment".

This patch fix it in pxa-regs.h

Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07 01:03:41 +02:00
Jason Jin
1d2ca446e1 Add BUILD_DIR support for bios emulator.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-09-07 00:52:44 +02:00
Shinya Kuribayashi
b4d8a55145 [MIPS] Remove inline asm string functions
Stop using inline string functions on MIPS as other ARCHs do so,
since the optimized inline asm versions are not small.

This change is triggered by a following MIPS build error:
common/libcommon.a(exports.o)(.text+0xdc): In function `jumptable_init':
common/exports.c:32: undefined reference to `strcmp'
make: *** [u-boot] Error 1

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
2007-09-07 00:44:45 +02:00
Shinya Kuribayashi
8ea2c4e548 [MIPS] Update asm string header
This patches contains several bugfixes and cleanups in the latest upstream:

 - Don't include linux/config.h
 - Remove buggy inline version of memscan.
 - Merge with Linux 2.6.11-rc3.
 - Fix undefined reference to strcpy in binfmt_misc caused by gcc 3.4.
 - Goodbye mips64.  31704 lines of code bite the dust.
 - Replace extern inline with static inline.
 - Fix return value of strncpy.
 - Remove a bunch more "$1" clobbers.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
2007-09-07 00:43:01 +02:00
Wolfgang Denk
3dd42fd5e2 Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx 2007-09-07 00:15:04 +02:00
Bartlomiej Sieka
5b729fb3bd Fix do_bootm_linux() so that multi-file images with FDT blob boot.
Fix incorrect blob address calculation in do_bootm_linux() that prevents
booting the kernel from a multi-file image (kernel + initrd + blob).

Also, make minor updates to the U-Boot's output and to the coding style.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2007-09-07 00:13:41 +02:00
Wolfgang Denk
bf72a4ca9e Merge with /home/wd/git/u-boot/custodian/u-boot-mpc5xxx 2007-09-07 00:13:11 +02:00
Gary Jennejohn
041a2554ad Add support for Sil680 IDE controller.
o add drivers/sil680.c to support the Sil680 IDE-controller.
o drivers/Makefile: add sil680.o.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
2007-09-06 23:53:11 +02:00
Grant Likely
e79021223b bootm/fdt: Only process the fdt if an fdt address was provided
Boards with CONFIG_OF_LIBFDT enabled are not able to boot old-style
kernels using the board info structure (instead of passing a device tree)
This change allows the old style booting to be used if the fdt argument
was not passed to 'bootm'.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
2007-09-06 09:47:40 -06:00
Grant Likely
cf2817a84c Migrate 5xxx boards from CONFIG_OF_FLAT_TREE to CONFIG_OF_LIBFDT
Affects boards: icecube (lite5200), jupiter, motionpro, tqm5200

Tested on: lite5200b

Note: the fixup functions have not been moved to a common place.  This
patch is targeted for immediate merging as in solves a build issue, but
the final name/location of the fixups is still subject to debate.  I
propose to merge this now, and move the fixups in the next merge window
to be usable by all targets.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-09-06 09:46:23 -06:00
Grant Likely
41bb76e941 libfdt: add convenience function fdt_find_and_setprop()
Given the path to a node, fdt_find_and_setprop() allows a property value
to be set directly.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-09-06 09:46:17 -06:00
Peter Pearse
80767a6cea Changed API name to coloured_led.h
Removed code using deprecated ifdef CONFIG_BOOTBINFUNC
Tidied other cpu/arm920t/start.S code
2007-09-05 16:04:41 +01:00
Kumar Gala
56a9270521 Fix ULI RTC support on MPC8544 DS
The RTC on the M1575 ULI chipset requires a dummy read before
we are able to talk to the RTC.  We accomplish this by adding a
second memory region to the PHB the ULI is on and read from it.

The second region is added to maintain compatiabilty with Linux's
view of the PCI memory map.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2007-09-04 16:00:48 -05:00
Ed Swarthout
f75e89e9b5 ft_board_setup update 85xx/86xx of pci/pcie bus-range property.
pcie is now differentiated from pci.  Add 8641 bus-range updates.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
2007-09-04 16:00:41 -05:00
Peter Pearse
9f5c3d3720 Add coloured led interface for ARM boards.
Use it in cpu/arm920t/start.S to indicate U-Boot code has been entered.
2007-09-04 16:18:38 +01:00
Peter Pearse
7462fe0d5a Move include/led.h to board/at91rm9200dk 2007-09-04 14:49:28 +01:00
Peter Pearse
6e4bf9b24e Ran Lindent on drivers/at45.c 2007-09-04 14:25:51 +01:00
Peter Pearse
557ab89d29 Rename CONFIG_CMD_MUX to CONFIG_CMD_AT91_SPIMUX 2007-09-04 14:23:50 +01:00
Stefan Roese
1d1ab638f8 Merge with git://www.denx.de/git/u-boot.git 2007-09-02 14:02:19 +02:00
Gary Jennejohn
81b73dec16 ppc4xx: (Re-)Enable CONFIG_PCI_PNP on AMCC 440EPx Sequoia
The 440EPx has a problem when the PCI_CACHE_LINE_SIZE register is
set to non-zero, because it doesn't support MRM (memory-read-
multiple) correctly. We now added the possibility to configure
this register in the board config file, so that the default value
of 8 can be overridden.

Here the details of this patch:

o drivers_pci_auto.c: introduce CFG_PCI_CACHE_LINE_SIZE to allow
  board-specific settings. As an example the sequoia board requires 0.
  Idea from Stefan Roese <sr@denx.de>.
o board/amcc/sequoia/init.S: add a TLB mapping at 0xE8000000 for the
  PCI IO-space. Obtained from Stefan Roese <sr@denx.de>.
o include/configs/sequoia.h: turn CONFIG_PCI_PNP back on and set
  CFG_PCI_CACHE_LINE_SIZE to 0.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-31 15:21:46 +02:00
Wolfgang Denk
60174746c6 Fix TFTP OACK code for short packets.
The old code had a loop limit overflow bug which caused a semi-
infinite loop for small packets, because in "i<len-8", "i" was signed,
but "len" was unsigned, and "len-8" became a huge number for small
values of "len".

This is a workaround which replaces broken commit 8f1bc284.

Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-31 10:01:51 +02:00
Wolfgang Denk
ff13ac8c7b Backout commit 8f1bc284 as it causes TFTP to fail.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-30 14:42:15 +02:00
Ed Swarthout
1900fbf255 Revert "Fix MPC8544DS PCIe3 scsi."
This reverts commit 9468e680.
Commit 16e23c3f5d removing allocation of PCSRBAR is sufficient.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
2007-08-30 09:33:12 +02:00
Grant Likely
8f1bc28408 tftp: don't implicity trust the format of recevied packets
The TFTP OACK code trusts that the incoming packet is formated as
ASCII text and can be processed by string functions. It also has a
loop limit overflow bug where if the packet length is less than 8, it
ends up looping over *all* of memory to find the 'blksize' string.

This patch solves the problem by forcing the packet to be null
terminated and using strstr() to search for the sub string.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-08-30 09:16:16 +02:00
Wolfgang Denk
d4a68f40a0 Merge with git+ssh://gemini/home/wd/git/u-boot/master 2007-08-29 16:22:54 +02:00