diff options
author | Sughosh Ganu <urwithsughosh@gmail.com> | 2012-02-02 00:44:41 +0000 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-02-12 10:11:33 +0100 |
commit | 6b873dcabd85ca4109a76c488c653609ea71c848 (patch) | |
tree | d1b5defe382eb04d716d527c8595dd3358a6238d /include/configs/hawkboard.h | |
parent | d735a99d3b15daa8edfc10e52fa8860c06fe803c (diff) | |
download | u-boot-imx-6b873dcabd85ca4109a76c488c653609ea71c848.zip u-boot-imx-6b873dcabd85ca4109a76c488c653609ea71c848.tar.gz u-boot-imx-6b873dcabd85ca4109a76c488c653609ea71c848.tar.bz2 |
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 <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>
Diffstat (limited to 'include/configs/hawkboard.h')
-rw-r--r-- | include/configs/hawkboard.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h index c310c73..50a1c17 100644 --- a/include/configs/hawkboard.h +++ b/include/configs/hawkboard.h @@ -44,12 +44,29 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F -#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_UART_U_BOOT) +#define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ + DAVINCI_SYSCFG_SUSPSRC_EMAC | \ + DAVINCI_SYSCFG_SUSPSRC_I2C | \ + DAVINCI_SYSCFG_SUSPSRC_SPI1 | \ + DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ + DAVINCI_SYSCFG_SUSPSRC_UART2) + +#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_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 */ @@ -85,9 +102,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 |