diff mbox

[U-Boot,2/2] Changes to move hawkboard to the new infrastructure.

Message ID 1326133729-6760-1-git-send-email-urwithsughosh@gmail.com
State Superseded
Headers show

Commit Message

Sughosh Ganu Jan. 9, 2012, 6:28 p.m. UTC 
This patch moves hawkboard to the new spl infrastructure from the
older nand_spl one. Making this change required some code refactoring
with a couple of davinci based platforms which use spl.

Removed the hawkboard_nand_config build option -- The spl code now
gets compiled with hawkboard_config, after building the main u-boot
image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard
to reflect the same.

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Christian Riesch <christian.riesch@omicron.at>
Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Cc: Tom Rini <trini@ti.com>
---
 arch/arm/cpu/arm926ejs/davinci/Makefile            |    7 +-
 .../cpu/arm926ejs/davinci/{spl.c => da850_spl.c}   |   46 +------
 .../cpu/arm926ejs/davinci/{spl.c => dm365_spl.c}   |   60 +--------
 .../cpu/arm926ejs/davinci}/hawkboard_nand_spl.c    |   34 ++---
 arch/arm/cpu/arm926ejs/davinci/spl.c               |   49 +------
 .../{u-boot-spl.lds => u-boot-spl-da850evm.lds}    |    0
 .../davinci/da8xxevm/u-boot-spl-hawk.lds           |   22 ++-
 boards.cfg                                         |    1 -
 doc/README.hawkboard                               |   43 +++---
 include/configs/cam_enc_4xx.h                      |    1 +
 include/configs/da850evm.h                         |    3 +-
 include/configs/hawkboard.h                        |   17 ++-
 nand_spl/board/davinci/da8xxevm/Makefile           |  155 --------------------
 13 files changed, 71 insertions(+), 367 deletions(-)
 copy arch/arm/cpu/arm926ejs/davinci/{spl.c => da850_spl.c} (68%)
 copy arch/arm/cpu/arm926ejs/davinci/{spl.c => dm365_spl.c} (50%)
 rename {board/davinci/da8xxevm => arch/arm/cpu/arm926ejs/davinci}/hawkboard_nand_spl.c (90%)
 rename board/davinci/da8xxevm/{u-boot-spl.lds => u-boot-spl-da850evm.lds} (100%)
 rename nand_spl/board/davinci/da8xxevm/u-boot.lds => board/davinci/da8xxevm/u-boot-spl-hawk.lds (86%)
 delete mode 100644 nand_spl/board/davinci/da8xxevm/Makefile

Comments

Tom Rini Jan. 9, 2012, 11:30 p.m. UTC | #1 
On 01/09/2012 11:28 AM, Sughosh Ganu wrote:
> This patch moves hawkboard to the new spl infrastructure from the
> older nand_spl one. Making this change required some code refactoring
> with a couple of davinci based platforms which use spl.
> 
> Removed the hawkboard_nand_config build option -- The spl code now
> gets compiled with hawkboard_config, after building the main u-boot
> image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard
> to reflect the same.
[snip]

On the whole, I'm happy, but:
[snip]
> --- a/arch/arm/cpu/arm926ejs/davinci/Makefile
> +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
> @@ -38,8 +38,11 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC)	+= lxt972.o dp83848.o et1011c.o ksz8873.o
>  
>  ifdef CONFIG_SPL_BUILD
>  COBJS-y	+= spl.o
> -COBJS-$(CONFIG_SOC_DM365)	+= dm365_lowlevel.o
> -COBJS-$(CONFIG_SOC_DA8XX)	+= da850_lowlevel.o
> +COBJS-$(CONFIG_DM365_SPL)	+= dm365_lowlevel.o
> +COBJS-$(CONFIG_DM365_SPL)	+= dm365_spl.o
> +COBJS-$(CONFIG_DA850EVM_SPL)	+= da850_lowlevel.o
> +COBJS-$(CONFIG_DA850EVM_SPL)	+= da850_spl.o
> +COBJS-$(CONFIG_HAWKBOARD_SPL)	+= hawkboard_nand_spl.o
>  endif

CONFIG_SPL_BUILD means we'll only do this on the SPL build, not the
normal build, and we already have symbols for the board and the SoC so
we shouldn't need any new CONFIG symbols here, I'm pretty sure.
Sughosh Ganu Jan. 10, 2012, 6:30 a.m. UTC | #2 
On Mon Jan 09, 2012 at 04:30:56PM -0700, Tom Rini wrote:
> On 01/09/2012 11:28 AM, Sughosh Ganu wrote:

<snip>

