| Message ID | 1523867708-11157-1-git-send-email-patrice.chotard@st.com |
|---|---|
| State | Accepted |
| Commit | e376040f29b2982159fe715eb821f7f1e8025dfe |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] serial: Remove duplicated line in Makefile | expand |
Hi, On 04/16/2018 01:35 AM, Patrice Chotard wrote: > The line "-obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o" > is found twice in Makefile. > > Fixes: ae74de0dfd45 ("serial: stm32: Rename serial_stm32x7.c to serial_stm32.c" > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Acked-by: Vikas Manocha <vikas.manocha@st.com> Cheers, Vikas > --- > > drivers/serial/Makefile | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile > index 6937ef962868..16609edf4b5a 100644 > --- a/drivers/serial/Makefile > +++ b/drivers/serial/Makefile > @@ -60,7 +60,6 @@ obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o > obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o > obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o > obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o > -obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o > obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o > obj-$(CONFIG_BCM283X_PL011_SERIAL) += serial_bcm283x_pl011.o > obj-$(CONFIG_MSM_SERIAL) += serial_msm.o >
On 16 April 2018 at 02:35, Patrice Chotard <patrice.chotard@st.com> wrote: > The line "-obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o" > is found twice in Makefile. > > Fixes: ae74de0dfd45 ("serial: stm32: Rename serial_stm32x7.c to serial_stm32.c" > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> > --- > > drivers/serial/Makefile | 1 - > 1 file changed, 1 deletion(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Apr 16, 2018 at 10:35:08AM +0200, Patrice Chotard wrote: > The line "-obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o" > is found twice in Makefile. > > Fixes: ae74de0dfd45 ("serial: stm32: Rename serial_stm32x7.c to serial_stm32.c" > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> > Acked-by: Vikas Manocha <vikas.manocha@st.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 6937ef962868..16609edf4b5a 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -60,7 +60,6 @@ obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o -obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o obj-$(CONFIG_BCM283X_PL011_SERIAL) += serial_bcm283x_pl011.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o
The line "-obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o" is found twice in Makefile. Fixes: ae74de0dfd45 ("serial: stm32: Rename serial_stm32x7.c to serial_stm32.c" Signed-off-by: Patrice Chotard <patrice.chotard@st.com> --- drivers/serial/Makefile | 1 - 1 file changed, 1 deletion(-)