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 <urwithsughosh@gmail.com> Signed-off-by: Heiko Schocher <hs@denx.de> 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> Acked-by: Christian Riesch <christian.riesch@omicron.at>master
Sughosh Ganu
13 years ago
committed by
Albert ARIBAUD
parent
d735a99d3b
commit
6b873dcabd
@ -1,115 +0,0 @@ |
||||
/*
|
||||
* Modified for Hawkboard - Syed Mohammed Khasim <khasim@beagleboard.org> |
||||
* |
||||
* Copyright (C) 2008 Sekhar Nori, Texas Instruments, Inc. <nsekhar@ti.com> |
||||
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> |
||||
* Copyright (C) 2004 Texas Instruments. |
||||
* |
||||
* ---------------------------------------------------------------------------- |
||||
* 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., 675 Mass Ave, Cambridge, MA 02139, USA. |
||||
* ---------------------------------------------------------------------------- |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <asm/errno.h> |
||||
#include <asm/arch/hardware.h> |
||||
#include <asm/io.h> |
||||
#include <asm/arch/davinci_misc.h> |
||||
#include <asm/arch/pinmux_defs.h> |
||||
#include <ns16550.h> |
||||
#include <nand.h> |
||||
|
||||
DECLARE_GLOBAL_DATA_PTR; |
||||
|
||||
static const struct pinmux_resource pinmuxes[] = { |
||||
PINMUX_ITEM(emac_pins_mii), |
||||
PINMUX_ITEM(emac_pins_mdio), |
||||
PINMUX_ITEM(emifa_pins_cs3), |
||||
PINMUX_ITEM(emifa_pins_cs4), |
||||
PINMUX_ITEM(emifa_pins_nand), |
||||
PINMUX_ITEM(uart2_pins_txrx), |
||||
PINMUX_ITEM(uart2_pins_rtscts), |
||||
}; |
||||
|
||||
static const struct lpsc_resource lpsc[] = { |
||||
{ DAVINCI_LPSC_AEMIF }, /* NAND, NOR */ |
||||
{ DAVINCI_LPSC_SPI1 }, /* Serial Flash */ |
||||
{ DAVINCI_LPSC_EMAC }, /* image download */ |
||||
{ DAVINCI_LPSC_UART2 }, /* console */ |
||||
{ DAVINCI_LPSC_GPIO }, |
||||
}; |
||||
|
||||
void board_init_f(ulong bootflag) |
||||
{ |
||||
/*
|
||||
* Kick Registers need to be set to allow access to Pin Mux registers |
||||
*/ |
||||
writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0); |
||||
writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1); |
||||
|
||||
/* setup the SUSPSRC for ARM to control emulation suspend */ |
||||
writel(readl(&davinci_syscfg_regs->suspsrc) & |
||||
~(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C | |
||||
DAVINCI_SYSCFG_SUSPSRC_SPI1 | DAVINCI_SYSCFG_SUSPSRC_TIMER0 | |
||||
DAVINCI_SYSCFG_SUSPSRC_UART2), &davinci_syscfg_regs->suspsrc); |
||||
|
||||
/* Power on required peripherals
|
||||
* ARM does not have acess by default to PSC0 and PSC1 |
||||
* assuming here that the DSP bootloader has set the IOPU |
||||
* such that PSC access is available to ARM |
||||
*/ |
||||
da8xx_configure_lpsc_items(lpsc, ARRAY_SIZE(lpsc)); |
||||
|
||||
/* configure pinmux settings */ |
||||
davinci_configure_pin_mux_items(pinmuxes, |
||||
ARRAY_SIZE(pinmuxes)); |
||||
|
||||
writel(readl(&davinci_uart2_ctrl_regs->pwremu_mgmt) | |
||||
(DAVINCI_UART_PWREMU_MGMT_FREE) | |
||||
(DAVINCI_UART_PWREMU_MGMT_URRST) | |
||||
(DAVINCI_UART_PWREMU_MGMT_UTRST), |
||||
&davinci_uart2_ctrl_regs->pwremu_mgmt); |
||||
|
||||
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++); |
||||
} |
||||
|
||||
void putc(char c) |
||||
{ |
||||
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); |
||||
} |
||||
|
||||
void hang(void) |
||||
{ |
||||
puts("### ERROR ### Please RESET the board ###\n"); |
||||
for (;;) |
||||
; |
||||
} |
||||
@ -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 |
||||
|
||||
#########################################################################
|
||||
Loading…
Reference in new issue