From ace54824f645a162d2785ec2ae093fb8f42e1e49 Mon Sep 17 00:00:00 2001 From: Justin Waters Date: Tue, 14 Jul 2009 15:24:56 -0400 Subject: Miscellaneous fixes for Sequoia board There are a number of issues when building the Sequoia U-Boot with Timesys toolchains. * GCC 4.3.3 builds an image that is too large * 64-bit cross-toolchains run into interesting linking errors * abort is not defined for the toolchain when using GCC 4.3.3 This patch addresses these issues in various ways, allowing builds using the newer toolchains. --- board/amcc/sequoia/sequoia.c | 2 ++ board/amcc/sequoia/u-boot.lds | 2 -- include/configs/sequoia.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index e824b8fa4a..eb351d8b65 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -567,3 +567,5 @@ void ft_board_setup(void *blob, bd_t *bd) } } #endif /* CONFIG_NAND_U_BOOT */ + +void abort () {} diff --git a/board/amcc/sequoia/u-boot.lds b/board/amcc/sequoia/u-boot.lds index 7798722eb9..5168f43d98 100644 --- a/board/amcc/sequoia/u-boot.lds +++ b/board/amcc/sequoia/u-boot.lds @@ -136,8 +136,6 @@ SECTIONS . = ALIGN(4); } - ppcenv_assert = ASSERT(. < 0xFFFF8000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified."); - _end = . ; PROVIDE (end = .); } diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index fa226b28cb..f1e3b95b9f 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -285,14 +285,14 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT +//#define CONFIG_CMD_DTT #define CONFIG_CMD_FAT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM #ifdef CONFIG_440EPX -#define CONFIG_CMD_USB +//#define CONFIG_CMD_USB #endif #ifndef CONFIG_RAINIER -- cgit v1.2.3