Patchwork [U-Boot,v2,05/10] mxs: Fix iomux.h to not break build during assembly stage

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 11, 2013, 1:35 p.m.
Message ID <1360589756-26355-6-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/219603/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Feb. 11, 2013, 1:35 p.m.
This fixes the build failure when included in mx23_olinuxino.h board
config; the addition of "asm/types.h" is due "u32" being otherwise
undefined.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2: None

 arch/arm/include/asm/arch-mxs/iomux.h | 5 +++++
 1 file changed, 5 insertions(+)
Marek Vasut - Feb. 13, 2013, 9:13 p.m.
Dear Otavio Salvador,

> This fixes the build failure when included in mx23_olinuxino.h board
> config; the addition of "asm/types.h" is due "u32" being otherwise
> undefined.

Regular <types.h> doesn't cut it?

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> Changes in v2: None
> 
>  arch/arm/include/asm/arch-mxs/iomux.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/include/asm/arch-mxs/iomux.h
> b/arch/arm/include/asm/arch-mxs/iomux.h index 7abdf58..4288715 100644
> --- a/arch/arm/include/asm/arch-mxs/iomux.h
> +++ b/arch/arm/include/asm/arch-mxs/iomux.h
> @@ -21,6 +21,10 @@
>  #ifndef __MACH_MXS_IOMUX_H__
>  #define __MACH_MXS_IOMUX_H__
> 
> +#ifndef __ASSEMBLY__
> +
> +#include <asm/types.h>
> +
>  /*
>   * IOMUX/PAD Bit field definitions
>   *
> @@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);
>   */
>  int mxs_iomux_setup_multiple_pads(const iomux_cfg_t *pad_list, unsigned
> count);
> 
> +#endif /* __ASSEMBLY__ */
>  #endif /* __MACH_MXS_IOMUX_H__*/

Best regards,
Marek Vasut
Otavio Salvador - Feb. 13, 2013, 9:22 p.m.
On Wed, Feb 13, 2013 at 7:13 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> This fixes the build failure when included in mx23_olinuxino.h board
>> config; the addition of "asm/types.h" is due "u32" being otherwise
>> undefined.
>
> Regular <types.h> doesn't cut it?

I did not test; this seemed as the right one to take. Stefano?

>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>> Changes in v2: None
>>
>>  arch/arm/include/asm/arch-mxs/iomux.h | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/arch/arm/include/asm/arch-mxs/iomux.h
>> b/arch/arm/include/asm/arch-mxs/iomux.h index 7abdf58..4288715 100644
>> --- a/arch/arm/include/asm/arch-mxs/iomux.h
>> +++ b/arch/arm/include/asm/arch-mxs/iomux.h
>> @@ -21,6 +21,10 @@
>>  #ifndef __MACH_MXS_IOMUX_H__
>>  #define __MACH_MXS_IOMUX_H__
>>
>> +#ifndef __ASSEMBLY__
>> +
>> +#include <asm/types.h>
>> +
>>  /*
>>   * IOMUX/PAD Bit field definitions
>>   *
>> @@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);
>>   */
>>  int mxs_iomux_setup_multiple_pads(const iomux_cfg_t *pad_list, unsigned
>> count);
>>
>> +#endif /* __ASSEMBLY__ */
>>  #endif /* __MACH_MXS_IOMUX_H__*/
>
> Best regards,
> Marek Vasut
Marek Vasut - Feb. 13, 2013, 9:34 p.m.
Dear Otavio Salvador,

> On Wed, Feb 13, 2013 at 7:13 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Otavio Salvador,
> > 
> >> This fixes the build failure when included in mx23_olinuxino.h board
> >> config; the addition of "asm/types.h" is due "u32" being otherwise
> >> undefined.
> > 
> > Regular <types.h> doesn't cut it?
> 
> I did not test; this seemed as the right one to take. Stefano?

ok, asm/types.h seems good

Best regards,
Marek Vasut

Patch

diff --git a/arch/arm/include/asm/arch-mxs/iomux.h b/arch/arm/include/asm/arch-mxs/iomux.h
index 7abdf58..4288715 100644
--- a/arch/arm/include/asm/arch-mxs/iomux.h
+++ b/arch/arm/include/asm/arch-mxs/iomux.h
@@ -21,6 +21,10 @@ 
 #ifndef __MACH_MXS_IOMUX_H__
 #define __MACH_MXS_IOMUX_H__
 
+#ifndef __ASSEMBLY__
+
+#include <asm/types.h>
+
 /*
  * IOMUX/PAD Bit field definitions
  *
@@ -165,4 +169,5 @@  int mxs_iomux_setup_pad(iomux_cfg_t pad);
  */
 int mxs_iomux_setup_multiple_pads(const iomux_cfg_t *pad_list, unsigned count);
 
+#endif /* __ASSEMBLY__ */
 #endif /* __MACH_MXS_IOMUX_H__*/