* [U-Boot] [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared
@ 2011-10-31 7:36 Ajay Bhargav
2011-10-31 8:11 ` Igor Grinberg
2011-10-31 8:20 ` Prafulla Wadaskar
0 siblings, 2 replies; 3+ messages in thread
From: Ajay Bhargav @ 2011-10-31 7:36 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared
2011-10-31 7:36 [U-Boot] [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared Ajay Bhargav
@ 2011-10-31 8:11 ` Igor Grinberg
2011-10-31 8:20 ` Prafulla Wadaskar
1 sibling, 0 replies; 3+ messages in thread
From: Igor Grinberg @ 2011-10-31 8:11 UTC (permalink / raw)
To: u-boot
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
--
Regards,
Igor.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared
2011-10-31 7:36 [U-Boot] [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared Ajay Bhargav
2011-10-31 8:11 ` Igor Grinberg
@ 2011-10-31 8:20 ` Prafulla Wadaskar
1 sibling, 0 replies; 3+ messages in thread
From: Prafulla Wadaskar @ 2011-10-31 8:20 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> Sent: Monday, October 31, 2011 1:07 PM
> To: Prafulla Wadaskar
> Cc: u-boot at lists.denx.de; albert.u.boot at aribaud.net;
> marek.vasut at 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 . . .
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-31 8:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-31 7:36 [U-Boot] [PATCH] gplugD: Fix for error:MACH_TYPE_SHEEVAD undeclared Ajay Bhargav
2011-10-31 8:11 ` Igor Grinberg
2011-10-31 8:20 ` Prafulla Wadaskar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox