[U-Boot-Users] [PATCH 1/4] Change initdram() return type to phys_size_t

[Wolfgang Denk]

In message <1213061838-12493-1-git-send-email-becky.bruce at freescale.com> you wrote:
> This patch changes the return type of initdram() from long int to phys_size_t.
> This is required for a couple of reasons: long int limits the amount of dram
> to 2GB, and u-boot in general is moving over to phys_size_t to represent the
> size of physical memory.  phys_size_t is defined as an unsigned long on almost
> all current platforms.
> 
> This patch *only* changes the return type of the initdram function (in
> include/common.h, as well as in each board's implementation of initdram).  It
> does not actually modify the code inside the function on any of the platforms;
> platforms which wish to support more than 2GB of DRAM will need to modify
> their initdram() function code.
> 
> Build tested with MAKEALL for ppc, arm, mips, mips-el. Booted on powerpc
> MPC8641HPCN.
> 
> Patch is too large for the list, and is located at:
> http://gate.crashing.org/~galak/0001-Change-initdram-return-type-to-phys_size_t.patch

Sorry, but I'm afraid this doesn't apply at all:

Applying Change initdram() return type to phys_size_t
error: board/amcc/kilauea/memory.c: does not exist in index
error: board/amcc/makalu/memory.c: does not exist in index
error: patch failed: board/amcc/yosemite/yosemite.c:331
error: board/amcc/yosemite/yosemite.c: patch does not apply
error: patch failed: board/esd/ar405/ar405.c:192
error: board/esd/ar405/ar405.c: patch does not apply
error: patch failed: board/esd/canbt/canbt.c:184
error: board/esd/canbt/canbt.c: patch does not apply
error: patch failed: board/g2000/g2000.c:158
error: board/g2000/g2000.c: patch does not apply
error: board/tqm5200/tqm5200.c: does not exist in index
error: board/tqm8260/tqm8260.c: does not exist in index
error: board/tqm8272/tqm8272.c: does not exist in index
error: board/tqm834x/tqm834x.c: does not exist in index
error: board/tqm85xx/sdram.c: does not exist in index
error: board/tqm8xx/tqm8xx.c: does not exist in index
error: patch failed: board/w7o/w7o.c:151
error: board/w7o/w7o.c: patch does not apply
error: patch failed: nand_spl/board/amcc/bamboo/sdram.c:89
error: nand_spl/board/amcc/bamboo/sdram.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged board/amcc/acadia/memory.c
...
Auto-merged board/amcc/ebony/ebony.c
CONFLICT (delete/modify): board/amcc/kilauea/memory.c deleted in HEAD and modified in Change initdram() return type to phys_size_t. Version Change initdram() return type to phys_size_t of board/amcc/kilauea/memory.c left in tree.
CONFLICT (delete/modify): board/amcc/makalu/memory.c deleted in HEAD and modified in Change initdram() return type to phys_size_t. Version Change initdram() return type to phys_size_t of board/amcc/makalu/memory.c left in tree.
Auto-merged board/amcc/ocotea/ocotea.c
...
Auto-merged board/amcc/yosemite/yosemite.c
CONFLICT (content): Merge conflict in board/amcc/yosemite/yosemite.c
Auto-merged board/csb272/csb272.c
...
Auto-merged board/esd/ar405/ar405.c
CONFLICT (content): Merge conflict in board/esd/ar405/ar405.c
Auto-merged board/esd/canbt/canbt.c
CONFLICT (content): Merge conflict in board/esd/canbt/canbt.c
Auto-merged board/exbitgen/exbitgen.c
...
Auto-merged board/g2000/g2000.c
CONFLICT (content): Merge conflict in board/g2000/g2000.c
Auto-merged board/gth2/gth2.c
...
Auto-merged board/purple/purple.c
CONFLICT (delete/modify): board/tqm8272/tqm8272.c deleted in HEAD and modified in Change initdram() return type to phys_size_t. Version Change initdram() return type to phys_size_t of board/tqm8272/tqm8272.c left in tree.
CONFLICT (delete/modify): board/tqm85xx/sdram.c deleted in HEAD and modified in Change initdram() return type to phys_size_t. Version Change initdram() return type to phys_size_t of board/tqm85xx/sdram.c left in tree.
Auto-merged board/w7o/w7o.c
...
Auto-merged nand_spl/board/amcc/bamboo/sdram.c
CONFLICT (content): Merge conflict in nand_spl/board/amcc/bamboo/sdram.c
Failed to merge in the changes.
Patch failed at 0001.


Can you please rebase your patch set?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
No one may kill a man.  Not for any purpose.  It cannot be condoned.
	-- Kirk, "Spock's Brain", stardate 5431.6