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

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 30, 2013, 12:13 p.m.
Message ID <1359548001-14278-6-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/216876/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Jan. 30, 2013, 12:13 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>
---
 arch/arm/include/asm/arch-mxs/iomux.h | 5 +++++
 1 file changed, 5 insertions(+)
Fabio Estevam - Jan. 30, 2013, 12:24 p.m.
On Wed, Jan 30, 2013 at 10:13 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This fixes the build failure when included in mx23_olinuxino.h board

Which build failure? Can you post the error?

I think you can drop this patch from the series now that you do not
pass the iomux definitions in patch 6/10.
Otavio Salvador - Jan. 30, 2013, 12:28 p.m.
On Wed, Jan 30, 2013 at 10:24 AM, Fabio Estevam <festevam@gmail.com> wrote:
> On Wed, Jan 30, 2013 at 10:13 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> This fixes the build failure when included in mx23_olinuxino.h board
>
> Which build failure? Can you post the error?
>
> I think you can drop this patch from the series now that you do not
> pass the iomux definitions in patch 6/10.

Yes; we do not use this anymore.

Without this patch it fails badly as it try to use the functions in
assembly. This fixes it anyway so I think it could go in anyway so if
someone needs it in mx23evk or mx23_olinuxino board files it won't
fail to build anymore.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

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__*/