From 6b873dcabd85ca4109a76c488c653609ea71c848 Mon Sep 17 00:00:00 2001 From: Sughosh Ganu Date: Thu, 2 Feb 2012 00:44:41 +0000 Subject: Changes to move hawkboard to the new spl infrastructure This patch moves hawkboard to the new spl infrastructure from the older nand_spl one. 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 Signed-off-by: Heiko Schocher Cc: Heiko Schocher Cc: Christian Riesch Cc: Sudhakar Rajashekhara Cc: Tom Rini Acked-by: Christian Riesch --- nand_spl/board/davinci/da8xxevm/Makefile | 155 ----------------------------- nand_spl/board/davinci/da8xxevm/u-boot.lds | 77 -------------- 2 files changed, 232 deletions(-) delete mode 100644 nand_spl/board/davinci/da8xxevm/Makefile delete mode 100644 nand_spl/board/davinci/da8xxevm/u-boot.lds (limited to 'nand_spl') 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, -# -# 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 - -######################################################################### diff --git a/nand_spl/board/davinci/da8xxevm/u-boot.lds b/nand_spl/board/davinci/da8xxevm/u-boot.lds deleted file mode 100644 index 638ffd9..0000000 --- a/nand_spl/board/davinci/da8xxevm/u-boot.lds +++ /dev/null @@ -1,77 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, - * - * (C) Copyright 2008 - * Guennadi Liakhovetki, DENX Software Engineering, - * - * 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_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{ - . = 0xc1080000; - - . = ALIGN(4); - .text : - { - start.o (.text) - cpu.o (.text) - nand_boot.o (.text) - - *(.text) - } - - . = ALIGN(4); - .rodata : { *(.rodata) } - - . = ALIGN(4); - .data : { - *(.data) - __datarel_start = .; - *(.data.rel) - __datarelrolocal_start = .; - *(.data.rel.ro.local) - __datarellocal_start = .; - *(.data.rel.local) - __datarelro_start = .; - *(.data.rel.ro) - } - - . = ALIGN(4); - __rel_dyn_start = .; - __rel_dyn_end = .; - __dynsym_start = .; - - __got_start = .; - . = ALIGN(4); - .got : { *(.got) } - - __got_end = .; - - _end = .; - - . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) } - __bss_end__ = .; -} -- cgit v1.1