> > --- a/arch/arm/cpu/arm926ejs/davinci/Makefile
> > +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
> > @@ -38,8 +38,11 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC)	+= lxt972.o dp83848.o et1011c.o ksz8873.o
> >  
> >  ifdef CONFIG_SPL_BUILD
> >  COBJS-y	+= spl.o
> > -COBJS-$(CONFIG_SOC_DM365)	+= dm365_lowlevel.o
> > -COBJS-$(CONFIG_SOC_DA8XX)	+= da850_lowlevel.o
> > +COBJS-$(CONFIG_DM365_SPL)	+= dm365_lowlevel.o
> > +COBJS-$(CONFIG_DM365_SPL)	+= dm365_spl.o
> > +COBJS-$(CONFIG_DA850EVM_SPL)	+= da850_lowlevel.o
> > +COBJS-$(CONFIG_DA850EVM_SPL)	+= da850_spl.o
> > +COBJS-$(CONFIG_HAWKBOARD_SPL)	+= hawkboard_nand_spl.o
> >  endif
> 
> CONFIG_SPL_BUILD means we'll only do this on the SPL build, not the
> normal build, and we already have symbols for the board and the SoC so
> we shouldn't need any new CONFIG symbols here, I'm pretty sure.

  The problem here is that both da850evm and hawkboard define the
  CONFIG_SOC_DA850, and CONFIG_SOC_DA8XX, as the hawkboard shares code
  like pinmux with the da850.

  I see a CONFIG_MACH_DAVINCI_* like define in da850evm.h and
  hawkboard.h. Should i add a similar define for cam_enc_4xx, and use
  these instead.

-sughosh
Christian Riesch Jan. 10, 2012, 8:15 a.m. UTC | #3 
Hi Sughosh and Tom,

On Tuesday, January 10, 2012, Sughosh Ganu <urwithsughosh@gmail.com> wrote:
> On Mon Jan 09, 2012 at 04:30:56PM -0700, Tom Rini wrote:
>> On 01/09/2012 11:28 AM, Sughosh Ganu wrote:
>
> <snip>
>
>> > --- a/arch/arm/cpu/arm926ejs/davinci/Makefile
>> > +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
>> > @@ -38,8 +38,11 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC)   += lxt972.o
dp83848.o et1011c.o ksz8873.o
>> >
>> >  ifdef CONFIG_SPL_BUILD
>> >  COBJS-y    += spl.o
>> > -COBJS-$(CONFIG_SOC_DM365)  += dm365_lowlevel.o
>> > -COBJS-$(CONFIG_SOC_DA8XX)  += da850_lowlevel.o
>> > +COBJS-$(CONFIG_DM365_SPL)  += dm365_lowlevel.o
>> > +COBJS-$(CONFIG_DM365_SPL)  += dm365_spl.o
>> > +COBJS-$(CONFIG_DA850EVM_SPL)       += da850_lowlevel.o
>> > +COBJS-$(CONFIG_DA850EVM_SPL)       += da850_spl.o
>> > +COBJS-$(CONFIG_HAWKBOARD_SPL)      += hawkboard_nand_spl.o
>> >  endif
>>
>> CONFIG_SPL_BUILD means we'll only do this on the SPL build, not the
>> normal build, and we already have symbols for the board and the SoC so
>> we shouldn't need any new CONFIG symbols here, I'm pretty sure.
>
>  The problem here is that both da850evm and hawkboard define the
>  CONFIG_SOC_DA850, and CONFIG_SOC_DA8XX, as the hawkboard shares code
>  like pinmux with the da850.
>
>  I see a CONFIG_MACH_DAVINCI_* like define in da850evm.h and
>  hawkboard.h. Should i add a similar define for cam_enc_4xx, and use
>  these instead.

Actually the problem is that now we have a board specific file
(hawkboard_nand_spl.c) in the arch tree. Hawkboard has a DA850 SoC so if we
have a da850_spl.c hawkboard should either use it as well, or we make the
*spl.c files board specific and put them into the board tree.

board_init_f() in hawkboard_nand_spl.c is pretty much the same as in
da850_spl.c (ok, we don't do PLL and DDR configuration, but we could add an
#ifdef to da850_lowlevel.c so that DDR and PLL configuration is only done
if the required #defines are present, like it is currently done for
CONFIG_SYS_DA850_CS2CFG). And board_init_r() in hawkboard_nand_spl.c is
exactly the same as in dm365_spl.c. Therefore I think we could have only a
single spl.c that can be used for all davinci SoCs and boards until we have
an even more generic solution (see [1]).

Then, spl.c would look like this:

[,,,]
void board_init_f(ulong dummy)
{
#ifdef CONFIG_SOC_DM365
        dm36x_lowlevel_init(0);
#endif
#ifdef CONFIG_SOC_DA8XX
        arch_cpu_init();
#endif
        relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
}

void board_init_r(gd_t *id, ulong dummy)
{
#ifdef CONFIG_SPL_NAND_LOAD
        nand_init();
        puts("Nand boot...\n");
        nand_boot();
#endif
#ifdef CONFIG_SPL_SPI_LOAD
        mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
                        CONFIG_SYS_MALLOC_LEN);
        gd = &gdata;
        gd->bd = &bdata;
        gd->flags |= GD_FLG_RELOC;
        gd->baudrate = CONFIG_BAUDRATE;
        serial_init();          /* serial communications setup */
        gd->have_console = 1;

        puts("SPI boot...\n");
        spi_boot();
