Patchwork [U-Boot] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared

login
register
mail settings
Submitter Ajay Bhargav
Date Oct. 31, 2011, 7:36 a.m.
Message ID <1320046607-14445-1-git-send-email-ajay.bhargav@einfochips.com>
Download mbox | patch
Permalink /patch/122755/
State Accepted
Commit e0c8fa8f1f234e82b34bf279c86b93e115be8c6d
Headers show

Comments

Ajay Bhargav - Oct. 31, 2011, 7:36 a.m.
This patch fix the build failure (error: 'MACH_TYPE_SHEEVAD' undeclared
(first use in this function)) for gplugD due to recent sync of
mach-types.h with its linux original.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
---
 include/configs/gplugd.h |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
Igor Grinberg - Oct. 31, 2011, 8:11 a.m.
On 10/31/11 09:36, Ajay Bhargav wrote:
> This patch fix the build failure (error: 'MACH_TYPE_SHEEVAD' undeclared
> (first use in this function)) for gplugD due to recent sync of
> mach-types.h with its linux original.
> 
> Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  include/configs/gplugd.h |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
> index 24bf767..9813309 100644
> --- a/include/configs/gplugd.h
> +++ b/include/configs/gplugd.h
> @@ -32,6 +32,16 @@
>  #define __CONFIG_GPLUGD_H
>  
>  /*
> + * FIXME: fix for error caused due to recent update to mach-types.h
> + */
> +#include <asm/mach-types.h>
> +#ifdef MACH_TYPE_SHEEVAD
> +#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
> +#else
> +#define MACH_TYPE_SHEEVAD	2625
> +#endif
> +
> +/*
>   * Version number information
>   */
>  #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"
> @@ -42,7 +52,7 @@
>  #define CONFIG_SHEEVA_88SV331xV5	1	/* CPU Core subversion */
>  #define CONFIG_ARMADA100		1	/* SOC Family Name */
>  #define CONFIG_ARMADA168		1	/* SOC Used on this Board */
> -#define CONFIG_MACH_SHEEVAD			/* Machine type */
> +#define CONFIG_MACH_TYPE		MACH_TYPE_SHEEVAD /* Machine type */
>  #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
>  
>  #define	CONFIG_SYS_TEXT_BASE	0x00f00000
Prafulla Wadaskar - Oct. 31, 2011, 8:20 a.m.
> -----Original Message-----
> From: Ajay Bhargav [mailto:ajay.bhargav@einfochips.com]
> Sent: Monday, October 31, 2011 1:07 PM
> To: Prafulla Wadaskar
> Cc: u-boot@lists.denx.de; albert.u.boot@aribaud.net;
> marek.vasut@gmail.com; Ajay Bhargav
> Subject: [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD
> undeclared
> 
> This patch fix the build failure (error: 'MACH_TYPE_SHEEVAD'
> undeclared
> (first use in this function)) for gplugD due to recent sync of
> mach-types.h with its linux original.
> 
> Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> ---
>  include/configs/gplugd.h |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/include/configs/gplugd.h
> b/include/configs/gplugd.h
> index 24bf767..9813309 100644
> --- a/include/configs/gplugd.h
> +++ b/include/configs/gplugd.h
> @@ -32,6 +32,16 @@
>  #define __CONFIG_GPLUGD_H
> 
>  /*
> + * FIXME: fix for error caused due to recent update to mach-
> types.h
> + */
> +#include <asm/mach-types.h>
> +#ifdef MACH_TYPE_SHEEVAD
> +#error "MACH_TYPE_SHEEVAD has been defined properly, please
> remove this."
> +#else
> +#define MACH_TYPE_SHEEVAD	2625
> +#endif
> +
> +/*
>   * Version number information
>   */
>  #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"
> @@ -42,7 +52,7 @@
>  #define CONFIG_SHEEVA_88SV331xV5	1	/* CPU Core subversion */
>  #define CONFIG_ARMADA100		1	/* SOC Family Name */
>  #define CONFIG_ARMADA168		1	/* SOC Used on this Board */
> -#define CONFIG_MACH_SHEEVAD			/* Machine type */
> +#define CONFIG_MACH_TYPE		MACH_TYPE_SHEEVAD /* Machine type
> */
>  #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board
> lowlevel_init */
> 
>  #define	CONFIG_SYS_TEXT_BASE	0x00f00000
> --
> 1.7.0.4

Applied to u-boot-marvell.git master branch

Regards..
Prafulla . . .

Patch

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 24bf767..9813309 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -32,6 +32,16 @@ 
 #define __CONFIG_GPLUGD_H
 
 /*
+ * FIXME: fix for error caused due to recent update to mach-types.h
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_SHEEVAD
+#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
+#else
+#define MACH_TYPE_SHEEVAD	2625
+#endif
+
+/*
  * Version number information
  */
 #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"
@@ -42,7 +52,7 @@ 
 #define CONFIG_SHEEVA_88SV331xV5	1	/* CPU Core subversion */
 #define CONFIG_ARMADA100		1	/* SOC Family Name */
 #define CONFIG_ARMADA168		1	/* SOC Used on this Board */
-#define CONFIG_MACH_SHEEVAD			/* Machine type */
+#define CONFIG_MACH_TYPE		MACH_TYPE_SHEEVAD /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
 #define	CONFIG_SYS_TEXT_BASE	0x00f00000