diff options
| author | Allen Martin <amartin@nvidia.com> | 2012-10-24 08:32:05 +0000 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2012-11-20 00:16:05 +0100 |
| commit | 7992bfbf8dcc5162a096b1da0be8807d0f892257 (patch) | |
| tree | 54db75b78e3f620915e03679ada8351196104fd9 /include | |
| parent | d7475386bb75ec4e49be66d83775edb043dbfb43 (diff) | |
tegra: move TEGRA_DEVICE_SETTINGS to tegra-common-post.h
Move environment settings for stdin/stdout/stderr to
tegra-common-post.h and generate them automaticaly based on input
device selection.
Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/seaboard.h | 5 | ||||
| -rw-r--r-- | include/configs/tegra-common-post.h | 19 | ||||
| -rw-r--r-- | include/configs/tegra20-common.h | 4 |
3 files changed, 19 insertions, 9 deletions
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 74d3b94887..60ddeac666 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -99,11 +99,6 @@ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD -#undef TEGRA_DEVICE_SETTINGS -#define TEGRA_DEVICE_SETTINGS "stdin=serial,tegra-kbc\0" \ - "stdout=serial\0" \ - "stderr=serial\0" - #include "tegra-common-post.h" /* NAND support */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 6835155d11..6f310bee60 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -165,6 +165,25 @@ "fdt_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ +#ifdef CONFIG_TEGRA_KEYBOARD +#define STDIN_KBD_KBC ",tegra-kbc" +#else +#define STDIN_KBD_KBC "" +#endif + +#ifdef CONFIG_USB_KEYBOARD +#define STDIN_KBD_USB ",usbkbd" +#define CONFIG_SYS_USB_EVENT_POLL +#define CONFIG_PREBOOT "usb start" +#else +#define STDIN_KBD_USB "" +#endif + +#define TEGRA_DEVICE_SETTINGS \ + "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB "\0" \ + "stdout=serial\0" \ + "stderr=serial\0" \ + #define CONFIG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 2a14caaf60..31b68be4db 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -124,12 +124,8 @@ #define CONFIG_SYS_NO_FLASH -/* Environment information, boards can override if required */ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define TEGRA_DEVICE_SETTINGS "stdin=serial\0" \ - "stdout=serial\0" \ - "stderr=serial\0" #define CONFIG_LOADADDR 0x408000 /* def. location for kernel */ #define CONFIG_BOOTDELAY 2 /* -1 to disable auto boot */ |