#endif
}
[...]

Would this work for hawkboard?

Regards, Christian

[1]
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/118233/focus=118721
Sughosh Ganu Jan. 10, 2012, 8:42 a.m. UTC | #4 
hi Christian,
On Tue Jan 10, 2012 at 09:15:14AM +0100, Christian Riesch wrote:
> Hi Sughosh and Tom,
> 
> On Tuesday, January 10, 2012, Sughosh Ganu <urwithsughosh@gmail.com> wrote:
> > On Mon Jan 09, 2012 at 04:30:56PM -0700, Tom Rini wrote:
> >> On 01/09/2012 11:28 AM, Sughosh Ganu wrote:
> >
> > <snip>
> >
> >> > --- a/arch/arm/cpu/arm926ejs/davinci/Makefile
> >> > +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
> >> > @@ -38,8 +38,11 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC)   += lxt972.o
> dp83848.o et1011c.o ksz8873.o
> >> >
> >> >  ifdef CONFIG_SPL_BUILD
> >> >  COBJS-y    += spl.o
> >> > -COBJS-$(CONFIG_SOC_DM365)  += dm365_lowlevel.o
> >> > -COBJS-$(CONFIG_SOC_DA8XX)  += da850_lowlevel.o
> >> > +COBJS-$(CONFIG_DM365_SPL)  += dm365_lowlevel.o
> >> > +COBJS-$(CONFIG_DM365_SPL)  += dm365_spl.o
> >> > +COBJS-$(CONFIG_DA850EVM_SPL)       += da850_lowlevel.o
> >> > +COBJS-$(CONFIG_DA850EVM_SPL)       += da850_spl.o
> >> > +COBJS-$(CONFIG_HAWKBOARD_SPL)      += hawkboard_nand_spl.o
> >> >  endif
> >>
> >> CONFIG_SPL_BUILD means we'll only do this on the SPL build, not the
> >> normal build, and we already have symbols for the board and the SoC so
> >> we shouldn't need any new CONFIG symbols here, I'm pretty sure.
> >
> >  The problem here is that both da850evm and hawkboard define the
> >  CONFIG_SOC_DA850, and CONFIG_SOC_DA8XX, as the hawkboard shares code
> >  like pinmux with the da850.
> >
> >  I see a CONFIG_MACH_DAVINCI_* like define in da850evm.h and
> >  hawkboard.h. Should i add a similar define for cam_enc_4xx, and use
> >  these instead.
> 
> Actually the problem is that now we have a board specific file
> (hawkboard_nand_spl.c) in the arch tree. Hawkboard has a DA850 SoC so if we
> have a da850_spl.c hawkboard should either use it as well, or we make the
> *spl.c files board specific and put them into the board tree.

  I'd vote for moving the *spl.c files to their corresponding board
  directories -- infact hawkboard_nand_spl.c was earlier under it's
  board directory. This i think keeps the implementation clean, avoids
  the risk of breakage, and also makes it simpler for any newer board
  in the same soc family migrating to spl, which i think might
  increase the ifdeffery.

  Maybe Tom and Heiko can comment on how it can be done, and i'll take
  the route of the majority :).

-sughosh
Heiko Schocher Jan. 10, 2012, 9:42 a.m. UTC | #5 
Hello Sughosh, Christian, Tom,

