Patchwork [U-Boot,v2,1/4] lacie_kw: sort #ifdef lists by CONFIG_ identifiers

login
register
mail settings
Submitter Frederic Leroy
Date June 30, 2013, 10:12 a.m.
Message ID <1372587149-8220-2-git-send-email-fredo@starox.org>
Download mbox | patch
Permalink /patch/255874/
State Superseded
Headers show

Comments

Frederic Leroy - June 30, 2013, 10:12 a.m.
Signed-off-by: Frédéric Leroy <fredo@starox.org>
---
 include/configs/lacie_kw.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
Simon Guinot - June 30, 2013, 10:15 p.m.
On Sun, Jun 30, 2013 at 12:12:26PM +0200, Frédéric Leroy wrote:
> Signed-off-by: Frédéric Leroy <fredo@starox.org>
> ---
>  include/configs/lacie_kw.h | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)

Acked-by: Simon Guinot <simon.guinot@sequanux.org>

> 
> diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
> index e2b3b21..cac616a 100644
> --- a/include/configs/lacie_kw.h
> +++ b/include/configs/lacie_kw.h
> @@ -21,29 +21,29 @@
>  /*
>   * Machine number definition
>   */
> -#if defined(CONFIG_INETSPACE_V2)
> +#if defined(CONFIG_D2NET_V2)
> +#define CONFIG_MACH_TYPE		MACH_TYPE_D2NET_V2
> +#define CONFIG_IDENT_STRING		" D2 v2"
> +#elif defined(CONFIG_INETSPACE_V2)
>  #define CONFIG_MACH_TYPE		MACH_TYPE_INETSPACE_V2
>  #define CONFIG_IDENT_STRING		" IS v2"
> -#elif defined(CONFIG_NETSPACE_V2)
> -#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_V2
> -#define CONFIG_IDENT_STRING		" NS v2"
> +#elif defined(CONFIG_NET2BIG_V2)
> +#define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
> +#define CONFIG_IDENT_STRING		" 2Big v2"
>  #elif defined(CONFIG_NETSPACE_LITE_V2)
>  #define MACH_TYPE_NETSPACE_LITE_V2	2983 /* missing in mach-types.h */
>  #define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_LITE_V2
>  #define CONFIG_IDENT_STRING		" NS v2 Lite"
> +#elif defined(CONFIG_NETSPACE_MAX_V2)
> +#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MAX_V2
> +#define CONFIG_IDENT_STRING		" NS Max v2"
>  #elif defined(CONFIG_NETSPACE_MINI_V2)
>  #define MACH_TYPE_NETSPACE_MINI_V2	2831 /* missing in mach-types.h */
>  #define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MINI_V2
>  #define CONFIG_IDENT_STRING		" NS v2 Mini"
> -#elif defined(CONFIG_NETSPACE_MAX_V2)
> -#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MAX_V2
> -#define CONFIG_IDENT_STRING		" NS Max v2"
> -#elif defined(CONFIG_D2NET_V2)
> -#define CONFIG_MACH_TYPE		MACH_TYPE_D2NET_V2
> -#define CONFIG_IDENT_STRING		" D2 v2"
> -#elif defined(CONFIG_NET2BIG_V2)
> -#define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
> -#define CONFIG_IDENT_STRING		" 2Big v2"
> +#elif defined(CONFIG_NETSPACE_V2)
> +#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_V2
> +#define CONFIG_IDENT_STRING		" NS v2"
>  #else
>  #error "Unknown board"
>  #endif
> -- 
> 1.8.1.2

Patch

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index e2b3b21..cac616a 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -21,29 +21,29 @@ 
 /*
  * Machine number definition
  */
-#if defined(CONFIG_INETSPACE_V2)
+#if defined(CONFIG_D2NET_V2)
+#define CONFIG_MACH_TYPE		MACH_TYPE_D2NET_V2
+#define CONFIG_IDENT_STRING		" D2 v2"
+#elif defined(CONFIG_INETSPACE_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_INETSPACE_V2
 #define CONFIG_IDENT_STRING		" IS v2"
-#elif defined(CONFIG_NETSPACE_V2)
-#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_V2
-#define CONFIG_IDENT_STRING		" NS v2"
+#elif defined(CONFIG_NET2BIG_V2)
+#define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
+#define CONFIG_IDENT_STRING		" 2Big v2"
 #elif defined(CONFIG_NETSPACE_LITE_V2)
 #define MACH_TYPE_NETSPACE_LITE_V2	2983 /* missing in mach-types.h */
 #define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_LITE_V2
 #define CONFIG_IDENT_STRING		" NS v2 Lite"
+#elif defined(CONFIG_NETSPACE_MAX_V2)
+#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MAX_V2
+#define CONFIG_IDENT_STRING		" NS Max v2"
 #elif defined(CONFIG_NETSPACE_MINI_V2)
 #define MACH_TYPE_NETSPACE_MINI_V2	2831 /* missing in mach-types.h */
 #define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MINI_V2
 #define CONFIG_IDENT_STRING		" NS v2 Mini"
-#elif defined(CONFIG_NETSPACE_MAX_V2)
-#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MAX_V2
-#define CONFIG_IDENT_STRING		" NS Max v2"
-#elif defined(CONFIG_D2NET_V2)
-#define CONFIG_MACH_TYPE		MACH_TYPE_D2NET_V2
-#define CONFIG_IDENT_STRING		" D2 v2"
-#elif defined(CONFIG_NET2BIG_V2)
-#define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
-#define CONFIG_IDENT_STRING		" 2Big v2"
+#elif defined(CONFIG_NETSPACE_V2)
+#define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_V2
+#define CONFIG_IDENT_STRING		" NS v2"
 #else
 #error "Unknown board"
 #endif