[U-Boot] [PATCH 4/4] New board support: nand_spl specific files

[U-Boot] [PATCH 4/4] New board support: nand_spl specific files

[Ron Madrid]

This is a patch containing all board specific files for the nand_spl directory tree for the support of booting from NAND.

Signed off by: Ron Madrid <ron_madrid@sbcglobal.net>

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
new file mode 100644
index 0000000..f699fab
--- /dev/null
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -0,0 +1,100 @@
+#
+# (C) Copyright 2007
+# Stefan Roese, DENX Software Engineering, sr at denx.de.
+# (C) Copyright Sheldon Instruments, Inc. 2008
+#
+# 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
+#
+
+NAND_SPL := y
+TEXT_BASE := 0xfff00000
+
+include $(TOPDIR)/config.mk
+
+LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
+LDFLAGS    = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+AFLAGS    += -DCONFIG_NAND_SPL
+CFLAGS    += -DCONFIG_NAND_SPL
+
+SOBJS    = start.o ticks.o
+COBJS    = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o nand_init.o time.o
+
+SRCS    := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
+OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS))
+__OBJS    := $(SOBJS) $(COBJS)
+LNDIR    := $(OBJTREE)/nand_spl/board/$(BOARDDIR)
+
+nandobj    := $(OBJTREE)/nand_spl/
+
+ALL    = $(nandobj)u-boot-spl $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
+
+all:    $(obj).depend $(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)
+    cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) \
+        -Map $(nandobj)u-boot-spl.map \
+        -o $(nandobj)u-boot-spl
+
+# create symbolic links for common files
+
+$(obj)start.S:
+    ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+
+$(obj)nand_boot_fsl_elbc.c:
+    ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
+           $(obj)nand_boot_fsl_elbc.c
+
+$(obj)sdram.c:
+    ln -sf $(SRCTREE)/board/$(BOARDDIR)/sdram.c $(obj)sdram.c
+
+$(obj)$(BOARD).c:
+    ln -sf $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $(obj)$(BOARD).c
+
+$(obj)ns16550.c:
+    ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
+
+$(obj)nand_init.c:
+    ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+
+$(obj)time.c:
+    ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c
+
+$(obj)ticks.S:
+    ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S
+
+#########################################################################
+
+$(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
+
+#########################################################################
diff --git a/nand_spl/board/sheldon/simpc8313/u-boot.lds b/nand_spl/board/sheldon/simpc8313/u-boot.lds
new file mode 100644
index 0000000..c07c53c
--- /dev/null
+++ b/nand_spl/board/sheldon/simpc8313/u-boot.lds
@@ -0,0 +1,52 @@
+/*
+ * (C) Copyright 2006
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * Copyright 2008 Sheldon Instruments, Inc.
+ *
+ * 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
+ */
+
+OUTPUT_ARCH(powerpc)
+SECTIONS
+{
+    . = 0xfff00000;
+    .text : {
+        *(.text*)
+        . = ALIGN(16);
+        *(.rodata*)
+        *(.eh_frame)
+    }
+
+    . = ALIGN(8);
+    .data : {
+        *(.data*)
+        *(.sdata*)
+        _GOT2_TABLE_ = .;
+        *(.got2)
+        __got2_entries = (. - _GOT2_TABLE_) >> 2;
+    }
+
+    . = ALIGN(8);
+    __bss_start = .;
+    .bss (NOLOAD) : { *(.*bss) }
+    _end = .;
+}
+ENTRY(_start)
+ASSERT(_end <= 0xfff01000, "NAND bootstrap too big");
-- 
1.5.5.1

[U-Boot] [PATCH 4/4] New board support: nand_spl specific files

[Scott Wood]

On Fri, Oct 31, 2008 at 11:21:09AM -0700, Ron Madrid wrote:
> This is a patch containing all board specific files for the nand_spl directory tree for the support of booting from NAND.
> 
> Signed off by: Ron Madrid <ron_madrid@sbcglobal.net>

Patch is whitespace-mangled; TABs seem to have been replaced by four
spaces.

Besides being a coding style violation, it will break the Makefile.

> diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
> new file mode 100644
> index 0000000..f699fab
> --- /dev/null
> +++ b/nand_spl/board/sheldon/simpc8313/Makefile
> @@ -0,0 +1,100 @@
> +#
> +# (C) Copyright 2007
> +# Stefan Roese, DENX Software Engineering, sr at denx.de.
> +# (C) Copyright Sheldon Instruments, Inc. 2008

This looks almost identical to the mpc8313erdb nand_spl makefile, which
has a Freescale copyright.

> diff --git a/nand_spl/board/sheldon/simpc8313/u-boot.lds b/nand_spl/board/sheldon/simpc8313/u-boot.lds
> new file mode 100644
> index 0000000..c07c53c
> --- /dev/null
> +++ b/nand_spl/board/sheldon/simpc8313/u-boot.lds
> @@ -0,0 +1,52 @@
> +/*
> + * (C) Copyright 2006
> + * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
> + *
> + * Copyright 2008 Sheldon Instruments, Inc.

Likewise.

-Scott