Sughosh Ganu wrote:
> hi Christian,
> On Tue Jan 10, 2012 at 09:15:14AM +0100, Christian Riesch wrote:
>> Hi Sughosh and Tom,
>>
>> On Tuesday, January 10, 2012, Sughosh Ganu <urwithsughosh@gmail.com> wrote:
>>> On Mon Jan 09, 2012 at 04:30:56PM -0700, Tom Rini wrote:
>>>> On 01/09/2012 11:28 AM, Sughosh Ganu wrote:
>>> <snip>
>>>
>>>>> --- a/arch/arm/cpu/arm926ejs/davinci/Makefile
>>>>> +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
>>>>> @@ -38,8 +38,11 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC)   += lxt972.o
>> dp83848.o et1011c.o ksz8873.o
>>>>>  ifdef CONFIG_SPL_BUILD
>>>>>  COBJS-y    += spl.o
>>>>> -COBJS-$(CONFIG_SOC_DM365)  += dm365_lowlevel.o
>>>>> -COBJS-$(CONFIG_SOC_DA8XX)  += da850_lowlevel.o
>>>>> +COBJS-$(CONFIG_DM365_SPL)  += dm365_lowlevel.o
>>>>> +COBJS-$(CONFIG_DM365_SPL)  += dm365_spl.o
>>>>> +COBJS-$(CONFIG_DA850EVM_SPL)       += da850_lowlevel.o
>>>>> +COBJS-$(CONFIG_DA850EVM_SPL)       += da850_spl.o
>>>>> +COBJS-$(CONFIG_HAWKBOARD_SPL)      += hawkboard_nand_spl.o
>>>>>  endif
>>>> CONFIG_SPL_BUILD means we'll only do this on the SPL build, not the
>>>> normal build, and we already have symbols for the board and the SoC so
>>>> we shouldn't need any new CONFIG symbols here, I'm pretty sure.
>>>  The problem here is that both da850evm and hawkboard define the
>>>  CONFIG_SOC_DA850, and CONFIG_SOC_DA8XX, as the hawkboard shares code
>>>  like pinmux with the da850.
>>>
>>>  I see a CONFIG_MACH_DAVINCI_* like define in da850evm.h and
>>>  hawkboard.h. Should i add a similar define for cam_enc_4xx, and use
>>>  these instead.
>> Actually the problem is that now we have a board specific file
>> (hawkboard_nand_spl.c) in the arch tree. Hawkboard has a DA850 SoC so if we
>> have a da850_spl.c hawkboard should either use it as well, or we make the
>> *spl.c files board specific and put them into the board tree.
> 
>   I'd vote for moving the *spl.c files to their corresponding board
>   directories -- infact hawkboard_nand_spl.c was earlier under it's
>   board directory. This i think keeps the implementation clean, avoids
>   the risk of breakage, and also makes it simpler for any newer board
>   in the same soc family migrating to spl, which i think might
>   increase the ifdeffery.

Hmm.. I vote against creating board specific files. I am here in line
with Christians proposal, posted here:

http://lists.denx.de/pipermail/u-boot/2012-January/115166.html

Did this work for the hawkboard? If you do not need some inits, maybe
we add here defines or better make this functions weak, and you can write
board specific functions for this parts. The code in board_init_r()
is only a "selection" from where to load u-boot, which I think in the
long term could be made more common for other SoCs too ... so I want
to prevent to split this in board specific files.

bye,
Heiko
Sughosh Ganu Jan. 10, 2012, 10:13 a.m. UTC | #6 
hi Heiko,
On Tue Jan 10, 2012 at 10:42:08AM +0100, Heiko Schocher wrote:
> Hello Sughosh, Christian, Tom,
> 
> Sughosh Ganu wrote:

> >>>  I see a CONFIG_MACH_DAVINCI_* like define in da850evm.h and
> >>>  hawkboard.h. Should i add a similar define for cam_enc_4xx, and use
> >>>  these instead.
> >> Actually the problem is that now we have a board specific file
> >> (hawkboard_nand_spl.c) in the arch tree. Hawkboard has a DA850 SoC so if we
> >> have a da850_spl.c hawkboard should either use it as well, or we make the
> >> *spl.c files board specific and put them into the board tree.
> > 
> >   I'd vote for moving the *spl.c files to their corresponding board
> >   directories -- infact hawkboard_nand_spl.c was earlier under it's
> >   board directory. This i think keeps the implementation clean, avoids
> >   the risk of breakage, and also makes it simpler for any newer board
> >   in the same soc family migrating to spl, which i think might
> >   increase the ifdeffery.
> 
> Hmm.. I vote against creating board specific files. I am here in line
> with Christians proposal, posted here:
> 
> http://lists.denx.de/pipermail/u-boot/2012-January/115166.html
> 
> Did this work for the hawkboard? If you do not need some inits, maybe
> we add here defines or better make this functions weak, and you can write
> board specific functions for this parts. The code in board_init_r()
> is only a "selection" from where to load u-boot, which I think in the
> long term could be made more common for other SoCs too ... so I want
> to prevent to split this in board specific files.

  I should be able to test these changes in the evening. Will send a
  modified patch after testing.

-sughosh
diff mbox

Patch

diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile
index da7efac..66a065e 100644
--- a/arch/arm/cpu/arm926ejs/davinci/Makefile
+++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
@@ -38,8 +38,11 @@  COBJS-$(CONFIG_DRIVER_TI_EMAC)	+= lxt972.o dp83848.o et1011c.o ksz8873.o
 
 ifdef CONFIG_SPL_BUILD
 COBJS-y	+= spl.o
-COBJS-$(CONFIG_SOC_DM365)	+= dm365_lowlevel.o
-COBJS-$(CONFIG_SOC_DA8XX)	+= da850_lowlevel.o
+COBJS-$(CONFIG_DM365_SPL)	+= dm365_lowlevel.o
+COBJS-$(CONFIG_DM365_SPL)	+= dm365_spl.o
+COBJS-$(CONFIG_DA850EVM_SPL)	+= da850_lowlevel.o
+COBJS-$(CONFIG_DA850EVM_SPL)	+= da850_spl.o
+COBJS-$(CONFIG_HAWKBOARD_SPL)	+= hawkboard_nand_spl.o
 endif
 
 SOBJS	= reset.o
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/da850_spl.c
similarity index 68%
copy from arch/arm/cpu/arm926ejs/davinci/spl.c
copy to arch/arm/cpu/arm926ejs/davinci/da850_spl.c
index f475f9b..ffea743 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/da850_spl.c
@@ -20,66 +20,25 @@ 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
+
 #include <common.h>
