From: Vikas Manocha Date: Sun, 3 May 2015 14:10:35 -0700 Subject: [U-Boot] [PATCH v3 2/2] stv0991: use fdt for serial port platform data In-Reply-To: <1430687435-22818-1-git-send-email-vikas.manocha@st.com> References: <1430687435-22818-1-git-send-email-vikas.manocha@st.com> Message-ID: <1430687435-22818-3-git-send-email-vikas.manocha@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This patch ignores the serial port static platform data at compilation time in case of device tree control. Signed-off-by: Vikas Manocha Reviewed-by: Simon Glass --- Changes in v3: None Changes in v2: - added commit message. board/st/stv0991/stv0991.c | 2 ++ 1 file changed, 2 insertions(+) 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) -- 1.7.9.5