summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVikas Manocha <vikas.manocha@st.com>2015-05-03 14:10:35 -0700
committerTom Rini <trini@konsulko.com>2015-05-10 09:59:37 -0400
commite0320b746a784cb31dc0faa882e4b4bf16d0be4f (patch)
tree09ad9dd2d16a0b3a39f713e175e60b0f526ffea0
parent0a836ceb01aee3113fa93895b44cb07bf1cd1cb4 (diff)
downloadu-boot-imx-e0320b746a784cb31dc0faa882e4b4bf16d0be4f.zip
u-boot-imx-e0320b746a784cb31dc0faa882e4b4bf16d0be4f.tar.gz
u-boot-imx-e0320b746a784cb31dc0faa882e4b4bf16d0be4f.tar.bz2
stv0991: use fdt for serial port platform data
This patch ignores the serial port static platform data at compilation time in case of device tree control. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/st/stv0991/stv0991.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 38f6e1d..09f973f 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -21,6 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
struct gpio_regs *const gpioa_regs =
(struct gpio_regs *) GPIOA_BASE_ADDR;
+#ifndef CONFIG_OF_CONTROL
static const struct pl01x_serial_platdata serial_platdata = {
.base = 0x80406000,
.type = TYPE_PL011,
@@ -31,6 +32,7 @@ U_BOOT_DEVICE(stv09911_serials) = {
.name = "serial_pl01x",
.platdata = &serial_platdata,
};
+#endif
#ifdef CONFIG_SHOW_BOOT_PROGRESS
void show_boot_progress(int progress)