-#include <asm/u-boot.h>
-#include <asm/utils.h>
-#include <nand.h>
-#include <asm/arch/dm365_lowlevel.h>
-#include <ns16550.h>
 #include <malloc.h>
 #include <spi_flash.h>
 
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-
 DECLARE_GLOBAL_DATA_PTR;
+
 /* Define global data structure pointer to it*/
 static gd_t gdata __attribute__ ((section(".data")));
 static bd_t bdata __attribute__ ((section(".data")));
 
-#else
-
-void puts(const char *str)
-{
-	while (*str)
-		putc(*str++);
-}
-
-void putc(char c)
-{
-	if (c == '\n')
-		NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), '\r');
-
-	NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), c);
-}
-
-#endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
-
-inline void hang(void)
-{
-	puts("### ERROR ### Please RESET the board ###\n");
-	for (;;)
-		;
-}
-
 void board_init_f(ulong dummy)
 {
-#ifdef CONFIG_SOC_DM365
-	dm36x_lowlevel_init(0);
-#endif
-#ifdef CONFIG_SOC_DA8XX
 	arch_cpu_init();
-#endif
 	relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
 }
 
 void board_init_r(gd_t *id, ulong dummy)
 {
-#ifdef CONFIG_SOC_DM365
-	nand_init();
-	puts("Nand boot...\n");
-	nand_boot();
-#endif
-#ifdef CONFIG_SOC_DA8XX
 	mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
 			CONFIG_SYS_MALLOC_LEN);
 
@@ -92,5 +51,4 @@  void board_init_r(gd_t *id, ulong dummy)
 
 	puts("SPI boot...\n");
 	spi_boot();
-#endif
 }
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/dm365_spl.c
similarity index 50%
copy from arch/arm/cpu/arm926ejs/davinci/spl.c
copy to arch/arm/cpu/arm926ejs/davinci/dm365_spl.c
index f475f9b..fac14f9 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/dm365_spl.c
@@ -20,77 +20,21 @@ 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
+
 #include <common.h>
-#include <asm/u-boot.h>
-#include <asm/utils.h>
 #include <nand.h>
 #include <asm/arch/dm365_lowlevel.h>
-#include <ns16550.h>
-#include <malloc.h>
-#include <spi_flash.h>
-
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-
-DECLARE_GLOBAL_DATA_PTR;
-/* Define global data structure pointer to it*/
-static gd_t gdata __attribute__ ((section(".data")));
-static bd_t bdata __attribute__ ((section(".data")));
-
-#else
-
-void puts(const char *str)
-{
-	while (*str)
-		putc(*str++);
-}
-
-void putc(char c)
-{
-	if (c == '\n')
-		NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), '\r');
-
-	NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), c);
-}
-
-#endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
-
-inline void hang(void)
-{
-	puts("### ERROR ### Please RESET the board ###\n");
-	for (;;)
-		;
-}
 
 void board_init_f(ulong dummy)
 {
-#ifdef CONFIG_SOC_DM365
 	dm36x_lowlevel_init(0);
-#endif
-#ifdef CONFIG_SOC_DA8XX
-	arch_cpu_init();
-#endif
 	relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
 }
 
 void board_init_r(gd_t *id, ulong dummy)
 {
-#ifdef CONFIG_SOC_DM365
+
 	nand_init();
 	puts("Nand boot...\n");
 	nand_boot();
-#endif
-#ifdef CONFIG_SOC_DA8XX
-	mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
-			CONFIG_SYS_MALLOC_LEN);
-
-	gd = &gdata;
-	gd->bd = &bdata;
-	gd->flags |= GD_FLG_RELOC;
-	gd->baudrate = CONFIG_BAUDRATE;
-	serial_init();          /* serial communications setup */
-	gd->have_console = 1;
-
-	puts("SPI boot...\n");
-	spi_boot();
-#endif
 }
diff --git a/board/davinci/da8xxevm/hawkboard_nand_spl.c b/arch/arm/cpu/arm926ejs/davinci/hawkboard_nand_spl.c
similarity index 90%
rename from board/davinci/da8xxevm/hawkboard_nand_spl.c
rename to arch/arm/cpu/arm926ejs/davinci/hawkboard_nand_spl.c
index df97963..56d7b79 100644
--- a/board/davinci/da8xxevm/hawkboard_nand_spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/hawkboard_nand_spl.c
@@ -85,31 +85,19 @@  void board_init_f(ulong bootflag)
 	NS16550_init((NS16550_t)(DAVINCI_UART2_BASE),
 			CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
 
-	puts("Nand boot...\n");
-
-	nand_boot();
-}
-
-void puts(const char *str)
-{
-	while (*str)
-		putc(*str++);
+	/*
+	 * Skip relocation by passing spl's text base as
+	 * the dest address to relocate_code. We really
+	 * call this for clearing the bss before accessing
+	 * the nand functions which need a zero'ed bss.
+	 */
+	relocate_code(CONFIG_SPL_STACK, (gd_t *)gd, CONFIG_SPL_TEXT_BASE);
 }
 
