diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
| commit | 692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (patch) | |
| tree | e47f18f7dd1507e91a46fcd6f550914ad3774f5a /include/configs/seaboard.h | |
| parent | 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff) | |
| parent | 76a30fedd44428c7108084266389c9b4ba5678c8 (diff) | |
| download | talos-obmc-uboot-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.gz talos-obmc-uboot-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
board/armltd/vexpress64/vexpress64.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/seaboard.h')
| -rw-r--r-- | include/configs/seaboard.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 4442064db9..78ff651d06 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -27,9 +27,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* On Seaboard: GPIO_PI3 = Port I = 8, bit = 3 */ -#define CONFIG_UART_DISABLE_GPIO GPIO_PI3 - #define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD /* I2C */ |
