[U-Boot] [PATCH 6/9] tegra: enable SPL build for seaboard

Allen Martin
2012-05-10T07:02:24Z

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
boards.cfg | 2 +-
include/configs/seaboard.h | 9 +++++++++
include/configs/tegra2-common.h | 19 +++++++++++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/boards.cfg b/boards.cfg
index 4436053..30ceddc 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -230,7 +230,7 @@ smdk5250 arm armv7 smdk5250 samsung exynos
smdkv310 arm armv7 smdkv310 samsung exynos
trats arm armv7 trats samsung exynos
harmony arm armv7 harmony nvidia tegra2
-seaboard arm armv7 seaboard nvidia tegra2
+seaboard arm armv7:arm720t seaboard nvidia tegra2
ventana arm armv7 ventana nvidia tegra2
u8500_href arm armv7 u8500 st-ericsson u8500
actux1_4_16 arm ixp actux1 - - actux1:FLASH2X2
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index ae075e7..8e3eee8 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -27,10 +27,12 @@
#include <asm/sizes.h>
#include "tegra2-common.h"

+#ifndef CONFIG_SPL_BUILD
/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra2-seaboard
#define CONFIG_OF_CONTROL
#define CONFIG_OF_SEPARATE
+#endif

/* High-level configuration options */
#define TEGRA2_SYSMEM "mem=384M at 0M nvmem=128M at 384M mem=512M at 512M"
@@ -38,7 +40,9 @@
#define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Seaboard"

/* Board-specific serial config */
+#ifndef CONFIG_SPL_BUILD
#define CONFIG_SERIAL_MULTI
+#endif
#define CONFIG_TEGRA2_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE

@@ -59,6 +63,7 @@
#define CONFIG_CMD_SF
#define CONFIG_SPI_FLASH_SIZE (4 << 20)

+#ifndef CONFIG_SPL_BUILD
/* I2C */
#define CONFIG_TEGRA_I2C
#define CONFIG_SYS_I2C_INIT_BOARD
@@ -78,6 +83,8 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT

+#endif
+
/* Environment in SPI */
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_MAX_HZ 48000000
@@ -86,10 +93,12 @@
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (CONFIG_SPI_FLASH_SIZE - CONFIG_ENV_SECT_SIZE)

+#ifndef CONFIG_SPL_BUILD
/* USB Host support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_STORAGE
#define CONFIG_CMD_USB
+#endif

#endif /* __CONFIG_H */
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index 837f859..997887a 100644
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -90,9 +90,11 @@
* parameter, the default (2) causes occasional Data Buffer Errors in OUT
* packets depending on the buffer address and size.
*/
+#ifndef CONFIG_SPL_BUILD
#define CONFIG_USB_EHCI_TXFIFO_THRESH 10
#define CONFIG_EHCI_IS_TDI
#define CONFIG_EHCI_DCACHE
+#endif

/* Total I2C ports on Tegra2 */
#define TEGRA_I2C_NUM_CONTROLLERS 4
@@ -175,4 +177,21 @@

#define CONFIG_TEGRA2_GPIO
#define CONFIG_CMD_GPIO
+
+/* Defines for SPL */
+#define CONFIG_SPL
+#define CONFIG_SPL_NAND_SIMPLE
+#define CONFIG_SPL_TEXT_BASE 0x00008000
+#define CONFIG_SPL_MAX_SIZE 0x00078000
+#define CONFIG_SYS_SPL_MALLOC_START 0x00080000
+#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000
+#define CONFIG_SPL_STACK 0x0009fffc
+
+#define CONFIG_SPL_LIBCOMMON_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_POWER_SUPPORT
+#define CONFIG_SPL_GPIO_SUPPORT
+#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/tegra2/u-boot-spl.lds"
+
#endif /* __TEGRA2_COMMON_H */
--
1.7.9.5