-void putc(char c)
+void board_init_r(gd_t *id, ulong dest_addr)
 {
-	if (gd->flags & GD_FLG_SILENT)
-		return;
-
-	if (c == '\n')
-		NS16550_putc((NS16550_t)(DAVINCI_UART2_BASE), '\r');
-
-	NS16550_putc((NS16550_t)(DAVINCI_UART2_BASE), c);
-}
+	nand_init();
+	puts("Nand boot...\n");
 
-void hang(void)
-{
-	puts("### ERROR ### Please RESET the board ###\n");
-	for (;;)
-		;
+	nand_boot();
 }
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
index f475f9b..7cb929a 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
@@ -23,21 +23,9 @@ 
 #include <common.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
-#include <nand.h>
-#include <asm/arch/dm365_lowlevel.h>
 #include <ns16550.h>
-#include <malloc.h>
-#include <spi_flash.h>
-
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-
-DECLARE_GLOBAL_DATA_PTR;
-/* Define global data structure pointer to it*/
-static gd_t gdata __attribute__ ((section(".data")));
-static bd_t bdata __attribute__ ((section(".data")));
-
-#else
 
+#if !defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
 void puts(const char *str)
 {
 	while (*str)
@@ -51,7 +39,6 @@  void putc(char c)
 
 	NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), c);
 }
-
 #endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
 
 inline void hang(void)
@@ -60,37 +47,3 @@  inline void hang(void)
 	for (;;)
 		;
 }
-
-void board_init_f(ulong dummy)
-{
-#ifdef CONFIG_SOC_DM365
-	dm36x_lowlevel_init(0);
-#endif
-#ifdef CONFIG_SOC_DA8XX
-	arch_cpu_init();
-#endif
-	relocate_code(CONFIG_SPL_STACK, NULL, CONFIG_SPL_TEXT_BASE);
-}
-
-void board_init_r(gd_t *id, ulong dummy)
-{
-#ifdef CONFIG_SOC_DM365
-	nand_init();
-	puts("Nand boot...\n");
-	nand_boot();
-#endif
-#ifdef CONFIG_SOC_DA8XX
-	mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
-			CONFIG_SYS_MALLOC_LEN);
-
-	gd = &gdata;
-	gd->bd = &bdata;
-	gd->flags |= GD_FLG_RELOC;
-	gd->baudrate = CONFIG_BAUDRATE;
-	serial_init();          /* serial communications setup */
-	gd->have_console = 1;
-
-	puts("SPI boot...\n");
-	spi_boot();
-#endif
-}
diff --git a/board/davinci/da8xxevm/u-boot-spl.lds b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
similarity index 100%
rename from board/davinci/da8xxevm/u-boot-spl.lds
rename to board/davinci/da8xxevm/u-boot-spl-da850evm.lds
diff --git a/nand_spl/board/davinci/da8xxevm/u-boot.lds b/board/davinci/da8xxevm/u-boot-spl-hawk.lds
similarity index 86%
rename from nand_spl/board/davinci/da8xxevm/u-boot.lds
rename to board/davinci/da8xxevm/u-boot-spl-hawk.lds
index 638ffd9..b3a41af 100644
--- a/nand_spl/board/davinci/da8xxevm/u-boot.lds
+++ b/board/davinci/da8xxevm/u-boot-spl-hawk.lds
@@ -34,11 +34,11 @@  SECTIONS
 	. = ALIGN(4);
 	.text      :
 	{
-	  start.o	(.text)
-	  cpu.o		(.text)
-	  nand_boot.o	(.text)
+	  arch/arm/cpu/arm926ejs/start.o		(.text)
+	  arch/arm/cpu/arm926ejs/davinci/libdavinci.o	(.text)
+	  drivers/mtd/nand/libnand.o			(.text)
 
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
@@ -68,10 +68,14 @@  SECTIONS
 
 	__got_end = .;
 
-	_end = .;
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start = .;
+		*(.bss*)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	}
 
-	. = ALIGN(4);
-	__bss_start = .;
-	.bss : { *(.bss) }
-	__bss_end__ = .;
+	_end = .;
 }
