On Oct 5, 2009, at 6:46 AM, Dipen Dudhat wrote:
> NAND Boot support for P1 and P2 series RDB platforms.
>
> This patch is derived from latest NAND Boot support on MPC8536DS by
> Mingkai Hu.
>
> Signed-off-by: Dipen Dudhat <dipen.dud...@freescale.com>
> ---
> - Applies to http://git.denx.de/u-boot.git
> MAKEALL | 1 +
> Makefile | 1 +
> board/freescale/p1_p2_rdb/config.mk | 7 ++
> board/freescale/p1_p2_rdb/tlb.c | 10 ++
> include/configs/P1_P2_RDB.h | 72 +++++++++++++--
> nand_spl/board/freescale/p1_p2_rdb/Makefile | 123 +++++++++++++++
> +++++++++
> nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 97 +++++++++++++++
> ++++
> 7 files changed, 304 insertions(+), 7 deletions(-)
> create mode 100644 nand_spl/board/freescale/p1_p2_rdb/Makefile
> create mode 100644 nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
>
[snip]
> diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/
> board/freescale/p1_p2_rdb/Makefile
> new file mode 100644
> index 0000000..77a5137
> --- /dev/null
> +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
> @@ -0,0 +1,123 @@
> +#
> +# (C) Copyright 2007
> +# Stefan Roese, DENX Software Engineering, s...@denx.de.
> +#
> +# Copyright 2009 Freescale Semiconductor, 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
> +#
> +
> +NAND_SPL := y
> +TEXT_BASE := 0xfff00000
> +PAD_TO := 0xfff01000
> +
> +include $(TOPDIR)/config.mk
> +
> +LDSCRIPT= $(TOPDIR)/cpu/$(CPU)/u-boot-nand_spl.lds
> +LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $
> (PLATFORM_LDFLAGS)
> +AFLAGS += -DCONFIG_NAND_SPL
> +CFLAGS += -DCONFIG_NAND_SPL
> +
> +SOBJS = start.o resetvec.o
> +COBJS = cache.o cpu_init_early.o cpu_init_nand.o fsl_law.o law.o \
> + nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.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) $(PLATFORM_LIBS) \
> + -Map $(nandobj)u-boot-spl.map \
> + -o $(nandobj)u-boot-spl
> +
> +# create symbolic links for common files
> +
> +$(obj)cache.c:
> + @rm -f $(obj)cache.c
> + ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
> +
> +$(obj)cpu_init_early.c:
> + @rm -f $(obj)cpu_init_early.c
> + ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)
> cpu_init_early.c
> +
> +$(obj)cpu_init_nand.c:
> + @rm -f $(obj)cpu_init_nand.c
> + ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
> +
> +$(obj)fsl_law.c:
> + @rm -f $(obj)fsl_law.c
> + ln -sf $(SRCTREE)/drivers/misc/fsl_law.c $(obj)fsl_law.c
> +
> +$(obj)law.c:
> + @rm -f $(obj)law.c
> + ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $(obj)law.c
> +
> +$(obj)nand_boot_fsl_elbc.c:
> + @rm -f $(obj)nand_boot_fsl_elbc.c
> + ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
> + $(obj)nand_boot_fsl_elbc.c
> +
> +$(obj)ns16550.c:
> + @rm -f $(obj)ns16550.c
> + ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
> +
> +$(obj)resetvec.S:
> + @rm -f $(obj)resetvec.S
> + ln -s $(SRCTREE)/cpu/$(CPU)/resetvec.S $(obj)resetvec.S
> +
missing fixed_ivor.S, look at mpc8536ds/Makefile
> +$(obj)start.S:
> + @rm -f $(obj)start.S
> + ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
> +
> +$(obj)tlb.c:
> + @rm -f $(obj)tlb.c
> + ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
> +
> +$(obj)tlb_table.c:
> + @rm -f $(obj)tlb_table.c
> + ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $(obj)tlb_table.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
> +
> +
> #########################################################################
> diff --git a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c b/
> nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
> new file mode 100644
> index 0000000..fd24452
> --- /dev/null
> +++ b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
> @@ -0,0 +1,97 @@
> +/*
> + * Copyright 2009 Freescale Semiconductor, Inc. All rights reserved.
Drop the All rights reserved.
> + *
> + * 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
> + *
> + */
> +#include <common.h>
> +#include <mpc85xx.h>
> +#include <asm-ppc/io.h>
> +#include <ns16550.h>
> +#include <nand.h>
> +#include <asm/mmu.h>
> +#include <asm/immap_85xx.h>
> +#include <asm/fsl_ddr_sdram.h>
> +#include <asm/fsl_law.h>
> +
> +#define SYSCLK_MASK 0x00200000
> +#define BOARDREV_MASK 0x10100000
> +#define BOARDREV_B 0x10100000
> +#define BOARDREV_C 0x00100000
> +
> +#define SYSCLK_66 66666666
> +#define SYSCLK_50 50000000
> +#define SYSCLK_100 100000000
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +void board_init_f(ulong bootflag)
> +{
> + uint plat_ratio, bus_clk, sys_clk;
> + volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
> + volatile ccsr_gpio_t *pgpio = (void *)
> (CONFIG_SYS_MPC85xx_GPIO_ADDR);
> + uint val, temp, sysclk_mask;
> +
> + val = pgpio->gpdat;
> + sysclk_mask = val & SYSCLK_MASK;
> + temp = val & BOARDREV_MASK;
> + if (temp == BOARDREV_C) {
> + if(sysclk_mask == 0)
> + sys_clk = SYSCLK_66;
> + else
> + sys_clk = SYSCLK_100;
> + } else if (temp == BOARDREV_B) {
> + if(sysclk_mask == 0)
> + sys_clk = SYSCLK_66;
> + else
> + sys_clk = SYSCLK_50;
> + }
> +
> + plat_ratio = gur->porpllsr & 0x0000003e;
> + plat_ratio >>= 1;
> + bus_clk = plat_ratio * sys_clk;
> + NS16550_init((NS16550_t)(CONFIG_SYS_CCSRBAR + 0x4500),
> + bus_clk / 16 / CONFIG_BAUDRATE);
> +
> + puts("\nNAND boot... ");
> +
> + /* copy code to DDR and jump to it - this should not return */
> + /* NOTE - code has to be copied out of NAND buffer before
> + * other blocks can be read.
> + */
> + relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, 0,
> + CONFIG_SYS_NAND_U_BOOT_RELOC);
> +}
> +
> +void board_init_r(gd_t *gd, ulong dest_addr)
> +{
> + nand_boot();
> +}
> +
> +void putc(char c)
> +{
> + if (c == '\n')
> + NS16550_putc((NS16550_t)(CONFIG_SYS_CCSRBAR + 0x4500), '\r');
Can you not use CONFIG_SYS_NS16550_COM1 (see mpc853ds/nand_boot.c)
> +
> + NS16550_putc((NS16550_t)(CONFIG_SYS_CCSRBAR + 0x4500), c);
CONFIG_SYS_NS16550_COM1?
> +}
> +
> +void puts(const char *str)
> +{
> + while (*str)
> + putc(*str++);
> +}
> --
> 1.5.6.3
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
