[U-Boot] kirkwood: commands not found after elf_reloc merge

[Eric Cooper]

After rebasing my dockstar patches on master (fff6ec3), none of the
top level commands are found:

    U-Boot 2010.09-dirty (Oct 24 2010 - 21:04:07)
    Seagate FreeAgent DockStar

    U-Boot code: 00600000 -> 00659F44  BSS: -> 0069FF20
    SoC:   Kirkwood 88F6281_A0
    monitor len: 0009FF20
    ramsize: 08000000
    TLB table at: 07ff0000
    Top of RAM usable for U-Boot at: 07ff0000
    Reserving 639k for U-Boot at: 07f50000
    Reserving 1152k for malloc() at: 07e30000
    Reserving 48 Bytes for Board Info at: 07e2ffd0
    Reserving 92 Bytes for Global Data at: 07e2ff74
    New Stack Pointer is: 07e2ff70
    RAM Configuration:
    Bank #0: 00000000 128 MiB
    Bank #1: 00000000 0 Bytes
    Bank #2: 00000000 0 Bytes
    Bank #3: 00000000 0 Bytes
    relocation Offset is: 07950000
    monitor flash len: 00059F44
    Now running in RAM - U-Boot at: 07f50000
    NAND:  256 MiB
    In:    serial
    Out:   serial
    Err:   serial
    Net:   egiga0
    Reset Ethernet PHY
    88E1116 Initialized on egiga0
    Hit any key to stop autoboot:  3  2  0 
    DockStar> version
    Unknown command 'version' - try 'help'
    DockStar> help
    Unknown command 'help' - try 'help'
    DockStar> 

The previous version, based on 1ba91ba, works fine:

    U-Boot 2010.09-dirty (Oct 24 2010 - 21:16:34)
    Seagate FreeAgent DockStar

    U-Boot code: 00600000 -> 00658184  BSS: -> 0069E000
    SoC:   Kirkwood 88F6281_A0
    monitor len: 0009E000
    ramsize: 08000000
    TLB table at: 07ff0000
    Top of RAM usable for U-Boot at: 07ff0000
    Reserving 632k for U-Boot at: 07f52000
    Reserving 1152k for malloc() at: 07e32000
    Reserving 48 Bytes for Board Info at: 07e31fd0
    Reserving 92 Bytes for Global Data at: 07e31f74
    New Stack Pointer is: 07e31f70
    RAM Configuration:
    Bank #0: 00000000 128 MiB
    Bank #1: 00000000 0 Bytes
    Bank #2: 00000000 0 Bytes
    Bank #3: 00000000 0 Bytes
    relocation Offset is: 07952000
    monitor flash len: 00058184
    Now running in RAM - U-Boot at: 07f52000
    NAND:  256 MiB
    In:    serial
    Out:   serial
    Err:   serial
    Net:   egiga0
    Reset Ethernet PHY
    88E1116 Initialized on egiga0
    Hit any key to stop autoboot:  3  2  0 
    Marvell>> version

    U-Boot 2010.09-dirty (Oct 24 2010 - 21:16:34)
    Seagate FreeAgent DockStar
    Marvell>> 

I suspect something related to the recent merge with the elf_reloc branch.
Does this problem occur on anyone else's kirkwood board since then?

-- 
Eric Cooper             e c c @ c m u . e d u