diff --git a/boards.cfg b/boards.cfg
index da1a3ce..643b34b 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -133,7 +133,6 @@  davinci_sffsdr               arm         arm926ejs   sffsdr              davinci
 davinci_sonata               arm         arm926ejs   sonata              davinci        davinci
 ea20			     arm	 arm926ejs   ea20		 davinci	davinci
 hawkboard                    arm         arm926ejs   da8xxevm            davinci        davinci
-hawkboard_nand               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:NAND_U_BOOT
 hawkboard_uart               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:UART_U_BOOT
 enbw_cmc                     arm         arm926ejs   enbw_cmc            enbw           davinci
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood:KM_DISABLE_PCI
diff --git a/doc/README.hawkboard b/doc/README.hawkboard
index b7afec4..d6ae02e 100644
--- a/doc/README.hawkboard
+++ b/doc/README.hawkboard
@@ -9,8 +9,8 @@  executes upon reset is the Rom Boot Loader(RBL) which sits in the
 internal ROM of the omap. The RBL initialises the memory and the nand
 controller, and copies the image stored at a predefined location(block
 1) of the nand flash. The image loaded by the RBL to the memory is the
-AIS signed nand_spl image. This, in turns copies the u-boot binary
-from the nand flash to the memory and jumps to the u-boot entry point.
+AIS signed spl image. This, in turns copies the u-boot binary from the
+nand flash to the memory and jumps to the u-boot entry point.
 
 AIS is an image format defined by TI for the images that are to be
 loaded to memory by the RBL. The image is divided into a series of
@@ -20,14 +20,14 @@  and the size of the section, which is used by the RBL to load the
 image. At the end of the image the RBL jumps to the image entry
 point.
 
-The secondary stage bootloader(nand_spl) which is loaded by the RBL
-then loads the u-boot from a predefined location in the nand to the
-memory and jumps to the u-boot entry point.
+The secondary stage bootloader(spl) which is loaded by the RBL then
+loads the u-boot from a predefined location in the nand to the memory
+and jumps to the u-boot entry point.
 
 The reason a secondary stage bootloader is used is because the ECC
 layout expected by the RBL is not the same as that used by
-u-boot/linux. This also implies that for flashing the nand_spl image,
-we need to use the u-boot which uses the ECC layout expected by the
+u-boot/linux. This also implies that for flashing the spl image,we
+need to use the u-boot which uses the ECC layout expected by the
 RBL[1]. Booting u-boot over UART(UART boot) is explained here[2].
 
 
@@ -35,20 +35,19 @@  Compilation
 ===========
 Three images might be needed
 
-* nand_spl - This is the secondary bootloader which boots the u-boot
+* spl - This is the secondary bootloader which boots the u-boot
   binary.
 
-  hawkboard_nand_config
-
-  The nand_spl ELF gets generated under nand_spl/u-boot-spl. This
-  needs to be processed with the AISGen tool for generating the AIS
-  signed image to be flashed. Steps for generating the AIS image are
-  explained here[3].
-
 * u-boot binary - This is the image flashed to the nand and copied to
-  the memory by the nand_spl.
+  the memory by the spl.
+
+  Both the images get compiled with hawkboard_config, with the TOPDIR
+  containing the u-boot images, and the spl image under the spl
+  directory.
 
-  hawkboard_config
+  The spl image needs to be processed with the AISGen tool for
+  generating the AIS signed image to be flashed. Steps for generating
+  the AIS image are explained here[3].
 
 * u-boot for uart boot - This is same as the u-boot binary generated
   above, with the sole difference of the CONFIG_SYS_TEXT_BASE being
@@ -59,17 +58,17 @@  Three images might be needed
 
 Flashing the images to Nand
 ===========================
-The nand_spl AIS image needs to be flashed to the block 1 of the
-Nand flash, as that is the location the RBL expects the image[4]. For
-flashing the nand_spl, boot over the u-boot specified in [1], and
-flash the image
+The spl AIS image needs to be flashed to the block 1 of the Nand
+flash, as that is the location the RBL expects the image[4]. For
+flashing the spl, boot over the u-boot specified in [1], and flash the
+image
 
 => tftpboot 0xc0700000 <nand_spl_ais.bin>
 => nand erase 0x20000 0x20000
 => nand write.e 0xc0700000 0x20000 <nand_spl_size>
 
 The u-boot binary is flashed at location 0xe0000(block 6) of the nand
