diff options
| author | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
| commit | 495dbd72dd1172de866ba323263a5b62cf454972 (patch) | |
| tree | 3ecfb8ae44c871055115941890fd93f175f8761d /include/configs/seaboard.h | |
| parent | 50d924b45911b24eeb7623bed11b9297d99b840a (diff) | |
| parent | d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (diff) | |
| download | blackbird-obmc-uboot-495dbd72dd1172de866ba323263a5b62cf454972.tar.gz blackbird-obmc-uboot-495dbd72dd1172de866ba323263a5b62cf454972.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/seaboard.h')
| -rw-r--r-- | include/configs/seaboard.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 8dc6d4b907..de19e38deb 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -27,7 +27,7 @@ #include <asm/sizes.h> /* LP0 suspend / resume */ -#define CONFIG_TEGRA20_LP0 +#define CONFIG_TEGRA_LP0 #define CONFIG_AES #define CONFIG_TEGRA_PMU #define CONFIG_TPS6586X_POWER @@ -42,11 +42,11 @@ /* High-level configuration options */ #define V_PROMPT "Tegra20 (SeaBoard) # " -#define CONFIG_TEGRA20_BOARD_STRING "NVIDIA Seaboard" +#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard" /* Board-specific serial config */ #define CONFIG_SERIAL_MULTI -#define CONFIG_TEGRA20_ENABLE_UARTD +#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* On Seaboard: GPIO_PI3 = Port I = 8, bit = 3 */ @@ -96,14 +96,23 @@ #define CONFIG_CMD_DHCP /* Enable keyboard */ -#define CONFIG_TEGRA20_KEYBOARD +#define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD -#undef TEGRA20_DEVICE_SETTINGS -#define TEGRA20_DEVICE_SETTINGS "stdin=serial,tegra-kbc\0" \ - "stdout=serial\0" \ - "stderr=serial\0" +#undef TEGRA_DEVICE_SETTINGS +#define TEGRA_DEVICE_SETTINGS "stdin=serial,tegra-kbc\0" \ + "stdout=serial\0" \ + "stderr=serial\0" -#include "tegra20-common-post.h" +#include "tegra-common-post.h" +/* NAND support */ +#define CONFIG_CMD_NAND +#define CONFIG_TEGRA_NAND + +/* Max number of NAND devices */ +#define CONFIG_SYS_MAX_NAND_DEVICE 1 + +/* Somewhat oddly, the NAND base address must be a config option */ +#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE #endif /* __CONFIG_H */ |
