diff mbox series

[U-Boot] board: imx6: marsboard: Remove doubled #include <asm/arch/sys_proto.h>

Message ID 20171107101029.27300-1-lukma@denx.de
State Accepted
Commit 8ea754da602b49a5200e6c3e874b1f7166516df6
Delegated to: Stefano Babic
Headers show
Series [U-Boot] board: imx6: marsboard: Remove doubled #include <asm/arch/sys_proto.h> | expand

Commit Message

Lukasz Majewski Nov. 7, 2017, 10:10 a.m. UTC
The sys_proto.h file has been included earlier in this file.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

---

 board/embest/mx6boards/mx6boards.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefano Babic Nov. 9, 2017, 9:19 a.m. UTC | #1
Hi Lukasz,

On 07/11/2017 11:10, Lukasz Majewski wrote:
> The sys_proto.h file has been included earlier in this file.
> 
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
> 
> ---
> 
>  board/embest/mx6boards/mx6boards.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
> index ae04f68445..965e4f1ec8 100644
> --- a/board/embest/mx6boards/mx6boards.c
> +++ b/board/embest/mx6boards/mx6boards.c
> @@ -36,7 +36,7 @@
>  #include <linux/fb.h>
>  #include <ipu_pixfmt.h>
>  #include <asm/io.h>
> -#include <asm/arch/sys_proto.h>
> +
>  DECLARE_GLOBAL_DATA_PTR;
>  
>  #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
> 

Thanks for fix - applied to u-boot-imx, -master !

I have reapplied support for display5, and I am testing the build again.
If it is ok, I'll send as my last PR to Tom for 2017.11.

Best regards,
Stefano
Lukasz Majewski Nov. 9, 2017, 9:49 a.m. UTC | #2
Hi Stefano,

> Hi Lukasz,
> 
> On 07/11/2017 11:10, Lukasz Majewski wrote:
> > The sys_proto.h file has been included earlier in this file.
> > 
> > Signed-off-by: Lukasz Majewski <lukma@denx.de>
> > 
> > ---
> > 
> >  board/embest/mx6boards/mx6boards.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/board/embest/mx6boards/mx6boards.c
> > b/board/embest/mx6boards/mx6boards.c index ae04f68445..965e4f1ec8
> > 100644 --- a/board/embest/mx6boards/mx6boards.c
> > +++ b/board/embest/mx6boards/mx6boards.c
> > @@ -36,7 +36,7 @@
> >  #include <linux/fb.h>
> >  #include <ipu_pixfmt.h>
> >  #include <asm/io.h>
> > -#include <asm/arch/sys_proto.h>
> > +
> >  DECLARE_GLOBAL_DATA_PTR;
> >  
> >  #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP
> > |			\ 
> 
> Thanks for fix - applied to u-boot-imx, -master !

You are welcome :-)

I've also sent a commit, which adds #ifdef guards to sys_proto.h.

> 
> I have reapplied support for display5, and I am testing the build
> again. If it is ok, I'll send as my last PR to Tom for 2017.11.

Great, thanks :)

> 
> Best regards,
> Stefano
> 



Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
Stefano Babic Nov. 9, 2017, 10:07 a.m. UTC | #3
On 09/11/2017 10:49, Lukasz Majewski wrote:
> Hi Stefano,
> 
>> Hi Lukasz,
>>
>> On 07/11/2017 11:10, Lukasz Majewski wrote:
>>> The sys_proto.h file has been included earlier in this file.
>>>
>>> Signed-off-by: Lukasz Majewski <lukma@denx.de>
>>>
>>> ---
>>>
>>>  board/embest/mx6boards/mx6boards.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/board/embest/mx6boards/mx6boards.c
>>> b/board/embest/mx6boards/mx6boards.c index ae04f68445..965e4f1ec8
>>> 100644 --- a/board/embest/mx6boards/mx6boards.c
>>> +++ b/board/embest/mx6boards/mx6boards.c
>>> @@ -36,7 +36,7 @@
>>>  #include <linux/fb.h>
>>>  #include <ipu_pixfmt.h>
>>>  #include <asm/io.h>
>>> -#include <asm/arch/sys_proto.h>
>>> +
>>>  DECLARE_GLOBAL_DATA_PTR;
>>>  
>>>  #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP
>>> |			\ 
>>
>> Thanks for fix - applied to u-boot-imx, -master !
> 
> You are welcome :-)
> 
> I've also sent a commit, which adds #ifdef guards to sys_proto.h.
> 

They are applied, too

Regards,
Stefano

>>
>> I have reapplied support for display5, and I am testing the build
>> again. If it is ok, I'll send as my last PR to Tom for 2017.11.
> 
> Great, thanks :)
> 
>>
>> Best regards,
>> Stefano
>>
> 
> 
> 
> Best regards,
> 
> Lukasz Majewski
> 
> --
> 
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
>
diff mbox series

Patch

diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index ae04f68445..965e4f1ec8 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -36,7 +36,7 @@ 
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
 #include <asm/io.h>
-#include <asm/arch/sys_proto.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\