-flash. The nand_spl loader expects the u-boot at this location. For
+flash. The spl loader expects the u-boot at this location. For
 flashing the u-boot binary
 
 => tftpboot 0xc0700000 u-boot.bin
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index a21d448..8e3a4d2 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -205,6 +205,7 @@ 
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_DM365_SPL
 #define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_NAND_LOAD
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index fcbbace..a44d825 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -311,6 +311,7 @@ 
 
 /* defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_DA850EVM_SPL
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
@@ -319,7 +320,7 @@ 
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_LDSCRIPT	"$(BOARDDIR)/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT	"board/$(BOARDDIR)/u-boot-spl-da850evm.lds"
 #define CONFIG_SPL_STACK	0x8001ff00
 #define CONFIG_SPL_TEXT_BASE	0x80000000
 #define CONFIG_SPL_MAX_SIZE	32768
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 12acb27..7c8a1d9 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -43,12 +43,23 @@ 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_UART_U_BOOT)
+#if defined(CONFIG_UART_U_BOOT)
 #define CONFIG_SYS_TEXT_BASE		0xc1080000
-#else
+#elif !defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_TEXT_BASE		0xc1180000
 #endif
 
+/* Spl */
+#define CONFIG_SPL
+#define CONFIG_HAWKBOARD_SPL
+#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_NAND_SIMPLE
+#define CONFIG_SPL_NAND_LOAD
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_LDSCRIPT		"board/$(BOARDDIR)/u-boot-spl-hawk.lds"
+#define CONFIG_SPL_TEXT_BASE		0xc1080000
+#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+
 /*
  * Memory Info
  */
@@ -84,9 +95,7 @@ 
 /*
  * Network & Ethernet Configuration
  */
-#if !defined(CONFIG_NAND_SPL)
 #define CONFIG_DRIVER_TI_EMAC
-#endif
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile
deleted file mode 100644
index 7746e41..0000000
--- a/nand_spl/board/davinci/da8xxevm/Makefile
+++ /dev/null
@@ -1,155 +0,0 @@ 
-#
-# (C) Copyright 2006-2007
-# Stefan Roese, DENX Software Engineering, sr@denx.de.
-#
-# (C) Copyright 2008
-# Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-CONFIG_NAND_SPL	= y
-
-include $(TOPDIR)/config.mk
-
-nandobj	:= $(OBJTREE)/nand_spl/
-
-LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
-LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
-	   $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
-
-SOBJS	= _divsi3.o \
-	_udivsi3.o \
-	start.o
-
-COBJS	= cpu.o \
-	davinci_nand.o \
-	pinmux.o \
-	da850_pinmux.o \
-	div0.o \
-	hawkboard_nand_spl.o \
-	misc.o \
-	nand_boot.o \
-	ns16550.o \
-	psc.o
-
-SRCS	:= $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-__OBJS	:= $(SOBJS) $(COBJS)
-LNDIR	:= $(nandobj)board/$(BOARDDIR)
-
-ALL	= $(nandobj)u-boot-spl $(nandobj)u-boot-spl.bin \
-	$(nandobj)u-boot-spl-16k.bin
-
-all:	$(ALL)
-
-$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
-	$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@
-
-$(nandobj)u-boot-spl.bin:	$(nandobj)u-boot-spl
-	$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
-
-$(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot.lds
-	cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) \
-		-Map $(nandobj)u-boot-spl.map \
-		-o $(nandobj)u-boot-spl
-
-$(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
-
-# create symbolic links for common files
-
-# from board directory
-$(obj)pinmux.c:
-	@rm -f $@
-	@ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/pinmux.c $@
-
-$(obj)da850_pinmux.c:
-	@rm -f $@
-	@ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c $@
-
-# from drivers/mtd/nand directory
-$(obj)davinci_nand.c:
-	@rm -f $@
-	@ln -s $(TOPDIR)/drivers/mtd/nand/davinci_nand.c $@
-
-# from nand_spl directory
-$(obj)nand_boot.c:
-	@rm -f $@
-	@ln -s $(TOPDIR)/nand_spl/nand_boot.c $@
-
-# from drivers/serial directory
-$(obj)ns16550.c:
-	@rm -f $@
-	@ln -sf $(TOPDIR)/drivers/serial/ns16550.c $@
-
-# from cpu directory
-$(obj)start.S:
-	@rm -f $@
-	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/start.S $@
-
-# from lib directory
-$(obj)_udivsi3.S:
-	@rm -f $@
-	ln -s $(TOPDIR)/arch/arm/lib/_udivsi3.S $@
-
-# from lib directory
-$(obj)_divsi3.S:
-	@rm -f $@
-	ln -s $(TOPDIR)/arch/arm/lib/_divsi3.S $@
-
-# from lib directory
-$(obj)div0.c:
-	@rm -f $@
-	ln -s $(TOPDIR)/arch/arm/lib/div0.c $@
-
-# from SoC directory
-$(obj)cpu.c:
-	@rm -f $@
-	@ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/cpu.c $@
-
-$(obj)misc.c:
-	@rm -f $@
-	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/misc.c $@
-
-# from board directory
-$(obj)hawkboard_nand_spl.c:
-	@rm -f $@
-	ln -s $(TOPDIR)/board/davinci/da8xxevm/hawkboard_nand_spl.c $@
-
-$(obj)psc.c:
-	@rm -f $@
-	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/psc.c $@
-
-#########################################################################
-
-$(obj)%.o:	$(obj)%.S
-	$(CC) $(AFLAGS) -c -o $@ $<
-
-$(obj)%.o:	$(obj)%.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################