Patchwork [U-Boot,3/3] ARM: Update mach-types

login
register
mail settings
Submitter Troy Kisky
Date March 1, 2012, 9:13 p.m.
Message ID <1330636394-25173-3-git-send-email-troy.kisky@boundarydevices.com>
Download mbox | patch
Permalink /patch/144133/
State Changes Requested
Headers show

Comments

Troy Kisky - March 1, 2012, 9:13 p.m.
This updates u-boot to the same as the Dec 6, 2011
mach-types upate to Linux.

Note:
1. MACH_TYPE_SMDK5250 changed value from 3774 to 3825
2. MACH_TYPE_SHEEVAD has become MACH_TYPE_GPLUGD
3. MACH_TYPE_TIAM335EVM has become MACH_TYPE_AM335XEVM

Before this patch MAKEALL -a arm gives
Boards compiled: 226
Boards with warnings or errors: 80

After this patch MAKEALL -a arm gives
Boards compiled: 226
Boards with warnings or errors: 80

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 arch/arm/include/asm/mach-types.h | 6490 +++++++++++++++++++++----------------
 include/configs/am335x_evm.h      |    3 +-
 include/configs/calimain.h        |    1 -
 include/configs/dns325.h          |    1 -
 include/configs/dreamplug.h       |   13 -
 include/configs/ea20.h            |   12 +
 include/configs/enbw_cmc.h        |    1 -
 include/configs/flea3.h           |    5 -
 include/configs/gplugd.h          |   12 +-
 include/configs/m28evk.h          |    5 -
 include/configs/mcx.h             |    1 -
 include/configs/mt_ventoux.h      |    1 -
 include/configs/omap3_mvblx.h     |   11 +
 include/configs/seaboard.h        |    7 +
 include/configs/smdk5250.h        |    2 -
 include/configs/top9000.h         |   11 +
 include/configs/tricorder.h       |   11 +
 include/configs/tx25.h            |    4 -
 include/configs/ventana.h         |   15 +
 include/configs/zmx25.h           |   11 +
 20 files changed, 3689 insertions(+), 2928 deletions(-)
Stephen Warren - March 1, 2012, 9:32 p.m.
On 03/01/2012 02:13 PM, Troy Kisky wrote:
> This updates u-boot to the same as the Dec 6, 2011
> mach-types upate to Linux.

> diff --git a/include/configs/ventana.h b/include/configs/ventana.h

>  #define CONFIG_MACH_VENTANA
> +/*
> + * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
> + * from Linus' kernel.org tree.
> + */
> +#include <asm/mach-types.h>
> +#ifdef MACH_TYPE_VENTANA
> +#error "MACH_TYPE_VENTANA has been defined properly, please remove this."
> +#else
> +#define MACH_TYPE_VENTANA              2927
> +#ifdef CONFIG_MACH_VENTANA
> +# define machine_is_ventana()  (MACH_TYPE_VENTANA == MACH_TYPE_VENTANA)
> +#else
> +# define machine_is_ventana()  (0)
> +#endif
> +#endif

I'm curious how Seaboard still builds after this change; presumably
ventana.h isn't included in the Seaboard build because the build isn't
for Ventana, yet without ventana.h included, machine_is_ventana()
doesn't exist.
Albert ARIBAUD - March 1, 2012, 9:54 p.m.
Hi Troy,

Le 01/03/2012 22:13, Troy Kisky a écrit :

> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
> index b4610d9..da49ae8 100644
> --- a/include/configs/ea20.h
> +++ b/include/configs/ea20.h
> @@ -24,6 +24,18 @@
>   #define __CONFIG_H
>
>   /*
> + * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
> + * from Linus' kernel.org tree.
> + */
> +#include<asm/mach-types.h>
> +#ifdef MACH_TYPE_EA20
> +#error "MACH_TYPE_EA20 has been defined properly, please remove this."
> +#else
> +#define MACH_TYPE_EA20		3002
> +#endif
> +
> +
> +/*

Sorry if I am being pedantic here, but the "FIXME" comment actually 
belongs *below* the #include line, not above. Ditto for others.

> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
> index 261f952..8589b1d 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -45,6 +45,13 @@
>
>   #define CONFIG_BOARD_EARLY_INIT_F
>
> +/*
> + * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
> + * from Linus' kernel.org tree.
> + */
> +#define machine_is_ventana()	(0)

Not sure I understand why we have a "machine_ix_xxx()" here. Could you 
explain?

Amicalement,
Troy Kisky - March 1, 2012, 10:50 p.m.
On 3/1/2012 2:54 PM, Albert ARIBAUD wrote:
> Hi Troy,
>
> Le 01/03/2012 22:13, Troy Kisky a écrit :
>
>> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
>> index b4610d9..da49ae8 100644
>> --- a/include/configs/ea20.h
>> +++ b/include/configs/ea20.h
>> @@ -24,6 +24,18 @@
>>   #define __CONFIG_H
>>
>>   /*
>> + * FIXME: This belongs in mach-types.h.  However, we only pull 
>> mach-types
>> + * from Linus' kernel.org tree.
>> + */
>> +#include<asm/mach-types.h>
>> +#ifdef MACH_TYPE_EA20
>> +#error "MACH_TYPE_EA20 has been defined properly, please remove this."
>> +#else
>> +#define MACH_TYPE_EA20        3002
>> +#endif
>> +
>> +
>> +/*
>
> Sorry if I am being pedantic here, but the "FIXME" comment actually 
> belongs *below* the #include line, not above. Ditto for others.

I put it above because when it is moved to mach-types.h, the include 
should be deleted as well. That is part of the "FIXME."


>
>> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
>> index 261f952..8589b1d 100644
>> --- a/include/configs/seaboard.h
>> +++ b/include/configs/seaboard.h
>> @@ -45,6 +45,13 @@
>>
>>   #define CONFIG_BOARD_EARLY_INIT_F
>>
>> +/*
>> + * FIXME: This belongs in mach-types.h.  However, we only pull 
>> mach-types
>> + * from Linus' kernel.org tree.
>> + */
>> +#define machine_is_ventana()    (0)
>
> Not sure I understand why we have a "machine_ix_xxx()" here. Could you 
> explain?
>
> Amicalement,

Because board/nvidia/seaboard/seaboard.c uses machine_is_ventana but 
that machine is no longer
in mach-types.

Thanks
Troy
Wolfgang Denk - March 2, 2012, 7 a.m.
Dear Troy Kisky,

In message <4F4FFD1F.4080406@boundarydevices.com> you wrote:
>
> > Not sure I understand why we have a "machine_ix_xxx()" here. Could you >
> > explain?
> >
> > Amicalement,
>
> Because board/nvidia/seaboard/seaboard.c uses machine_is_ventana but >
> that machine is no longer
> in mach-types.

Then fix the seaboard.c code, please, instead of adding dead code.

Best regards,

Wolfgang Denk
Stephen Warren - March 2, 2012, 5:45 p.m.
On 03/02/2012 12:00 AM, Wolfgang Denk wrote:
> Dear Troy Kisky,
> 
> In message <4F4FFD1F.4080406@boundarydevices.com> you wrote:
>>
>>> Not sure I understand why we have a "machine_ix_xxx()" here. Could you >
>>> explain?
>>>
>>> Amicalement,
>>
>> Because board/nvidia/seaboard/seaboard.c uses machine_is_ventana but >
>> that machine is no longer
>> in mach-types.
> 
> Then fix the seaboard.c code, please, instead of adding dead code.

I think that should actually be very easy. Can't the following:

if (machine_is_foo()) {
    ...
}

be converted to:

#if CONFIG_MACH_TYPE == MACH_TYPE_FOO
    ...
#endif

As a related note, I expect you'll see more and more boards that don't
exist in the kernel's mach-type.h since people won't register machine
IDs for boards that only support device tree.
Troy Kisky - March 2, 2012, 7:37 p.m.
On 3/2/2012 10:45 AM, Stephen Warren wrote:
> On 03/02/2012 12:00 AM, Wolfgang Denk wrote:
>> Dear Troy Kisky,
>>
>> In message<4F4FFD1F.4080406@boundarydevices.com>  you wrote:
>>>> Not sure I understand why we have a "machine_ix_xxx()" here. Could you>
>>>> explain?
>>>>
>>>> Amicalement,
>>> Because board/nvidia/seaboard/seaboard.c uses machine_is_ventana but>
>>> that machine is no longer
>>> in mach-types.
>> Then fix the seaboard.c code, please, instead of adding dead code.
> I think that should actually be very easy. Can't the following:
>
> if (machine_is_foo()) {
>      ...
> }
>
> be converted to:
>
> #if CONFIG_MACH_TYPE == MACH_TYPE_FOO
>      ...
> #endif
>
> As a related note, I expect you'll see more and more boards that don't
> exist in the kernel's mach-type.h since people won't register machine
> IDs for boards that only support device tree.
>
How about reversing the test


#if CONFIG_MACH_TYPE == MACH_TYPE_SEABORD

instead of

#if CONFIG_MACH_TYPE == MACH_TYPE_VENTANA

so that I don't care that ventana is no longer defined?


Thanks
Troy
Stephen Warren - March 2, 2012, 8:08 p.m.
On 03/02/2012 12:37 PM, Troy Kisky wrote:
> On 3/2/2012 10:45 AM, Stephen Warren wrote:
>> On 03/02/2012 12:00 AM, Wolfgang Denk wrote:
>>> Dear Troy Kisky,
>>>
>>> In message<4F4FFD1F.4080406@boundarydevices.com>  you wrote:
>>>>> Not sure I understand why we have a "machine_ix_xxx()" here. Could you>
>>>>> explain?
>>>>>
>>>>> Amicalement,
>>>> Because board/nvidia/seaboard/seaboard.c uses machine_is_ventana but>
>>>> that machine is no longer
>>>> in mach-types.
>>> Then fix the seaboard.c code, please, instead of adding dead code.
>> I think that should actually be very easy. Can't the following:
>>
>> if (machine_is_foo()) {
>>      ...
>> }
>>
>> be converted to:
>>
>> #if CONFIG_MACH_TYPE == MACH_TYPE_FOO
>>      ...
>> #endif
>>
>> As a related note, I expect you'll see more and more boards that don't
>> exist in the kernel's mach-type.h since people won't register machine
>> IDs for boards that only support device tree.
>>
> How about reversing the test
> 
> 
> #if CONFIG_MACH_TYPE == MACH_TYPE_SEABORD
> 
> instead of
> 
> #if CONFIG_MACH_TYPE == MACH_TYPE_VENTANA
> 
> so that I don't care that ventana is no longer defined?

That's probably fine.

A comment right above that states that Ventana is the other possibility
would be useful.

Of course, this isn't going to solve anything when we have 3 variants of
Seaboard, and only Seaboard is in mach-types.h but not the other 2, but
I suppose we can deal with that when it happens.
Troy Kisky - March 2, 2012, 9:07 p.m.
On 3/1/2012 3:50 PM, Troy Kisky wrote:
> On 3/1/2012 2:54 PM, Albert ARIBAUD wrote:
>> Hi Troy,
>>
>> Le 01/03/2012 22:13, Troy Kisky a écrit :
>>
>>> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
>>> index b4610d9..da49ae8 100644
>>> --- a/include/configs/ea20.h
>>> +++ b/include/configs/ea20.h
>>> @@ -24,6 +24,18 @@
>>>   #define __CONFIG_H
>>>
>>>   /*
>>> + * FIXME: This belongs in mach-types.h.  However, we only pull 
>>> mach-types
>>> + * from Linus' kernel.org tree.
>>> + */
>>> +#include<asm/mach-types.h>
>>> +#ifdef MACH_TYPE_EA20
>>> +#error "MACH_TYPE_EA20 has been defined properly, please remove this."
>>> +#else
>>> +#define MACH_TYPE_EA20        3002
>>> +#endif
>>> +
>>> +
>>> +/*
>>
>> Sorry if I am being pedantic here, but the "FIXME" comment actually 
>> belongs *below* the #include line, not above. Ditto for others.
>
> I put it above because when it is moved to mach-types.h, the include 
> should be deleted as well. That is part of the "FIXME."
Did I convince you, or do you still want it changed?


Thanks
Troy

Patch

diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
index 2d5c3bc..a7db956 100644
--- a/arch/arm/include/asm/mach-types.h
+++ b/arch/arm/include/asm/mach-types.h
@@ -56,6 +56,7 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_H7202                162
 #define MACH_TYPE_IQ80321              169
 #define MACH_TYPE_KS8695               180
+#define MACH_TYPE_KARO                 190
 #define MACH_TYPE_SMDK2410             193
 #define MACH_TYPE_CEIVA                200
 #define MACH_TYPE_VOICEBLUE            218
@@ -179,6 +180,7 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_DAVINCI_EVM          901
 #define MACH_TYPE_PALMZ72              904
 #define MACH_TYPE_NXDB500              905
+#define MACH_TYPE_APF9328              906
 #define MACH_TYPE_PALMT5               917
 #define MACH_TYPE_PALMTC               918
 #define MACH_TYPE_OMAP_APOLLON         919
@@ -262,10 +264,12 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_TS209                1565
 #define MACH_TYPE_AT91CAP9ADK          1566
 #define MACH_TYPE_MX31MOBOARD          1574
+#define MACH_TYPE_VISION_EP9307        1578
 #define MACH_TYPE_TERASTATION_PRO2     1584
 #define MACH_TYPE_LINKSTATION_PRO      1585
 #define MACH_TYPE_E350                 1596
 #define MACH_TYPE_TS409                1601
+#define MACH_TYPE_RSI_EWS              1609
 #define MACH_TYPE_CM_X300              1616
 #define MACH_TYPE_AT91SAM9G20EK        1624
 #define MACH_TYPE_SMDK6410             1626
@@ -309,7 +313,6 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_MX25_3DS             1771
 #define MACH_TYPE_OMAP3530_LV_SOM      1773
 #define MACH_TYPE_DAVINCI_DA830_EVM    1781
-#define MACH_TYPE_AT572D940HFEB        1783
 #define MACH_TYPE_DOVE_DB              1788
 #define MACH_TYPE_OVERO                1798
 #define MACH_TYPE_AT2440EVB            1799
@@ -322,6 +325,7 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_TAVOREVB             1827
 #define MACH_TYPE_SAAR                 1828
 #define MACH_TYPE_AT91SAM9M10G45EK     1830
+#define MACH_TYPE_USB_A9G20            1841
 #define MACH_TYPE_MXLADS               1851
 #define MACH_TYPE_LINKSTATION_MINI     1858
 #define MACH_TYPE_AFEB9260             1859
@@ -360,6 +364,7 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_SHEEVAPLUG           2097
 #define MACH_TYPE_AVENGERS_LITE        2104
 #define MACH_TYPE_MX51_BABBAGE         2125
+#define MACH_TYPE_TX37                 2127
 #define MACH_TYPE_RD78X00_MASA         2135
 #define MACH_TYPE_DM355_LEOPARD        2138
 #define MACH_TYPE_TS219                2139
@@ -370,6 +375,7 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_MAGX_ZN5             2162
 #define MACH_TYPE_BTMAVB101            2172
 #define MACH_TYPE_BTMAWB101            2173
+#define MACH_TYPE_TX25                 2177
 #define MACH_TYPE_OMAP3_TORPEDO        2178
 #define MACH_TYPE_ANW6410              2183
 #define MACH_TYPE_IMX27_VISSTRIM_M10   2187
@@ -414,6 +420,7 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_RAUMFELD_CONNECTOR   2414
 #define MACH_TYPE_RAUMFELD_SPEAKER     2415
 #define MACH_TYPE_TNETV107X            2418
+#define MACH_TYPE_MX51_M2ID            2428
 #define MACH_TYPE_SMDKV210             2456
 #define MACH_TYPE_OMAP_ZOOM3           2464
 #define MACH_TYPE_OMAP_3630SDP         2465
@@ -424,14 +431,17 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_TS41X                2502
 #define MACH_TYPE_PHY3250              2511
 #define MACH_TYPE_MINI6410             2520
+#define MACH_TYPE_TX51                 2529
 #define MACH_TYPE_MX28EVK              2531
 #define MACH_TYPE_SMARTQ5              2534
 #define MACH_TYPE_DAVINCI_DM6467TEVM   2548
 #define MACH_TYPE_MXT_TD60             2550
 #define MACH_TYPE_RIOT_BEI2            2576
 #define MACH_TYPE_RIOT_X37             2578
+#define MACH_TYPE_PCA101               2595
 #define MACH_TYPE_CAPC7117             2612
 #define MACH_TYPE_ICONTROL             2624
+#define MACH_TYPE_GPLUGD               2625
 #define MACH_TYPE_QSD8X50A_ST1_5       2627
 #define MACH_TYPE_MX23EVK              2629
 #define MACH_TYPE_AP4EVB               2630
@@ -472,380 +482,53 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_EUKREA_CPUIMX51SD    2822
 #define MACH_TYPE_EUKREA_CPUIMX51      2823
 #define MACH_TYPE_SMDKC210             2838
-#define MACH_TYPE_OMAP3_BRAILLO        2839
-#define MACH_TYPE_SPYPLUG              2840
-#define MACH_TYPE_GINGER               2841
-#define MACH_TYPE_TNY_T3530            2842
 #define MACH_TYPE_PCA102               2843
-#define MACH_TYPE_SPADE                2844
-#define MACH_TYPE_MXC25_TOPAZ          2845
 #define MACH_TYPE_T5325                2846
-#define MACH_TYPE_GW2361               2847
-#define MACH_TYPE_ELOG                 2848
 #define MACH_TYPE_INCOME               2849
-#define MACH_TYPE_BCM589X              2850
-#define MACH_TYPE_ETNA                 2851
-#define MACH_TYPE_HAWKS                2852
-#define MACH_TYPE_MESON                2853
-#define MACH_TYPE_XSBASE255            2854
-#define MACH_TYPE_PVM2030              2855
-#define MACH_TYPE_MIOA502              2856
 #define MACH_TYPE_VVBOX_SDORIG2        2857
 #define MACH_TYPE_VVBOX_SDLITE2        2858
 #define MACH_TYPE_VVBOX_SDPRO4         2859
-#define MACH_TYPE_HTC_SPV_M700         2860
 #define MACH_TYPE_MX257SX              2861
 #define MACH_TYPE_GONI                 2862
-#define MACH_TYPE_MSM8X55_SVLTE_FFA    2863
-#define MACH_TYPE_MSM8X55_SVLTE_SURF   2864
-#define MACH_TYPE_QUICKSTEP            2865
-#define MACH_TYPE_DMW96                2866
-#define MACH_TYPE_HAMMERHEAD           2867
-#define MACH_TYPE_TRIDENT              2868
-#define MACH_TYPE_LIGHTNING            2869
-#define MACH_TYPE_ICONNECT             2870
-#define MACH_TYPE_AUTOBOT              2871
-#define MACH_TYPE_COCONUT              2872
-#define MACH_TYPE_DURIAN               2873
-#define MACH_TYPE_CAYENNE              2874
-#define MACH_TYPE_FUJI                 2875
-#define MACH_TYPE_SYNOLOGY_6282        2876
-#define MACH_TYPE_EM1SY                2877
-#define MACH_TYPE_M502                 2878
-#define MACH_TYPE_MATRIX518            2879
-#define MACH_TYPE_TINY_GURNARD         2880
-#define MACH_TYPE_SPEAR1310            2881
 #define MACH_TYPE_BV07                 2882
-#define MACH_TYPE_MXT_TD61             2883
 #define MACH_TYPE_OPENRD_ULTIMATE      2884
 #define MACH_TYPE_DEVIXP               2885
 #define MACH_TYPE_MICCPT               2886
 #define MACH_TYPE_MIC256               2887
-#define MACH_TYPE_AS1167               2888
-#define MACH_TYPE_OMAP3_IBIZA          2889
 #define MACH_TYPE_U5500                2890
-#define MACH_TYPE_DAVINCI_PICTO        2891
-#define MACH_TYPE_MECHA                2892
-#define MACH_TYPE_BUBBA3               2893
-#define MACH_TYPE_PUPITRE              2894
-#define MACH_TYPE_TEGRA_VOGUE          2896
-#define MACH_TYPE_TEGRA_E1165          2897
-#define MACH_TYPE_SIMPLENET            2898
-#define MACH_TYPE_EC4350TBM            2899
-#define MACH_TYPE_PEC_TC               2900
-#define MACH_TYPE_PEC_HC2              2901
-#define MACH_TYPE_ESL_MOBILIS_A        2902
-#define MACH_TYPE_ESL_MOBILIS_B        2903
-#define MACH_TYPE_ESL_WAVE_A           2904
-#define MACH_TYPE_ESL_WAVE_B           2905
-#define MACH_TYPE_UNISENSE_MMM         2906
-#define MACH_TYPE_BLUESHARK            2907
-#define MACH_TYPE_E10                  2908
-#define MACH_TYPE_APP3K_ROBIN          2909
-#define MACH_TYPE_POV15HD              2910
-#define MACH_TYPE_STELLA               2911
 #define MACH_TYPE_LINKSTATION_LSCHL    2913
-#define MACH_TYPE_NETWALKER            2914
-#define MACH_TYPE_ACSX106              2915
-#define MACH_TYPE_ATLAS5_C1            2916
-#define MACH_TYPE_NSB3AST              2917
-#define MACH_TYPE_GNET_SLC             2918
-#define MACH_TYPE_AF4000               2919
-#define MACH_TYPE_ARK9431              2920
-#define MACH_TYPE_FS_S5PC100           2921
-#define MACH_TYPE_OMAP3505NOVA8        2922
-#define MACH_TYPE_OMAP3621_EDP1        2923
-#define MACH_TYPE_ORATISAES            2924
 #define MACH_TYPE_SMDKV310             2925
-#define MACH_TYPE_SIEMENS_L0           2926
-#define MACH_TYPE_VENTANA              2927
 #define MACH_TYPE_WM8505_7IN_NETBOOK   2928
-#define MACH_TYPE_EC4350SDB            2929
-#define MACH_TYPE_MIMAS                2930
-#define MACH_TYPE_TITAN                2931
 #define MACH_TYPE_CRANEBOARD           2932
-#define MACH_TYPE_ES2440               2933
-#define MACH_TYPE_NAJAY_A9263          2934
-#define MACH_TYPE_HTCTORNADO           2935
-#define MACH_TYPE_DIMM_MX257           2936
-#define MACH_TYPE_JIGEN                2937
 #define MACH_TYPE_SMDK6450             2938
-#define MACH_TYPE_MENO_QNG             2939
-#define MACH_TYPE_NS2416               2940
-#define MACH_TYPE_RPC353               2941
-#define MACH_TYPE_TQ6410               2942
-#define MACH_TYPE_SKY6410              2943
-#define MACH_TYPE_DYNASTY              2944
-#define MACH_TYPE_VIVO                 2945
-#define MACH_TYPE_BURY_BL7582          2946
-#define MACH_TYPE_BURY_BPS5270         2947
-#define MACH_TYPE_BASI                 2948
-#define MACH_TYPE_TN200                2949
-#define MACH_TYPE_C2MMI                2950
-#define MACH_TYPE_MESON_6236M          2951
-#define MACH_TYPE_MESON_8626M          2952
-#define MACH_TYPE_TUBE                 2953
-#define MACH_TYPE_MESSINA              2954
-#define MACH_TYPE_MX50_ARM2            2955
-#define MACH_TYPE_CETUS9263            2956
 #define MACH_TYPE_BROWNSTONE           2957
-#define MACH_TYPE_VMX25                2958
-#define MACH_TYPE_VMX51                2959
-#define MACH_TYPE_ABACUS               2960
-#define MACH_TYPE_CM4745               2961
-#define MACH_TYPE_ORATISLINK           2962
-#define MACH_TYPE_DAVINCI_DM365_DVR    2963
-#define MACH_TYPE_NETVIZ               2964
 #define MACH_TYPE_FLEXIBITY            2965
-#define MACH_TYPE_WLAN_COMPUTER        2966
-#define MACH_TYPE_LPC24XX              2967
-#define MACH_TYPE_SPICA                2968
-#define MACH_TYPE_GPSDISPLAY           2969
-#define MACH_TYPE_BIPNET               2970
-#define MACH_TYPE_OVERO_CTU_INERTIAL   2971
-#define MACH_TYPE_DAVINCI_DM355_MMM    2972
-#define MACH_TYPE_PC9260_V2            2973
-#define MACH_TYPE_PTX7545              2974
-#define MACH_TYPE_TM_EFDC              2975
-#define MACH_TYPE_OMAP3_WALDO1         2977
-#define MACH_TYPE_FLYER                2978
-#define MACH_TYPE_TORNADO3240          2979
-#define MACH_TYPE_SOLI_01              2980
-#define MACH_TYPE_OMAPL138_EUROPALC    2981
-#define MACH_TYPE_HELIOS_V1            2982
-#define MACH_TYPE_NETSPACE_LITE_V2     2983
-#define MACH_TYPE_SSC                  2984
-#define MACH_TYPE_PREMIERWAVE_EN       2985
-#define MACH_TYPE_WASABI               2986
 #define MACH_TYPE_MX50_RDP             2988
 #define MACH_TYPE_UNIVERSAL_C210       2989
 #define MACH_TYPE_REAL6410             2990
-#define MACH_TYPE_SPX_SAKURA           2991
-#define MACH_TYPE_IJ3K_2440            2992
-#define MACH_TYPE_OMAP3_BC10           2993
-#define MACH_TYPE_THEBE                2994
-#define MACH_TYPE_RV082                2995
-#define MACH_TYPE_ARMLGUEST            2996
-#define MACH_TYPE_TJINC1000            2997
 #define MACH_TYPE_DOCKSTAR             2998
-#define MACH_TYPE_AX8008               2999
-#define MACH_TYPE_GNET_SGCE            3000
-#define MACH_TYPE_PXWNAS_500_1000      3001
-#define MACH_TYPE_EA20                 3002
-#define MACH_TYPE_AWM2                 3003
 #define MACH_TYPE_TI8148EVM            3004
 #define MACH_TYPE_SEABOARD             3005
-#define MACH_TYPE_LINKSTATION_CHLV2    3006
-#define MACH_TYPE_TERA_PRO2_RACK       3007
-#define MACH_TYPE_RUBYS                3008
-#define MACH_TYPE_AQUARIUS             3009
 #define MACH_TYPE_MX53_ARD             3010
 #define MACH_TYPE_MX53_SMD             3011
-#define MACH_TYPE_LSWXL                3012
-#define MACH_TYPE_DOVE_AVNG_V3         3013
-#define MACH_TYPE_SDI_ESS_9263         3014
-#define MACH_TYPE_JOCPU550             3015
 #define MACH_TYPE_MSM8X60_RUMI3        3016
 #define MACH_TYPE_MSM8X60_FFA          3017
-#define MACH_TYPE_YANOMAMI             3018
-#define MACH_TYPE_GTA04                3019
 #define MACH_TYPE_CM_A510              3020
-#define MACH_TYPE_OMAP3_RFS200         3021
-#define MACH_TYPE_KX33XX               3022
-#define MACH_TYPE_PTX7510              3023
-#define MACH_TYPE_TOP9000              3024
-#define MACH_TYPE_TEENOTE              3025
-#define MACH_TYPE_TS3                  3026
-#define MACH_TYPE_A0                   3027
-#define MACH_TYPE_FSM9XXX_SURF         3028
-#define MACH_TYPE_FSM9XXX_FFA          3029
-#define MACH_TYPE_FRRHWCDMA60W         3030
-#define MACH_TYPE_REMUS                3031
-#define MACH_TYPE_AT91CAP7XDK          3032
-#define MACH_TYPE_AT91CAP7STK          3033
-#define MACH_TYPE_KT_SBC_SAM9_1        3034
-#define MACH_TYPE_ARMADA_XP_DB         3036
-#define MACH_TYPE_SPDM                 3037
-#define MACH_TYPE_GTIB                 3038
-#define MACH_TYPE_DGM3240              3039
-#define MACH_TYPE_HTCMEGA              3041
-#define MACH_TYPE_TRICORDER            3042
 #define MACH_TYPE_TX28                 3043
-#define MACH_TYPE_BSTBRD               3044
-#define MACH_TYPE_PWB3090              3045
-#define MACH_TYPE_IDEA6410             3046
-#define MACH_TYPE_QBC9263              3047
-#define MACH_TYPE_BORABORA             3048
-#define MACH_TYPE_VALDEZ               3049
-#define MACH_TYPE_LS9G20               3050
-#define MACH_TYPE_MIOS_V1              3051
-#define MACH_TYPE_S5PC110_CRESPO       3052
-#define MACH_TYPE_CONTROLTEK9G20       3053
-#define MACH_TYPE_TIN307               3054
-#define MACH_TYPE_TIN510               3055
-#define MACH_TYPE_BLUECHEESE           3057
-#define MACH_TYPE_TEM3X30              3058
-#define MACH_TYPE_HARVEST_DESOTO       3059
-#define MACH_TYPE_MSM8X60_QRDC         3060
-#define MACH_TYPE_SPEAR900             3061
 #define MACH_TYPE_PCONTROL_G20         3062
-#define MACH_TYPE_RDSTOR               3063
-#define MACH_TYPE_USDLOADER            3064
-#define MACH_TYPE_TSOPLOADER           3065
-#define MACH_TYPE_KRONOS               3066
-#define MACH_TYPE_FFCORE               3067
-#define MACH_TYPE_MONE                 3068
-#define MACH_TYPE_UNIT2S               3069
-#define MACH_TYPE_ACER_A5              3070
-#define MACH_TYPE_ETHERPRO_ISP         3071
-#define MACH_TYPE_STRETCHS7000         3072
-#define MACH_TYPE_P87_SMARTSIM         3073
-#define MACH_TYPE_TULIP                3074
-#define MACH_TYPE_SUNFLOWER            3075
-#define MACH_TYPE_RIB                  3076
-#define MACH_TYPE_CLOD                 3077
-#define MACH_TYPE_RUMP                 3078
-#define MACH_TYPE_TENDERLOIN           3079
-#define MACH_TYPE_SHORTLOIN            3080
-#define MACH_TYPE_ANTARES              3082
-#define MACH_TYPE_WB40N                3083
-#define MACH_TYPE_HERRING              3084
-#define MACH_TYPE_NAXY400              3085
-#define MACH_TYPE_NAXY1200             3086
 #define MACH_TYPE_VPR200               3087
-#define MACH_TYPE_BUG20                3088
-#define MACH_TYPE_GOFLEXNET            3089
 #define MACH_TYPE_TORBRECK             3090
-#define MACH_TYPE_SAARB_MG1            3091
-#define MACH_TYPE_CALLISTO             3092
-#define MACH_TYPE_MULTHSU              3093
-#define MACH_TYPE_SALUDA               3094
-#define MACH_TYPE_PEMP_OMAP3_APOLLO    3095
-#define MACH_TYPE_VC0718               3096
-#define MACH_TYPE_MVBLX                3097
-#define MACH_TYPE_INHAND_APEIRON       3098
-#define MACH_TYPE_INHAND_FURY          3099
-#define MACH_TYPE_INHAND_SIREN         3100
-#define MACH_TYPE_HDNVP                3101
-#define MACH_TYPE_SOFTWINNER           3102
 #define MACH_TYPE_PRIMA2_EVB           3103
-#define MACH_TYPE_NAS6210              3104
-#define MACH_TYPE_UNISDEV              3105
-#define MACH_TYPE_SBCA11               3106
-#define MACH_TYPE_SAGA                 3107
-#define MACH_TYPE_NS_K330              3108
-#define MACH_TYPE_TANNA                3109
-#define MACH_TYPE_IMATE8502            3110
-#define MACH_TYPE_ASPEN                3111
-#define MACH_TYPE_DAINTREE_CWAC        3112
-#define MACH_TYPE_ZMX25                3113
-#define MACH_TYPE_MAPLE1               3114
-#define MACH_TYPE_QSD8X72_SURF         3115
-#define MACH_TYPE_QSD8X72_FFA          3116
-#define MACH_TYPE_ABILENE              3117
-#define MACH_TYPE_EIGEN_TTR            3118
-#define MACH_TYPE_IOMEGA_IX2_200       3119
-#define MACH_TYPE_CORETEC_VCX7400      3120
-#define MACH_TYPE_SANTIAGO             3121
-#define MACH_TYPE_MX257SOL             3122
-#define MACH_TYPE_STRASBOURG           3123
-#define MACH_TYPE_MSM8X60_FLUID        3124
-#define MACH_TYPE_SMARTQV5             3125
-#define MACH_TYPE_SMARTQV3             3126
-#define MACH_TYPE_SMARTQV7             3127
 #define MACH_TYPE_PAZ00                3128
 #define MACH_TYPE_ACMENETUSFOXG20      3129
-#define MACH_TYPE_FWBD_0404            3131
-#define MACH_TYPE_HDGU                 3132
-#define MACH_TYPE_PYRAMID              3133
-#define MACH_TYPE_EPIPHAN              3134
-#define MACH_TYPE_OMAP_BENDER          3135
-#define MACH_TYPE_GURNARD              3136
-#define MACH_TYPE_GTL_IT5100           3137
-#define MACH_TYPE_BCM2708              3138
-#define MACH_TYPE_MX51_GGC             3139
-#define MACH_TYPE_SHARESPACE           3140
-#define MACH_TYPE_HABA_KNX_EXPLORER    3141
-#define MACH_TYPE_SIMTEC_KIRKMOD       3142
-#define MACH_TYPE_CRUX                 3143
-#define MACH_TYPE_MX51_BRAVO           3144
-#define MACH_TYPE_CHARON               3145
-#define MACH_TYPE_PICOCOM3             3146
-#define MACH_TYPE_PICOCOM4             3147
-#define MACH_TYPE_SERRANO              3148
-#define MACH_TYPE_DOUBLESHOT           3149
-#define MACH_TYPE_EVSY                 3150
-#define MACH_TYPE_HUASHAN              3151
-#define MACH_TYPE_LAUSANNE             3152
-#define MACH_TYPE_EMERALD              3153
-#define MACH_TYPE_TQMA35               3154
-#define MACH_TYPE_MARVEL               3155
-#define MACH_TYPE_MANUAE               3156
-#define MACH_TYPE_CHACHA               3157
-#define MACH_TYPE_LEMON                3158
-#define MACH_TYPE_CSC                  3159
-#define MACH_TYPE_GIRA_KNXIP_ROUTER    3160
-#define MACH_TYPE_T20                  3161
-#define MACH_TYPE_HDMINI               3162
-#define MACH_TYPE_SCIPHONE_G2          3163
-#define MACH_TYPE_EXPRESS              3164
-#define MACH_TYPE_EXPRESS_KT           3165
-#define MACH_TYPE_MAXIMASP             3166
-#define MACH_TYPE_NITROGEN_IMX51       3167
-#define MACH_TYPE_NITROGEN_IMX53       3168
-#define MACH_TYPE_SUNFIRE              3169
-#define MACH_TYPE_AROWANA              3170
-#define MACH_TYPE_TEGRA_DAYTONA        3171
-#define MACH_TYPE_TEGRA_SWORDFISH      3172
-#define MACH_TYPE_EDISON               3173
-#define MACH_TYPE_SVP8500V1            3174
-#define MACH_TYPE_SVP8500V2            3175
-#define MACH_TYPE_SVP5500              3176
-#define MACH_TYPE_B5500                3177
-#define MACH_TYPE_S5500                3178
-#define MACH_TYPE_ICON                 3179
-#define MACH_TYPE_ELEPHANT             3180
-#define MACH_TYPE_SHOOTER              3182
-#define MACH_TYPE_SPADE_LTE            3183
-#define MACH_TYPE_PHILHWANI            3184
-#define MACH_TYPE_GSNCOMM              3185
-#define MACH_TYPE_STRASBOURG_A2        3186
-#define MACH_TYPE_MMM                  3187
-#define MACH_TYPE_DAVINCI_DM365_BV     3188
 #define MACH_TYPE_AG5EVM               3189
-#define MACH_TYPE_SC575PLC             3190
-#define MACH_TYPE_SC575IPC             3191
-#define MACH_TYPE_OMAP3_TDM3730        3192
-#define MACH_TYPE_TOP9000_EVAL         3194
-#define MACH_TYPE_TOP9000_SU           3195
-#define MACH_TYPE_UTM300               3196
 #define MACH_TYPE_TSUNAGI              3197
-#define MACH_TYPE_TS75XX               3198
-#define MACH_TYPE_TS47XX               3200
-#define MACH_TYPE_DA850_K5             3201
-#define MACH_TYPE_AX502                3202
-#define MACH_TYPE_IGEP0032             3203
-#define MACH_TYPE_ANTERO               3204
-#define MACH_TYPE_SYNERGY              3205
 #define MACH_TYPE_ICS_IF_VOIP          3206
 #define MACH_TYPE_WLF_CRAGG_6410       3207
-#define MACH_TYPE_PUNICA               3208
 #define MACH_TYPE_TRIMSLICE            3209
-#define MACH_TYPE_MX27_WMULTRA         3210
 #define MACH_TYPE_MACKEREL             3211
-#define MACH_TYPE_FA9X27               3213
-#define MACH_TYPE_NS2816TB             3214
-#define MACH_TYPE_NS2816_NTPAD         3215
-#define MACH_TYPE_NS2816_NTNB          3216
 #define MACH_TYPE_KAEN                 3217
-#define MACH_TYPE_NV1000               3218
-#define MACH_TYPE_NUC950TS             3219
 #define MACH_TYPE_NOKIA_RM680          3220
-#define MACH_TYPE_AST2200              3221
-#define MACH_TYPE_LEAD                 3222
-#define MACH_TYPE_UNINO1               3223
-#define MACH_TYPE_GREECO               3224
-#define MACH_TYPE_VERDI                3225
 #define MACH_TYPE_DM6446_ADBOX         3226
 #define MACH_TYPE_QUAD_SALSA           3227
 #define MACH_TYPE_ABB_GMA_1_1          3228
@@ -930,13 +613,11 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_TS4800               3313
 #define MACH_TYPE_TQMA9263             3314
 #define MACH_TYPE_HOLIDAY              3315
-#define MACH_TYPE_DMA6410              3316
 #define MACH_TYPE_PCATS_OVERLAY        3317
 #define MACH_TYPE_HWGW6410             3318
 #define MACH_TYPE_SHENZHOU             3319
 #define MACH_TYPE_CWME9210             3320
 #define MACH_TYPE_CWME9210JS           3321
-#define MACH_TYPE_PGS_SITARA           3322
 #define MACH_TYPE_COLIBRI_TEGRA2       3323
 #define MACH_TYPE_W21                  3324
 #define MACH_TYPE_POLYSAT1             3325
@@ -1002,13 +683,11 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_BOCKW                3386
 #define MACH_TYPE_EVA2000              3387
 #define MACH_TYPE_STEELYARD            3388
-#define MACH_TYPE_MACH_SDH001          3390
 #define MACH_TYPE_NSSLSBOARD           3392
 #define MACH_TYPE_GENEVA_B5            3393
 #define MACH_TYPE_SPEAR1340            3394
 #define MACH_TYPE_REXMAS               3395
 #define MACH_TYPE_MSM8960_CDP          3396
-#define MACH_TYPE_MSM8960_MDP          3397
 #define MACH_TYPE_MSM8960_FLUID        3398
 #define MACH_TYPE_MSM8960_APQ          3399
 #define MACH_TYPE_HELIOS_V2            3400
@@ -1104,7 +783,384 @@  extern unsigned int __machine_arch_type;
 #define MACH_TYPE_THALES_ADC           3492
 #define MACH_TYPE_UBISYS_P9D_EVP       3493
 #define MACH_TYPE_ATDGP318             3494
+#define MACH_TYPE_DMA210U              3495
+#define MACH_TYPE_EM_T3                3496
+#define MACH_TYPE_HTX3250              3497
+#define MACH_TYPE_G50                  3498
+#define MACH_TYPE_ECO5                 3499
+#define MACH_TYPE_WINTERGRASP          3500
+#define MACH_TYPE_PURO                 3501
+#define MACH_TYPE_SHOOTER_K            3502
+#define MACH_TYPE_NSPIRE               3503
+#define MACH_TYPE_MICKXX               3504
+#define MACH_TYPE_LXMB                 3505
+#define MACH_TYPE_ADAM                 3507
+#define MACH_TYPE_B1004                3508
+#define MACH_TYPE_OBOEA                3509
+#define MACH_TYPE_A1015                3510
+#define MACH_TYPE_ROBIN_VBDT30         3511
+#define MACH_TYPE_TEGRA_ENTERPRISE     3512
+#define MACH_TYPE_RFL108200_MK10       3513
+#define MACH_TYPE_RFL108300_MK16       3514
+#define MACH_TYPE_ROVER_V7             3515
+#define MACH_TYPE_MIPHONE              3516
+#define MACH_TYPE_FEMTOBTS             3517
+#define MACH_TYPE_MONOPOLI             3518
+#define MACH_TYPE_BOSS                 3519
+#define MACH_TYPE_DAVINCI_DM368_VTAM   3520
+#define MACH_TYPE_CLCON                3521
+#define MACH_TYPE_NOKIA_RM696          3522
+#define MACH_TYPE_TAHITI               3523
+#define MACH_TYPE_FIGHTER              3524
+#define MACH_TYPE_SGH_I710             3525
+#define MACH_TYPE_INTEGREPROSCB        3526
+#define MACH_TYPE_MONZA                3527
+#define MACH_TYPE_CALIMAIN             3528
+#define MACH_TYPE_MX6Q_SABREAUTO       3529
+#define MACH_TYPE_GMA01X               3530
+#define MACH_TYPE_SBC51                3531
+#define MACH_TYPE_FIT                  3532
+#define MACH_TYPE_STEELHEAD            3533
+#define MACH_TYPE_PANTHER              3534
+#define MACH_TYPE_MSM8960_LIQUID       3535
+#define MACH_TYPE_LEXIKONCT            3536
+#define MACH_TYPE_NS2816_STB           3537
+#define MACH_TYPE_SEI_MM2_LPC3250      3538
+#define MACH_TYPE_CMIMX53              3539
+#define MACH_TYPE_SANDWICH             3540
+#define MACH_TYPE_CHIEF                3541
+#define MACH_TYPE_POGO_E02             3542
+#define MACH_TYPE_MIKRAP_X168          3543
+#define MACH_TYPE_HTCMOZART            3544
+#define MACH_TYPE_HTCGOLD              3545
+#define MACH_TYPE_MT72XX               3546
+#define MACH_TYPE_MX51_IVY             3547
+#define MACH_TYPE_MX51_LVD             3548
+#define MACH_TYPE_OMAP3_WISER2         3549
+#define MACH_TYPE_DREAMPLUG            3550
+#define MACH_TYPE_COBAS_C_111          3551
+#define MACH_TYPE_COBAS_U_411          3552
+#define MACH_TYPE_HSSD                 3553
+#define MACH_TYPE_IOM35X               3554
+#define MACH_TYPE_PSOM_OMAP            3555
+#define MACH_TYPE_IPHONE_2G            3556
+#define MACH_TYPE_IPHONE_3G            3557
+#define MACH_TYPE_IPOD_TOUCH_1G        3558
+#define MACH_TYPE_PHAROS_TPC           3559
+#define MACH_TYPE_MX53_HYDRA           3560
+#define MACH_TYPE_NS2816_DEV_BOARD     3561
+#define MACH_TYPE_IPHONE_3GS           3562
+#define MACH_TYPE_IPHONE_4             3563
+#define MACH_TYPE_IPOD_TOUCH_4G        3564
+#define MACH_TYPE_DRAGON_E1100         3565
+#define MACH_TYPE_TOPSIDE              3566
+#define MACH_TYPE_IRISIII              3567
+#define MACH_TYPE_DETO_MACARM9         3568
+#define MACH_TYPE_ETI_D1               3569
+#define MACH_TYPE_SOM3530SDK           3570
+#define MACH_TYPE_OC_ENGINE            3571
+#define MACH_TYPE_APQ8064_SIM          3572
+#define MACH_TYPE_ALPS                 3575
+#define MACH_TYPE_TNY_T3730            3576
+#define MACH_TYPE_GERYON_NFE           3577
+#define MACH_TYPE_NS2816_REF_BOARD     3578
+#define MACH_TYPE_SILVERSTONE          3579
+#define MACH_TYPE_MTT2440              3580
+#define MACH_TYPE_YNICDB               3581
+#define MACH_TYPE_BCT                  3582
+#define MACH_TYPE_TUSCAN               3583
+#define MACH_TYPE_XBT_SAM9G45          3584
+#define MACH_TYPE_ENBW_CMC             3585
+#define MACH_TYPE_CH104MX257           3587
+#define MACH_TYPE_OPENPRI              3588
+#define MACH_TYPE_AM335XEVM            3589
+#define MACH_TYPE_PICODMB              3590
+#define MACH_TYPE_WALUIGI              3591
+#define MACH_TYPE_PUNICAG7             3592
+#define MACH_TYPE_IPAD_1G              3593
+#define MACH_TYPE_APPLETV_2G           3594
+#define MACH_TYPE_MACH_ECOG45          3595
+#define MACH_TYPE_AIT_CAM_ENC_4XX      3596
+#define MACH_TYPE_RUNNYMEDE            3597
+#define MACH_TYPE_PLAY                 3598
+#define MACH_TYPE_HW90260              3599
+#define MACH_TYPE_TAGH                 3600
+#define MACH_TYPE_FILBERT              3601
+#define MACH_TYPE_GETINGE_NETCOMV3     3602
+#define MACH_TYPE_CW20                 3603
+#define MACH_TYPE_CINEMA               3604
+#define MACH_TYPE_CINEMA_TEA           3605
+#define MACH_TYPE_CINEMA_COFFEE        3606
+#define MACH_TYPE_CINEMA_JUICE         3607
+#define MACH_TYPE_MX53_MIRAGE2         3609
+#define MACH_TYPE_MX53_EFIKASB         3610
+#define MACH_TYPE_STM_B2000            3612
+#define MACH_TYPE_M28EVK               3613
+#define MACH_TYPE_PDA                  3614
+#define MACH_TYPE_MERAKI_MR58          3615
+#define MACH_TYPE_KOTA2                3616
+#define MACH_TYPE_LETCOOL              3617
+#define MACH_TYPE_MX27IAT              3618
+#define MACH_TYPE_APOLLO_TD            3619
+#define MACH_TYPE_ARENA                3620
+#define MACH_TYPE_GSNGATEWAY           3621
+#define MACH_TYPE_LF2000               3622
+#define MACH_TYPE_BONITO               3623
+#define MACH_TYPE_ASYMPTOTE            3624
+#define MACH_TYPE_BST2BRD              3625
+#define MACH_TYPE_TX335S               3626
+#define MACH_TYPE_PELCO_TESLA          3627
+#define MACH_TYPE_RRHTESTPLAT          3628
+#define MACH_TYPE_VIDTONIC_PRO         3629
+#define MACH_TYPE_PL_APOLLO            3630
+#define MACH_TYPE_PL_PHOENIX           3631
+#define MACH_TYPE_M28CU3               3632
+#define MACH_TYPE_VVBOX_HD             3633
+#define MACH_TYPE_COREWARE_SAM9260_    3634
+#define MACH_TYPE_MARMADUKE            3635
+#define MACH_TYPE_AMG_XLCORE_CAMERA    3636
+#define MACH_TYPE_OMAP3_EGF            3637
+#define MACH_TYPE_SMDK4212             3638
+#define MACH_TYPE_DNP9200              3639
+#define MACH_TYPE_TF101                3640
+#define MACH_TYPE_OMAP3SILVIO          3641
+#define MACH_TYPE_PICASSO2             3642
+#define MACH_TYPE_VANGOGH2             3643
+#define MACH_TYPE_OLPC_XO_1_75         3644
+#define MACH_TYPE_GX400                3645
+#define MACH_TYPE_GS300                3646
+#define MACH_TYPE_ACER_A9              3647
+#define MACH_TYPE_VIVOW_EVM            3648
+#define MACH_TYPE_VELOCE_CXQ           3649
+#define MACH_TYPE_VELOCE_CXM           3650
+#define MACH_TYPE_P1852                3651
+#define MACH_TYPE_NAXY100              3652
+#define MACH_TYPE_TAISHAN              3653
+#define MACH_TYPE_TOUCHLINK            3654
+#define MACH_TYPE_STM32F103ZE          3655
+#define MACH_TYPE_MCX                  3656
+#define MACH_TYPE_STM_NMHDK_FLI7610    3657
+#define MACH_TYPE_TOP28X               3658
+#define MACH_TYPE_OKL4VP_MICROVISOR    3659
+#define MACH_TYPE_POP                  3660
+#define MACH_TYPE_LAYER                3661
+#define MACH_TYPE_TRONDHEIM            3662
+#define MACH_TYPE_EVA                  3663
+#define MACH_TYPE_TRUST_TAURUS         3664
+#define MACH_TYPE_NS2816_HUASHAN       3665
+#define MACH_TYPE_NS2816_YANGCHENG     3666
+#define MACH_TYPE_P852                 3667
+#define MACH_TYPE_FLEA3                3668
+#define MACH_TYPE_BOWFIN               3669
+#define MACH_TYPE_MV88DE3100           3670
+#define MACH_TYPE_PIA_AM35X            3671
+#define MACH_TYPE_CEDAR                3672
+#define MACH_TYPE_PICASSO_E            3673
+#define MACH_TYPE_SAMSUNG_E60          3674
+#define MACH_TYPE_SDVR_MINI            3676
+#define MACH_TYPE_OMAP3_IJ3K           3677
+#define MACH_TYPE_MODASMC1             3678
+#define MACH_TYPE_APQ8064_RUMI3        3679
+#define MACH_TYPE_MATRIX506            3680
+#define MACH_TYPE_MSM9615_MTP          3681
+#define MACH_TYPE_DM36X_SPAWNDC        3682
+#define MACH_TYPE_SFF792               3683
+#define MACH_TYPE_AM335XIAEVM          3684
+#define MACH_TYPE_G3C2440              3685
+#define MACH_TYPE_TION270              3686
+#define MACH_TYPE_W22Q7ARM02           3687
+#define MACH_TYPE_OMAP_CAT             3688
+#define MACH_TYPE_AT91SAM9N12EK        3689
+#define MACH_TYPE_MORRISON             3690
+#define MACH_TYPE_SVDU                 3691
+#define MACH_TYPE_LPP01                3692
+#define MACH_TYPE_UBC283               3693
+#define MACH_TYPE_ZEPPELIN             3694
+#define MACH_TYPE_MOTUS                3695
+#define MACH_TYPE_NEOMAINBOARD         3696
+#define MACH_TYPE_DEVKIT3250           3697
+#define MACH_TYPE_DEVKIT7000           3698
+#define MACH_TYPE_FMC_UIC              3699
+#define MACH_TYPE_FMC_DCM              3700
+#define MACH_TYPE_BATWM                3701
+#define MACH_TYPE_ATLAS6CB             3702
+#define MACH_TYPE_BLUE                 3705
+#define MACH_TYPE_COLORADO             3706
+#define MACH_TYPE_POPC                 3707
+#define MACH_TYPE_PROMWAD_JADE         3708
+#define MACH_TYPE_AMP                  3709
+#define MACH_TYPE_GNET_AMP             3710
+#define MACH_TYPE_TOQUES               3711
+#define MACH_TYPE_DCT_STORM            3713
+#define MACH_TYPE_OWL                  3715
+#define MACH_TYPE_COGENT_CSB1741       3716
+#define MACH_TYPE_ADILLUSTRA610        3718
+#define MACH_TYPE_ECAFE_NA04           3719
+#define MACH_TYPE_POPCT                3720
+#define MACH_TYPE_OMAP3_HELENA         3721
+#define MACH_TYPE_ACH                  3722
+#define MACH_TYPE_MODULE_DTB           3723
+#define MACH_TYPE_OSLO_ELISABETH       3725
+#define MACH_TYPE_TT01                 3726
+#define MACH_TYPE_MSM8930_CDP          3727
+#define MACH_TYPE_MSM8930_MTP          3728
+#define MACH_TYPE_MSM8930_FLUID        3729
+#define MACH_TYPE_LTU11                3730
+#define MACH_TYPE_AM1808_SPAWNCO       3731
+#define MACH_TYPE_FLX6410              3732
+#define MACH_TYPE_MX6Q_QSB             3733
+#define MACH_TYPE_MX53_PLT424          3734
+#define MACH_TYPE_JASMINE              3735
+#define MACH_TYPE_L138_OWLBOARD_PLUS   3736
+#define MACH_TYPE_WR21                 3737
+#define MACH_TYPE_PEABOY               3739
+#define MACH_TYPE_MX28_PLATO           3740
+#define MACH_TYPE_KACOM2               3741
+#define MACH_TYPE_SLCO                 3742
+#define MACH_TYPE_IMX51PICO            3743
+#define MACH_TYPE_GLINK1               3744
+#define MACH_TYPE_DIAMOND              3745
+#define MACH_TYPE_D9000                3746
+#define MACH_TYPE_W5300E01             3747
+#define MACH_TYPE_IM6000               3748
+#define MACH_TYPE_MX51_FRED51          3749
+#define MACH_TYPE_STM32F2              3750
+#define MACH_TYPE_VILLE                3751
+#define MACH_TYPE_PTIP_MURNAU          3752
+#define MACH_TYPE_PTIP_CLASSIC         3753
+#define MACH_TYPE_MX53GRB              3754
+#define MACH_TYPE_GAGARIN              3755
+#define MACH_TYPE_NAS2BIG              3757
+#define MACH_TYPE_SUPERFEMTO           3758
+#define MACH_TYPE_TEUFEL               3759
+#define MACH_TYPE_DINARA               3760
+#define MACH_TYPE_VANQUISH             3761
+#define MACH_TYPE_ZIPABOX1             3762
+#define MACH_TYPE_U9540                3763
+#define MACH_TYPE_JET                  3764
+#define MACH_TYPE_SMDK4412             3765
+#define MACH_TYPE_ELITE                3766
+#define MACH_TYPE_SPEAR320_HMI         3767
+#define MACH_TYPE_ONTARIO              3768
+#define MACH_TYPE_MX6Q_SABRELITE       3769
+#define MACH_TYPE_VC200                3770
+#define MACH_TYPE_MSM7625A_FFA         3771
+#define MACH_TYPE_MSM7625A_SURF        3772
+#define MACH_TYPE_BENTHOSSBP           3773
+#define MACH_TYPE_SMDK5210             3774
+#define MACH_TYPE_EMPQ2300             3775
+#define MACH_TYPE_MINIPOS              3776
 #define MACH_TYPE_OMAP5_SEVM           3777
+#define MACH_TYPE_SHELTER              3778
+#define MACH_TYPE_OMAP3_DEVKIT8500     3779
+#define MACH_TYPE_EDGETD               3780
+#define MACH_TYPE_COPPERYARD           3781
+#define MACH_TYPE_EDGE                 3782
+#define MACH_TYPE_EDGE_U               3783
+#define MACH_TYPE_EDGE_TD              3784
+#define MACH_TYPE_WDSS                 3785
+#define MACH_TYPE_DL_PB25              3786
+#define MACH_TYPE_DSS11                3787
+#define MACH_TYPE_CPA                  3788
+#define MACH_TYPE_APTP2000             3789
+#define MACH_TYPE_MARZEN               3790
+#define MACH_TYPE_ST_TURBINE           3791
+#define MACH_TYPE_GTL_IT3300           3792
+#define MACH_TYPE_MX6_MULE             3793
+#define MACH_TYPE_V7PXA_DT             3794
+#define MACH_TYPE_V7MMP_DT             3795
+#define MACH_TYPE_DRAGON7              3796
+#define MACH_TYPE_KROME                3797
+#define MACH_TYPE_ORATISDANTE          3798
+#define MACH_TYPE_FATHOM               3799
+#define MACH_TYPE_DNS325               3800
+#define MACH_TYPE_SARNEN               3801
+#define MACH_TYPE_UBISYS_G1            3802
+#define MACH_TYPE_MX53_PF1             3803
+#define MACH_TYPE_ASANTI               3804
+#define MACH_TYPE_VOLTA                3805
+#define MACH_TYPE_KNIGHT               3807
+#define MACH_TYPE_BEAGLEBONE           3808
+#define MACH_TYPE_BECKER               3809
+#define MACH_TYPE_FC360                3810
+#define MACH_TYPE_PMI2_XLS             3811
+#define MACH_TYPE_TARANTO              3812
+#define MACH_TYPE_PLUTUX               3813
+#define MACH_TYPE_IPMP_MEDCOM          3814
+#define MACH_TYPE_ABSOLUT              3815
+#define MACH_TYPE_AWPB3                3816
+#define MACH_TYPE_NFP32XX_DT           3817
+#define MACH_TYPE_DL_PB53              3818
+#define MACH_TYPE_ACU_II               3819
+#define MACH_TYPE_AVALON               3820
+#define MACH_TYPE_SPHINX               3821
+#define MACH_TYPE_TITAN_T              3822
+#define MACH_TYPE_HARVEST_BORIS        3823
+#define MACH_TYPE_MACH_MSM7X30_M3S     3824
+#define MACH_TYPE_SMDK5250             3825
+#define MACH_TYPE_IMXT_LITE            3826
+#define MACH_TYPE_IMXT_STD             3827
+#define MACH_TYPE_IMXT_LOG             3828
+#define MACH_TYPE_IMXT_NAV             3829
+#define MACH_TYPE_IMXT_FULL            3830
+#define MACH_TYPE_AG09015              3831
+#define MACH_TYPE_AM3517_MT_VENTOUX    3832
+#define MACH_TYPE_DP1ARM9              3833
+#define MACH_TYPE_PICASSO_M            3834
+#define MACH_TYPE_VIDEO_GADGET         3835
+#define MACH_TYPE_MTT_OM3X             3836
+#define MACH_TYPE_MX6Q_ARM2            3837
+#define MACH_TYPE_PICOSAM9G45          3838
+#define MACH_TYPE_VPM_DM365            3839
+#define MACH_TYPE_BONFIRE              3840
+#define MACH_TYPE_MT2P2D               3841
+#define MACH_TYPE_SIGPDA01             3842
+#define MACH_TYPE_CN27                 3843
+#define MACH_TYPE_MX25_CWTAP           3844
+#define MACH_TYPE_APF28                3845
+#define MACH_TYPE_PELCO_MAXWELL        3846
+#define MACH_TYPE_GE_PHOENIX           3847
+#define MACH_TYPE_EMPC_A500            3848
+#define MACH_TYPE_IMS_ARM9             3849
+#define MACH_TYPE_MINI2416             3850
+#define MACH_TYPE_MINI2450             3851
+#define MACH_TYPE_MINI310              3852
+#define MACH_TYPE_SPEAR_HURRICANE      3853
+#define MACH_TYPE_MT7208               3854
+#define MACH_TYPE_LPC178X              3855
+#define MACH_TYPE_FARLEYS              3856
+#define MACH_TYPE_EFM32GG_DK3750       3857
+#define MACH_TYPE_ZEUS_BOARD           3858
+#define MACH_TYPE_CC51                 3859
+#define MACH_TYPE_FXI_C210             3860
+#define MACH_TYPE_MSM8627_CDP          3861
+#define MACH_TYPE_MSM8627_MTP          3862
+#define MACH_TYPE_ARMADILLO800EVA      3863
+#define MACH_TYPE_PRIMOU               3864
+#define MACH_TYPE_PRIMOC               3865
+#define MACH_TYPE_PRIMOCT              3866
+#define MACH_TYPE_A9500                3867
+#define MACH_TYPE_PLUTO                3869
+#define MACH_TYPE_ACFX100              3870
+#define MACH_TYPE_MSM8625_RUMI3        3871
+#define MACH_TYPE_VALENTE              3872
+#define MACH_TYPE_CRFS_RFEYE           3873
+#define MACH_TYPE_RFEYE                3874
+#define MACH_TYPE_PHIDGET_SBC3         3875
+#define MACH_TYPE_TCW_MIKA             3876
+#define MACH_TYPE_IMX28_EGF            3877
+#define MACH_TYPE_VALENTE_WX           3878
+#define MACH_TYPE_HUANGSHANS           3879
+#define MACH_TYPE_BOSPHORUS1           3880
+#define MACH_TYPE_PRIMA                3881
+#define MACH_TYPE_EVITA_ULK            3884
+#define MACH_TYPE_MERISC600            3885
+#define MACH_TYPE_DOLAK                3886
+#define MACH_TYPE_SBC53                3887
+#define MACH_TYPE_ELITE_ULK            3888
+#define MACH_TYPE_POV2                 3889
+#define MACH_TYPE_IPOD_TOUCH_2G        3890
+#define MACH_TYPE_DA850_PQAB           3891
 
 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type
@@ -1634,6 +1690,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_ks8695()	(0)
 #endif
 
+#ifdef CONFIG_ARCH_KARO
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_KARO
+# endif
+# define machine_is_karo()	(machine_arch_type == MACH_TYPE_KARO)
+#else
+# define machine_is_karo()	(0)
+#endif
+
 #ifdef CONFIG_ARCH_SMDK2410
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -3110,6 +3178,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_nxdb500()	(0)
 #endif
 
+#ifdef CONFIG_MACH_APF9328
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_APF9328
+# endif
+# define machine_is_apf9328()	(machine_arch_type == MACH_TYPE_APF9328)
+#else
+# define machine_is_apf9328()	(0)
+#endif
+
 #ifdef CONFIG_MACH_PALMT5
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -4077,9 +4157,9 @@  extern unsigned int __machine_arch_type;
 # else
 #  define machine_arch_type	MACH_TYPE_TS209
 # endif
-# define machine_is_ts_x09()	(machine_arch_type == MACH_TYPE_TS209)
+# define machine_is_ts209()	(machine_arch_type == MACH_TYPE_TS209)
 #else
-# define machine_is_ts_x09()	(0)
+# define machine_is_ts209()	(0)
 #endif
 
 #ifdef CONFIG_MACH_AT91CAP9ADK
@@ -4106,6 +4186,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_mx31moboard()	(0)
 #endif
 
+#ifdef CONFIG_MACH_VISION_EP9307
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_VISION_EP9307
+# endif
+# define machine_is_vision_ep9307()	(machine_arch_type == MACH_TYPE_VISION_EP9307)
+#else
+# define machine_is_vision_ep9307()	(0)
+#endif
+
 #ifdef CONFIG_MACH_TERASTATION_PRO2
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -4154,6 +4246,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_ts409()	(0)
 #endif
 
+#ifdef CONFIG_MACH_RSI_EWS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_RSI_EWS
+# endif
+# define machine_is_rsi_ews()	(machine_arch_type == MACH_TYPE_RSI_EWS)
+#else
+# define machine_is_rsi_ews()	(0)
+#endif
+
 #ifdef CONFIG_MACH_CM_X300
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -4670,18 +4774,6 @@  extern unsigned int __machine_arch_type;
 # define machine_is_davinci_da830_evm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AT572D940HFEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT572D940HFEB
-# endif
-# define machine_is_at572d940hfek()	(machine_arch_type == MACH_TYPE_AT572D940HFEB)
-#else
-# define machine_is_at572d940hfek()	(0)
-#endif
-
 #ifdef CONFIG_MACH_DOVE_DB
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -4826,6 +4918,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_at91sam9m10g45ek()	(0)
 #endif
 
+#ifdef CONFIG_MACH_USB_A9G20
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_USB_A9G20
+# endif
+# define machine_is_usb_a9g20()	(machine_arch_type == MACH_TYPE_USB_A9G20)
+#else
+# define machine_is_usb_a9g20()	(0)
+#endif
+
 #ifdef CONFIG_MACH_MXLADS
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -5282,6 +5386,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_mx51_babbage()	(0)
 #endif
 
+#ifdef CONFIG_MACH_TX37
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_TX37
+# endif
+# define machine_is_tx37()	(machine_arch_type == MACH_TYPE_TX37)
+#else
+# define machine_is_tx37()	(0)
+#endif
+
 #ifdef CONFIG_MACH_RD78X00_MASA
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -5402,6 +5518,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_btmawb101()	(0)
 #endif
 
+#ifdef CONFIG_MACH_TX25
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_TX25
+# endif
+# define machine_is_tx25()	(machine_arch_type == MACH_TYPE_TX25)
+#else
+# define machine_is_tx25()	(0)
+#endif
+
 #ifdef CONFIG_MACH_OMAP3_TORPEDO
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -5930,6 +6058,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_tnetv107x()	(0)
 #endif
 
+#ifdef CONFIG_MACH_MX51_M2ID
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_MX51_M2ID
+# endif
+# define machine_is_mx51_m2id()	(machine_arch_type == MACH_TYPE_MX51_M2ID)
+#else
+# define machine_is_mx51_m2id()	(0)
+#endif
+
 #ifdef CONFIG_MACH_SMDKV210
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -6050,6 +6190,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_mini6410()	(0)
 #endif
 
+#ifdef CONFIG_MACH_TX51
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_TX51
+# endif
+# define machine_is_tx51()	(machine_arch_type == MACH_TYPE_TX51)
+#else
+# define machine_is_tx51()	(0)
+#endif
+
 #ifdef CONFIG_MACH_MX28EVK
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -6122,6 +6274,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_riot_x37()	(0)
 #endif
 
+#ifdef CONFIG_MACH_PCA101
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_PCA101
+# endif
+# define machine_is_pca101()	(machine_arch_type == MACH_TYPE_PCA101)
+#else
+# define machine_is_pca101()	(0)
+#endif
+
 #ifdef CONFIG_MACH_CAPC7117
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -6146,6 +6310,18 @@  extern unsigned int __machine_arch_type;
 # define machine_is_icontrol()	(0)
 #endif
 
+#ifdef CONFIG_MACH_GPLUGD
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_GPLUGD
+# endif
+# define machine_is_gplugd()	(machine_arch_type == MACH_TYPE_GPLUGD)
+#else
+# define machine_is_gplugd()	(0)
+#endif
+
 #ifdef CONFIG_MACH_QSD8X50A_ST1_5
 # ifdef machine_arch_type
 #  undef machine_arch_type
@@ -6249,9 +6425,9 @@  extern unsigned int __machine_arch_type;
 # else
 #  define machine_arch_type	MACH_TYPE_ESATA_SHEEVAPLUG
 # endif
-# define machine_is_sheeva_esata()	(machine_arch_type == MACH_TYPE_ESATA_SHEEVAPLUG)
+# define machine_is_esata_sheevaplug()	(machine_arch_type == MACH_TYPE_ESATA_SHEEVAPLUG)
 #else
-# define machine_is_sheeva_esata()	(0)
+# define machine_is_esata_sheevaplug()	(0)
 #endif
 
 #ifdef CONFIG_MACH_MSM7X30_SURF
@@ -6626,7600 +6802,8152 @@  extern unsigned int __machine_arch_type;
 # define machine_is_smdkc210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_BRAILLO
+#ifdef CONFIG_MACH_PCA102
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_BRAILLO
+#  define machine_arch_type	MACH_TYPE_PCA102
 # endif
-# define machine_is_omap3_braillo()	(machine_arch_type == MACH_TYPE_OMAP3_BRAILLO)
+# define machine_is_pca102()	(machine_arch_type == MACH_TYPE_PCA102)
 #else
-# define machine_is_omap3_braillo()	(0)
+# define machine_is_pca102()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPYPLUG
+#ifdef CONFIG_MACH_T5325
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPYPLUG
+#  define machine_arch_type	MACH_TYPE_T5325
 # endif
-# define machine_is_spyplug()	(machine_arch_type == MACH_TYPE_SPYPLUG)
+# define machine_is_t5325()	(machine_arch_type == MACH_TYPE_T5325)
 #else
-# define machine_is_spyplug()	(0)
+# define machine_is_t5325()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GINGER
+#ifdef CONFIG_MACH_INCOME
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GINGER
+#  define machine_arch_type	MACH_TYPE_INCOME
 # endif
-# define machine_is_ginger()	(machine_arch_type == MACH_TYPE_GINGER)
+# define machine_is_income()	(machine_arch_type == MACH_TYPE_INCOME)
 #else
-# define machine_is_ginger()	(0)
+# define machine_is_income()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TNY_T3530
+#ifdef CONFIG_MACH_VVBOX_SDORIG2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TNY_T3530
+#  define machine_arch_type	MACH_TYPE_VVBOX_SDORIG2
 # endif
-# define machine_is_tny_t3530()	(machine_arch_type == MACH_TYPE_TNY_T3530)
+# define machine_is_vvbox_sdorig2()	(machine_arch_type == MACH_TYPE_VVBOX_SDORIG2)
 #else
-# define machine_is_tny_t3530()	(0)
+# define machine_is_vvbox_sdorig2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PCA102
+#ifdef CONFIG_MACH_VVBOX_SDLITE2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PCA102
+#  define machine_arch_type	MACH_TYPE_VVBOX_SDLITE2
 # endif
-# define machine_is_pca102()	(machine_arch_type == MACH_TYPE_PCA102)
+# define machine_is_vvbox_sdlite2()	(machine_arch_type == MACH_TYPE_VVBOX_SDLITE2)
 #else
-# define machine_is_pca102()	(0)
+# define machine_is_vvbox_sdlite2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPADE
+#ifdef CONFIG_MACH_VVBOX_SDPRO4
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPADE
+#  define machine_arch_type	MACH_TYPE_VVBOX_SDPRO4
 # endif
-# define machine_is_spade()	(machine_arch_type == MACH_TYPE_SPADE)
+# define machine_is_vvbox_sdpro4()	(machine_arch_type == MACH_TYPE_VVBOX_SDPRO4)
 #else
-# define machine_is_spade()	(0)
+# define machine_is_vvbox_sdpro4()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MXC25_TOPAZ
+#ifdef CONFIG_MACH_MX257SX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MXC25_TOPAZ
+#  define machine_arch_type	MACH_TYPE_MX257SX
 # endif
-# define machine_is_mxc25_topaz()	(machine_arch_type == MACH_TYPE_MXC25_TOPAZ)
+# define machine_is_mx257sx()	(machine_arch_type == MACH_TYPE_MX257SX)
 #else
-# define machine_is_mxc25_topaz()	(0)
+# define machine_is_mx257sx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_T5325
+#ifdef CONFIG_MACH_GONI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_T5325
+#  define machine_arch_type	MACH_TYPE_GONI
 # endif
-# define machine_is_t5325()	(machine_arch_type == MACH_TYPE_T5325)
+# define machine_is_goni()	(machine_arch_type == MACH_TYPE_GONI)
 #else
-# define machine_is_t5325()	(0)
+# define machine_is_goni()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GW2361
+#ifdef CONFIG_MACH_BV07
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GW2361
+#  define machine_arch_type	MACH_TYPE_BV07
 # endif
-# define machine_is_gw2361()	(machine_arch_type == MACH_TYPE_GW2361)
+# define machine_is_bv07()	(machine_arch_type == MACH_TYPE_BV07)
 #else
-# define machine_is_gw2361()	(0)
+# define machine_is_bv07()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ELOG
+#ifdef CONFIG_MACH_OPENRD_ULTIMATE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ELOG
+#  define machine_arch_type	MACH_TYPE_OPENRD_ULTIMATE
 # endif
-# define machine_is_elog()	(machine_arch_type == MACH_TYPE_ELOG)
+# define machine_is_openrd_ultimate()	(machine_arch_type == MACH_TYPE_OPENRD_ULTIMATE)
 #else
-# define machine_is_elog()	(0)
+# define machine_is_openrd_ultimate()	(0)
 #endif
 
-#ifdef CONFIG_MACH_INCOME
+#ifdef CONFIG_MACH_DEVIXP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_INCOME
+#  define machine_arch_type	MACH_TYPE_DEVIXP
 # endif
-# define machine_is_income()	(machine_arch_type == MACH_TYPE_INCOME)
+# define machine_is_devixp()	(machine_arch_type == MACH_TYPE_DEVIXP)
 #else
-# define machine_is_income()	(0)
+# define machine_is_devixp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BCM589X
+#ifdef CONFIG_MACH_MICCPT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BCM589X
+#  define machine_arch_type	MACH_TYPE_MICCPT
 # endif
-# define machine_is_bcm589x()	(machine_arch_type == MACH_TYPE_BCM589X)
+# define machine_is_miccpt()	(machine_arch_type == MACH_TYPE_MICCPT)
 #else
-# define machine_is_bcm589x()	(0)
+# define machine_is_miccpt()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ETNA
+#ifdef CONFIG_MACH_MIC256
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ETNA
+#  define machine_arch_type	MACH_TYPE_MIC256
 # endif
-# define machine_is_etna()	(machine_arch_type == MACH_TYPE_ETNA)
+# define machine_is_mic256()	(machine_arch_type == MACH_TYPE_MIC256)
 #else
-# define machine_is_etna()	(0)
+# define machine_is_mic256()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HAWKS
+#ifdef CONFIG_MACH_U5500
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HAWKS
+#  define machine_arch_type	MACH_TYPE_U5500
 # endif
-# define machine_is_hawks()	(machine_arch_type == MACH_TYPE_HAWKS)
+# define machine_is_u5500()	(machine_arch_type == MACH_TYPE_U5500)
 #else
-# define machine_is_hawks()	(0)
+# define machine_is_u5500()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MESON
+#ifdef CONFIG_MACH_LINKSTATION_LSCHL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MESON
+#  define machine_arch_type	MACH_TYPE_LINKSTATION_LSCHL
 # endif
-# define machine_is_meson()	(machine_arch_type == MACH_TYPE_MESON)
+# define machine_is_linkstation_lschl()	(machine_arch_type == MACH_TYPE_LINKSTATION_LSCHL)
 #else
-# define machine_is_meson()	(0)
+# define machine_is_linkstation_lschl()	(0)
 #endif
 
-#ifdef CONFIG_MACH_XSBASE255
+#ifdef CONFIG_MACH_SMDKV310
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_XSBASE255
+#  define machine_arch_type	MACH_TYPE_SMDKV310
 # endif
-# define machine_is_xsbase255()	(machine_arch_type == MACH_TYPE_XSBASE255)
+# define machine_is_smdkv310()	(machine_arch_type == MACH_TYPE_SMDKV310)
 #else
-# define machine_is_xsbase255()	(0)
+# define machine_is_smdkv310()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PVM2030
+#ifdef CONFIG_MACH_WM8505_7IN_NETBOOK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PVM2030
+#  define machine_arch_type	MACH_TYPE_WM8505_7IN_NETBOOK
 # endif
-# define machine_is_pvm2030()	(machine_arch_type == MACH_TYPE_PVM2030)
+# define machine_is_wm8505_7in_netbook()	(machine_arch_type == MACH_TYPE_WM8505_7IN_NETBOOK)
 #else
-# define machine_is_pvm2030()	(0)
+# define machine_is_wm8505_7in_netbook()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MIOA502
+#ifdef CONFIG_MACH_CRANEBOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MIOA502
+#  define machine_arch_type	MACH_TYPE_CRANEBOARD
 # endif
-# define machine_is_mioa502()	(machine_arch_type == MACH_TYPE_MIOA502)
+# define machine_is_craneboard()	(machine_arch_type == MACH_TYPE_CRANEBOARD)
 #else
-# define machine_is_mioa502()	(0)
+# define machine_is_craneboard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VVBOX_SDORIG2
+#ifdef CONFIG_MACH_SMDK6450
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VVBOX_SDORIG2
+#  define machine_arch_type	MACH_TYPE_SMDK6450
 # endif
-# define machine_is_vvbox_sdorig2()	(machine_arch_type == MACH_TYPE_VVBOX_SDORIG2)
+# define machine_is_smdk6450()	(machine_arch_type == MACH_TYPE_SMDK6450)
 #else
-# define machine_is_vvbox_sdorig2()	(0)
+# define machine_is_smdk6450()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VVBOX_SDLITE2
+#ifdef CONFIG_MACH_BROWNSTONE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VVBOX_SDLITE2
+#  define machine_arch_type	MACH_TYPE_BROWNSTONE
 # endif
-# define machine_is_vvbox_sdlite2()	(machine_arch_type == MACH_TYPE_VVBOX_SDLITE2)
+# define machine_is_brownstone()	(machine_arch_type == MACH_TYPE_BROWNSTONE)
 #else
-# define machine_is_vvbox_sdlite2()	(0)
+# define machine_is_brownstone()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VVBOX_SDPRO4
+#ifdef CONFIG_MACH_FLEXIBITY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VVBOX_SDPRO4
+#  define machine_arch_type	MACH_TYPE_FLEXIBITY
 # endif
-# define machine_is_vvbox_sdpro4()	(machine_arch_type == MACH_TYPE_VVBOX_SDPRO4)
+# define machine_is_flexibity()	(machine_arch_type == MACH_TYPE_FLEXIBITY)
 #else
-# define machine_is_vvbox_sdpro4()	(0)
+# define machine_is_flexibity()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HTC_SPV_M700
+#ifdef CONFIG_MACH_MX50_RDP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HTC_SPV_M700
+#  define machine_arch_type	MACH_TYPE_MX50_RDP
 # endif
-# define machine_is_htc_spv_m700()	(machine_arch_type == MACH_TYPE_HTC_SPV_M700)
+# define machine_is_mx50_rdp()	(machine_arch_type == MACH_TYPE_MX50_RDP)
 #else
-# define machine_is_htc_spv_m700()	(0)
+# define machine_is_mx50_rdp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX257SX
+#ifdef CONFIG_MACH_UNIVERSAL_C210
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX257SX
+#  define machine_arch_type	MACH_TYPE_UNIVERSAL_C210
 # endif
-# define machine_is_mx257sx()	(machine_arch_type == MACH_TYPE_MX257SX)
+# define machine_is_universal_c210()	(machine_arch_type == MACH_TYPE_UNIVERSAL_C210)
 #else
-# define machine_is_mx257sx()	(0)
+# define machine_is_universal_c210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GONI
+#ifdef CONFIG_MACH_REAL6410
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GONI
+#  define machine_arch_type	MACH_TYPE_REAL6410
 # endif
-# define machine_is_goni()	(machine_arch_type == MACH_TYPE_GONI)
+# define machine_is_real6410()	(machine_arch_type == MACH_TYPE_REAL6410)
 #else
-# define machine_is_goni()	(0)
+# define machine_is_real6410()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X55_SVLTE_FFA
+#ifdef CONFIG_MACH_DOCKSTAR
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X55_SVLTE_FFA
+#  define machine_arch_type	MACH_TYPE_DOCKSTAR
 # endif
-# define machine_is_msm8x55_svlte_ffa()	(machine_arch_type == MACH_TYPE_MSM8X55_SVLTE_FFA)
+# define machine_is_dockstar()	(machine_arch_type == MACH_TYPE_DOCKSTAR)
 #else
-# define machine_is_msm8x55_svlte_ffa()	(0)
+# define machine_is_dockstar()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X55_SVLTE_SURF
+#ifdef CONFIG_MACH_TI8148EVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X55_SVLTE_SURF
+#  define machine_arch_type	MACH_TYPE_TI8148EVM
 # endif
-# define machine_is_msm8x55_svlte_surf()	(machine_arch_type == MACH_TYPE_MSM8X55_SVLTE_SURF)
+# define machine_is_ti8148evm()	(machine_arch_type == MACH_TYPE_TI8148EVM)
 #else
-# define machine_is_msm8x55_svlte_surf()	(0)
+# define machine_is_ti8148evm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_QUICKSTEP
+#ifdef CONFIG_MACH_SEABOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_QUICKSTEP
+#  define machine_arch_type	MACH_TYPE_SEABOARD
 # endif
-# define machine_is_quickstep()	(machine_arch_type == MACH_TYPE_QUICKSTEP)
+# define machine_is_seaboard()	(machine_arch_type == MACH_TYPE_SEABOARD)
 #else
-# define machine_is_quickstep()	(0)
+# define machine_is_seaboard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DMW96
+#ifdef CONFIG_MACH_MX53_ARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DMW96
+#  define machine_arch_type	MACH_TYPE_MX53_ARD
 # endif
-# define machine_is_dmw96()	(machine_arch_type == MACH_TYPE_DMW96)
+# define machine_is_mx53_ard()	(machine_arch_type == MACH_TYPE_MX53_ARD)
 #else
-# define machine_is_dmw96()	(0)
+# define machine_is_mx53_ard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HAMMERHEAD
+#ifdef CONFIG_MACH_MX53_SMD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HAMMERHEAD
+#  define machine_arch_type	MACH_TYPE_MX53_SMD
 # endif
-# define machine_is_hammerhead()	(machine_arch_type == MACH_TYPE_HAMMERHEAD)
+# define machine_is_mx53_smd()	(machine_arch_type == MACH_TYPE_MX53_SMD)
 #else
-# define machine_is_hammerhead()	(0)
+# define machine_is_mx53_smd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TRIDENT
+#ifdef CONFIG_MACH_MSM8X60_RUMI3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TRIDENT
+#  define machine_arch_type	MACH_TYPE_MSM8X60_RUMI3
 # endif
-# define machine_is_trident()	(machine_arch_type == MACH_TYPE_TRIDENT)
+# define machine_is_msm8x60_rumi3()	(machine_arch_type == MACH_TYPE_MSM8X60_RUMI3)
 #else
-# define machine_is_trident()	(0)
+# define machine_is_msm8x60_rumi3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LIGHTNING
+#ifdef CONFIG_MACH_MSM8X60_FFA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LIGHTNING
+#  define machine_arch_type	MACH_TYPE_MSM8X60_FFA
 # endif
-# define machine_is_lightning()	(machine_arch_type == MACH_TYPE_LIGHTNING)
+# define machine_is_msm8x60_ffa()	(machine_arch_type == MACH_TYPE_MSM8X60_FFA)
 #else
-# define machine_is_lightning()	(0)
+# define machine_is_msm8x60_ffa()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ICONNECT
+#ifdef CONFIG_MACH_CM_A510
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ICONNECT
+#  define machine_arch_type	MACH_TYPE_CM_A510
 # endif
-# define machine_is_iconnect()	(machine_arch_type == MACH_TYPE_ICONNECT)
+# define machine_is_cm_a510()	(machine_arch_type == MACH_TYPE_CM_A510)
 #else
-# define machine_is_iconnect()	(0)
+# define machine_is_cm_a510()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AUTOBOT
+#ifdef CONFIG_MACH_TX28
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AUTOBOT
+#  define machine_arch_type	MACH_TYPE_TX28
 # endif
-# define machine_is_autobot()	(machine_arch_type == MACH_TYPE_AUTOBOT)
+# define machine_is_tx28()	(machine_arch_type == MACH_TYPE_TX28)
 #else
-# define machine_is_autobot()	(0)
+# define machine_is_tx28()	(0)
 #endif
 
-#ifdef CONFIG_MACH_COCONUT
+#ifdef CONFIG_MACH_PCONTROL_G20
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_COCONUT
+#  define machine_arch_type	MACH_TYPE_PCONTROL_G20
 # endif
-# define machine_is_coconut()	(machine_arch_type == MACH_TYPE_COCONUT)
+# define machine_is_pcontrol_g20()	(machine_arch_type == MACH_TYPE_PCONTROL_G20)
 #else
-# define machine_is_coconut()	(0)
+# define machine_is_pcontrol_g20()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DURIAN
+#ifdef CONFIG_MACH_VPR200
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DURIAN
+#  define machine_arch_type	MACH_TYPE_VPR200
 # endif
-# define machine_is_durian()	(machine_arch_type == MACH_TYPE_DURIAN)
+# define machine_is_vpr200()	(machine_arch_type == MACH_TYPE_VPR200)
 #else
-# define machine_is_durian()	(0)
+# define machine_is_vpr200()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CAYENNE
+#ifdef CONFIG_MACH_TORBRECK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CAYENNE
+#  define machine_arch_type	MACH_TYPE_TORBRECK
 # endif
-# define machine_is_cayenne()	(machine_arch_type == MACH_TYPE_CAYENNE)
+# define machine_is_torbreck()	(machine_arch_type == MACH_TYPE_TORBRECK)
 #else
-# define machine_is_cayenne()	(0)
+# define machine_is_torbreck()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FUJI
+#ifdef CONFIG_MACH_PRIMA2_EVB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FUJI
+#  define machine_arch_type	MACH_TYPE_PRIMA2_EVB
 # endif
-# define machine_is_fuji()	(machine_arch_type == MACH_TYPE_FUJI)
+# define machine_is_prima2_evb()	(machine_arch_type == MACH_TYPE_PRIMA2_EVB)
 #else
-# define machine_is_fuji()	(0)
+# define machine_is_prima2_evb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SYNOLOGY_6282
+#ifdef CONFIG_MACH_PAZ00
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SYNOLOGY_6282
+#  define machine_arch_type	MACH_TYPE_PAZ00
 # endif
-# define machine_is_synology_6282()	(machine_arch_type == MACH_TYPE_SYNOLOGY_6282)
+# define machine_is_paz00()	(machine_arch_type == MACH_TYPE_PAZ00)
 #else
-# define machine_is_synology_6282()	(0)
+# define machine_is_paz00()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EM1SY
+#ifdef CONFIG_MACH_ACMENETUSFOXG20
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EM1SY
+#  define machine_arch_type	MACH_TYPE_ACMENETUSFOXG20
 # endif
-# define machine_is_em1sy()	(machine_arch_type == MACH_TYPE_EM1SY)
+# define machine_is_acmenetusfoxg20()	(machine_arch_type == MACH_TYPE_ACMENETUSFOXG20)
 #else
-# define machine_is_em1sy()	(0)
+# define machine_is_acmenetusfoxg20()	(0)
 #endif
 
-#ifdef CONFIG_MACH_M502
+#ifdef CONFIG_MACH_AG5EVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_M502
+#  define machine_arch_type	MACH_TYPE_AG5EVM
 # endif
-# define machine_is_m502()	(machine_arch_type == MACH_TYPE_M502)
+# define machine_is_ag5evm()	(machine_arch_type == MACH_TYPE_AG5EVM)
 #else
-# define machine_is_m502()	(0)
+# define machine_is_ag5evm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MATRIX518
+#ifdef CONFIG_MACH_TSUNAGI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MATRIX518
+#  define machine_arch_type	MACH_TYPE_TSUNAGI
 # endif
-# define machine_is_matrix518()	(machine_arch_type == MACH_TYPE_MATRIX518)
+# define machine_is_tsunagi()	(machine_arch_type == MACH_TYPE_TSUNAGI)
 #else
-# define machine_is_matrix518()	(0)
+# define machine_is_tsunagi()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TINY_GURNARD
+#ifdef CONFIG_MACH_ICS_IF_VOIP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TINY_GURNARD
+#  define machine_arch_type	MACH_TYPE_ICS_IF_VOIP
 # endif
-# define machine_is_tiny_gurnard()	(machine_arch_type == MACH_TYPE_TINY_GURNARD)
+# define machine_is_ics_if_voip()	(machine_arch_type == MACH_TYPE_ICS_IF_VOIP)
 #else
-# define machine_is_tiny_gurnard()	(0)
+# define machine_is_ics_if_voip()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPEAR1310
+#ifdef CONFIG_MACH_WLF_CRAGG_6410
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPEAR1310
+#  define machine_arch_type	MACH_TYPE_WLF_CRAGG_6410
 # endif
-# define machine_is_spear1310()	(machine_arch_type == MACH_TYPE_SPEAR1310)
+# define machine_is_wlf_cragg_6410()	(machine_arch_type == MACH_TYPE_WLF_CRAGG_6410)
 #else
-# define machine_is_spear1310()	(0)
+# define machine_is_wlf_cragg_6410()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BV07
+#ifdef CONFIG_MACH_TRIMSLICE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BV07
+#  define machine_arch_type	MACH_TYPE_TRIMSLICE
 # endif
-# define machine_is_bv07()	(machine_arch_type == MACH_TYPE_BV07)
+# define machine_is_trimslice()	(machine_arch_type == MACH_TYPE_TRIMSLICE)
 #else
-# define machine_is_bv07()	(0)
+# define machine_is_trimslice()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MXT_TD61
+#ifdef CONFIG_MACH_MACKEREL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MXT_TD61
+#  define machine_arch_type	MACH_TYPE_MACKEREL
 # endif
-# define machine_is_mxt_td61()	(machine_arch_type == MACH_TYPE_MXT_TD61)
+# define machine_is_mackerel()	(machine_arch_type == MACH_TYPE_MACKEREL)
 #else
-# define machine_is_mxt_td61()	(0)
+# define machine_is_mackerel()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OPENRD_ULTIMATE
+#ifdef CONFIG_MACH_KAEN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OPENRD_ULTIMATE
+#  define machine_arch_type	MACH_TYPE_KAEN
 # endif
-# define machine_is_openrd_ultimate()	(machine_arch_type == MACH_TYPE_OPENRD_ULTIMATE)
+# define machine_is_kaen()	(machine_arch_type == MACH_TYPE_KAEN)
 #else
-# define machine_is_openrd_ultimate()	(0)
+# define machine_is_kaen()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DEVIXP
+#ifdef CONFIG_MACH_NOKIA_RM680
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DEVIXP
+#  define machine_arch_type	MACH_TYPE_NOKIA_RM680
 # endif
-# define machine_is_devixp()	(machine_arch_type == MACH_TYPE_DEVIXP)
+# define machine_is_nokia_rm680()	(machine_arch_type == MACH_TYPE_NOKIA_RM680)
 #else
-# define machine_is_devixp()	(0)
+# define machine_is_nokia_rm680()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MICCPT
+#ifdef CONFIG_MACH_DM6446_ADBOX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MICCPT
+#  define machine_arch_type	MACH_TYPE_DM6446_ADBOX
 # endif
-# define machine_is_miccpt()	(machine_arch_type == MACH_TYPE_MICCPT)
+# define machine_is_dm6446_adbox()	(machine_arch_type == MACH_TYPE_DM6446_ADBOX)
 #else
-# define machine_is_miccpt()	(0)
+# define machine_is_dm6446_adbox()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MIC256
+#ifdef CONFIG_MACH_QUAD_SALSA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MIC256
+#  define machine_arch_type	MACH_TYPE_QUAD_SALSA
 # endif
-# define machine_is_mic256()	(machine_arch_type == MACH_TYPE_MIC256)
+# define machine_is_quad_salsa()	(machine_arch_type == MACH_TYPE_QUAD_SALSA)
 #else
-# define machine_is_mic256()	(0)
+# define machine_is_quad_salsa()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AS1167
+#ifdef CONFIG_MACH_ABB_GMA_1_1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AS1167
+#  define machine_arch_type	MACH_TYPE_ABB_GMA_1_1
 # endif
-# define machine_is_as1167()	(machine_arch_type == MACH_TYPE_AS1167)
+# define machine_is_abb_gma_1_1()	(machine_arch_type == MACH_TYPE_ABB_GMA_1_1)
 #else
-# define machine_is_as1167()	(0)
+# define machine_is_abb_gma_1_1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_IBIZA
+#ifdef CONFIG_MACH_SVCID
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_IBIZA
+#  define machine_arch_type	MACH_TYPE_SVCID
 # endif
-# define machine_is_omap3_ibiza()	(machine_arch_type == MACH_TYPE_OMAP3_IBIZA)
+# define machine_is_svcid()	(machine_arch_type == MACH_TYPE_SVCID)
 #else
-# define machine_is_omap3_ibiza()	(0)
+# define machine_is_svcid()	(0)
 #endif
 
-#ifdef CONFIG_MACH_U5500
+#ifdef CONFIG_MACH_MSM8960_SIM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_U5500
+#  define machine_arch_type	MACH_TYPE_MSM8960_SIM
 # endif
-# define machine_is_u5500()	(machine_arch_type == MACH_TYPE_U5500)
+# define machine_is_msm8960_sim()	(machine_arch_type == MACH_TYPE_MSM8960_SIM)
 #else
-# define machine_is_u5500()	(0)
+# define machine_is_msm8960_sim()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DAVINCI_PICTO
+#ifdef CONFIG_MACH_MSM8960_RUMI3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_PICTO
+#  define machine_arch_type	MACH_TYPE_MSM8960_RUMI3
 # endif
-# define machine_is_davinci_picto()	(machine_arch_type == MACH_TYPE_DAVINCI_PICTO)
+# define machine_is_msm8960_rumi3()	(machine_arch_type == MACH_TYPE_MSM8960_RUMI3)
 #else
-# define machine_is_davinci_picto()	(0)
+# define machine_is_msm8960_rumi3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MECHA
+#ifdef CONFIG_MACH_ICON_G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MECHA
+#  define machine_arch_type	MACH_TYPE_ICON_G
 # endif
-# define machine_is_mecha()	(machine_arch_type == MACH_TYPE_MECHA)
+# define machine_is_icon_g()	(machine_arch_type == MACH_TYPE_ICON_G)
 #else
-# define machine_is_mecha()	(0)
+# define machine_is_icon_g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BUBBA3
+#ifdef CONFIG_MACH_MB3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BUBBA3
+#  define machine_arch_type	MACH_TYPE_MB3
 # endif
-# define machine_is_bubba3()	(machine_arch_type == MACH_TYPE_BUBBA3)
+# define machine_is_mb3()	(machine_arch_type == MACH_TYPE_MB3)
 #else
-# define machine_is_bubba3()	(0)
+# define machine_is_mb3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PUPITRE
+#ifdef CONFIG_MACH_GSIA18S
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PUPITRE
+#  define machine_arch_type	MACH_TYPE_GSIA18S
 # endif
-# define machine_is_pupitre()	(machine_arch_type == MACH_TYPE_PUPITRE)
+# define machine_is_gsia18s()	(machine_arch_type == MACH_TYPE_GSIA18S)
 #else
-# define machine_is_pupitre()	(0)
+# define machine_is_gsia18s()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TEGRA_VOGUE
+#ifdef CONFIG_MACH_PIVICC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TEGRA_VOGUE
+#  define machine_arch_type	MACH_TYPE_PIVICC
 # endif
-# define machine_is_tegra_vogue()	(machine_arch_type == MACH_TYPE_TEGRA_VOGUE)
+# define machine_is_pivicc()	(machine_arch_type == MACH_TYPE_PIVICC)
 #else
-# define machine_is_tegra_vogue()	(0)
+# define machine_is_pivicc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TEGRA_E1165
+#ifdef CONFIG_MACH_PCM048
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TEGRA_E1165
+#  define machine_arch_type	MACH_TYPE_PCM048
 # endif
-# define machine_is_tegra_e1165()	(machine_arch_type == MACH_TYPE_TEGRA_E1165)
+# define machine_is_pcm048()	(machine_arch_type == MACH_TYPE_PCM048)
 #else
-# define machine_is_tegra_e1165()	(0)
+# define machine_is_pcm048()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SIMPLENET
+#ifdef CONFIG_MACH_DDS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SIMPLENET
+#  define machine_arch_type	MACH_TYPE_DDS
 # endif
-# define machine_is_simplenet()	(machine_arch_type == MACH_TYPE_SIMPLENET)
+# define machine_is_dds()	(machine_arch_type == MACH_TYPE_DDS)
 #else
-# define machine_is_simplenet()	(0)
+# define machine_is_dds()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EC4350TBM
+#ifdef CONFIG_MACH_CHALTEN_XA1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EC4350TBM
+#  define machine_arch_type	MACH_TYPE_CHALTEN_XA1
 # endif
-# define machine_is_ec4350tbm()	(machine_arch_type == MACH_TYPE_EC4350TBM)
+# define machine_is_chalten_xa1()	(machine_arch_type == MACH_TYPE_CHALTEN_XA1)
 #else
-# define machine_is_ec4350tbm()	(0)
+# define machine_is_chalten_xa1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PEC_TC
+#ifdef CONFIG_MACH_TS48XX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PEC_TC
+#  define machine_arch_type	MACH_TYPE_TS48XX
 # endif
-# define machine_is_pec_tc()	(machine_arch_type == MACH_TYPE_PEC_TC)
+# define machine_is_ts48xx()	(machine_arch_type == MACH_TYPE_TS48XX)
 #else
-# define machine_is_pec_tc()	(0)
+# define machine_is_ts48xx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PEC_HC2
+#ifdef CONFIG_MACH_TONGA2_TFTTIMER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PEC_HC2
+#  define machine_arch_type	MACH_TYPE_TONGA2_TFTTIMER
 # endif
-# define machine_is_pec_hc2()	(machine_arch_type == MACH_TYPE_PEC_HC2)
+# define machine_is_tonga2_tfttimer()	(machine_arch_type == MACH_TYPE_TONGA2_TFTTIMER)
 #else
-# define machine_is_pec_hc2()	(0)
+# define machine_is_tonga2_tfttimer()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ESL_MOBILIS_A
+#ifdef CONFIG_MACH_WHISTLER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ESL_MOBILIS_A
+#  define machine_arch_type	MACH_TYPE_WHISTLER
 # endif
-# define machine_is_esl_mobilis_a()	(machine_arch_type == MACH_TYPE_ESL_MOBILIS_A)
+# define machine_is_whistler()	(machine_arch_type == MACH_TYPE_WHISTLER)
 #else
-# define machine_is_esl_mobilis_a()	(0)
+# define machine_is_whistler()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ESL_MOBILIS_B
+#ifdef CONFIG_MACH_ASL_PHOENIX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ESL_MOBILIS_B
+#  define machine_arch_type	MACH_TYPE_ASL_PHOENIX
 # endif
-# define machine_is_esl_mobilis_b()	(machine_arch_type == MACH_TYPE_ESL_MOBILIS_B)
+# define machine_is_asl_phoenix()	(machine_arch_type == MACH_TYPE_ASL_PHOENIX)
 #else
-# define machine_is_esl_mobilis_b()	(0)
+# define machine_is_asl_phoenix()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ESL_WAVE_A
+#ifdef CONFIG_MACH_AT91SAM9263OTLITE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ESL_WAVE_A
+#  define machine_arch_type	MACH_TYPE_AT91SAM9263OTLITE
 # endif
-# define machine_is_esl_wave_a()	(machine_arch_type == MACH_TYPE_ESL_WAVE_A)
+# define machine_is_at91sam9263otlite()	(machine_arch_type == MACH_TYPE_AT91SAM9263OTLITE)
 #else
-# define machine_is_esl_wave_a()	(0)
+# define machine_is_at91sam9263otlite()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ESL_WAVE_B
+#ifdef CONFIG_MACH_DDPLUG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ESL_WAVE_B
+#  define machine_arch_type	MACH_TYPE_DDPLUG
 # endif
-# define machine_is_esl_wave_b()	(machine_arch_type == MACH_TYPE_ESL_WAVE_B)
+# define machine_is_ddplug()	(machine_arch_type == MACH_TYPE_DDPLUG)
 #else
-# define machine_is_esl_wave_b()	(0)
+# define machine_is_ddplug()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UNISENSE_MMM
+#ifdef CONFIG_MACH_D2PLUG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UNISENSE_MMM
+#  define machine_arch_type	MACH_TYPE_D2PLUG
 # endif
-# define machine_is_unisense_mmm()	(machine_arch_type == MACH_TYPE_UNISENSE_MMM)
+# define machine_is_d2plug()	(machine_arch_type == MACH_TYPE_D2PLUG)
 #else
-# define machine_is_unisense_mmm()	(0)
+# define machine_is_d2plug()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BLUESHARK
+#ifdef CONFIG_MACH_KZM9D
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BLUESHARK
+#  define machine_arch_type	MACH_TYPE_KZM9D
 # endif
-# define machine_is_blueshark()	(machine_arch_type == MACH_TYPE_BLUESHARK)
+# define machine_is_kzm9d()	(machine_arch_type == MACH_TYPE_KZM9D)
 #else
-# define machine_is_blueshark()	(0)
+# define machine_is_kzm9d()	(0)
 #endif
 
-#ifdef CONFIG_MACH_E10
+#ifdef CONFIG_MACH_VERDI_LTE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_E10
+#  define machine_arch_type	MACH_TYPE_VERDI_LTE
 # endif
-# define machine_is_e10()	(machine_arch_type == MACH_TYPE_E10)
+# define machine_is_verdi_lte()	(machine_arch_type == MACH_TYPE_VERDI_LTE)
 #else
-# define machine_is_e10()	(0)
+# define machine_is_verdi_lte()	(0)
 #endif
 
-#ifdef CONFIG_MACH_APP3K_ROBIN
+#ifdef CONFIG_MACH_NANOZOOM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_APP3K_ROBIN
+#  define machine_arch_type	MACH_TYPE_NANOZOOM
 # endif
-# define machine_is_app3k_robin()	(machine_arch_type == MACH_TYPE_APP3K_ROBIN)
+# define machine_is_nanozoom()	(machine_arch_type == MACH_TYPE_NANOZOOM)
 #else
-# define machine_is_app3k_robin()	(0)
+# define machine_is_nanozoom()	(0)
 #endif
 
-#ifdef CONFIG_MACH_POV15HD
+#ifdef CONFIG_MACH_DM3730_SOM_LV
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_POV15HD
+#  define machine_arch_type	MACH_TYPE_DM3730_SOM_LV
 # endif
-# define machine_is_pov15hd()	(machine_arch_type == MACH_TYPE_POV15HD)
+# define machine_is_dm3730_som_lv()	(machine_arch_type == MACH_TYPE_DM3730_SOM_LV)
 #else
-# define machine_is_pov15hd()	(0)
+# define machine_is_dm3730_som_lv()	(0)
 #endif
 
-#ifdef CONFIG_MACH_STELLA
+#ifdef CONFIG_MACH_DM3730_TORPEDO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_STELLA
+#  define machine_arch_type	MACH_TYPE_DM3730_TORPEDO
 # endif
-# define machine_is_stella()	(machine_arch_type == MACH_TYPE_STELLA)
+# define machine_is_dm3730_torpedo()	(machine_arch_type == MACH_TYPE_DM3730_TORPEDO)
 #else
-# define machine_is_stella()	(0)
+# define machine_is_dm3730_torpedo()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LINKSTATION_LSCHL
+#ifdef CONFIG_MACH_ANCHOVY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LINKSTATION_LSCHL
+#  define machine_arch_type	MACH_TYPE_ANCHOVY
 # endif
-# define machine_is_linkstation_lschl()	(machine_arch_type == MACH_TYPE_LINKSTATION_LSCHL)
+# define machine_is_anchovy()	(machine_arch_type == MACH_TYPE_ANCHOVY)
 #else
-# define machine_is_linkstation_lschl()	(0)
+# define machine_is_anchovy()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NETWALKER
+#ifdef CONFIG_MACH_RE2REV20
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NETWALKER
+#  define machine_arch_type	MACH_TYPE_RE2REV20
 # endif
-# define machine_is_netwalker()	(machine_arch_type == MACH_TYPE_NETWALKER)
+# define machine_is_re2rev20()	(machine_arch_type == MACH_TYPE_RE2REV20)
 #else
-# define machine_is_netwalker()	(0)
+# define machine_is_re2rev20()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACSX106
+#ifdef CONFIG_MACH_RE2REV21
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACSX106
+#  define machine_arch_type	MACH_TYPE_RE2REV21
 # endif
-# define machine_is_acsx106()	(machine_arch_type == MACH_TYPE_ACSX106)
+# define machine_is_re2rev21()	(machine_arch_type == MACH_TYPE_RE2REV21)
 #else
-# define machine_is_acsx106()	(0)
+# define machine_is_re2rev21()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ATLAS5_C1
+#ifdef CONFIG_MACH_CNS21XX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ATLAS5_C1
+#  define machine_arch_type	MACH_TYPE_CNS21XX
 # endif
-# define machine_is_atlas5_c1()	(machine_arch_type == MACH_TYPE_ATLAS5_C1)
+# define machine_is_cns21xx()	(machine_arch_type == MACH_TYPE_CNS21XX)
 #else
-# define machine_is_atlas5_c1()	(0)
+# define machine_is_cns21xx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NSB3AST
+#ifdef CONFIG_MACH_RIDER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NSB3AST
+#  define machine_arch_type	MACH_TYPE_RIDER
 # endif
-# define machine_is_nsb3ast()	(machine_arch_type == MACH_TYPE_NSB3AST)
+# define machine_is_rider()	(machine_arch_type == MACH_TYPE_RIDER)
 #else
-# define machine_is_nsb3ast()	(0)
+# define machine_is_rider()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GNET_SLC
+#ifdef CONFIG_MACH_NSK330
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GNET_SLC
+#  define machine_arch_type	MACH_TYPE_NSK330
 # endif
-# define machine_is_gnet_slc()	(machine_arch_type == MACH_TYPE_GNET_SLC)
+# define machine_is_nsk330()	(machine_arch_type == MACH_TYPE_NSK330)
 #else
-# define machine_is_gnet_slc()	(0)
+# define machine_is_nsk330()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AF4000
+#ifdef CONFIG_MACH_CNS2133EVB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AF4000
+#  define machine_arch_type	MACH_TYPE_CNS2133EVB
 # endif
-# define machine_is_af4000()	(machine_arch_type == MACH_TYPE_AF4000)
+# define machine_is_cns2133evb()	(machine_arch_type == MACH_TYPE_CNS2133EVB)
 #else
-# define machine_is_af4000()	(0)
+# define machine_is_cns2133evb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARK9431
+#ifdef CONFIG_MACH_Z3_816X_MOD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARK9431
+#  define machine_arch_type	MACH_TYPE_Z3_816X_MOD
 # endif
-# define machine_is_ark9431()	(machine_arch_type == MACH_TYPE_ARK9431)
+# define machine_is_z3_816x_mod()	(machine_arch_type == MACH_TYPE_Z3_816X_MOD)
 #else
-# define machine_is_ark9431()	(0)
+# define machine_is_z3_816x_mod()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FS_S5PC100
+#ifdef CONFIG_MACH_Z3_814X_MOD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FS_S5PC100
+#  define machine_arch_type	MACH_TYPE_Z3_814X_MOD
 # endif
-# define machine_is_fs_s5pc100()	(machine_arch_type == MACH_TYPE_FS_S5PC100)
+# define machine_is_z3_814x_mod()	(machine_arch_type == MACH_TYPE_Z3_814X_MOD)
 #else
-# define machine_is_fs_s5pc100()	(0)
+# define machine_is_z3_814x_mod()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3505NOVA8
+#ifdef CONFIG_MACH_BEECT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3505NOVA8
+#  define machine_arch_type	MACH_TYPE_BEECT
 # endif
-# define machine_is_omap3505nova8()	(machine_arch_type == MACH_TYPE_OMAP3505NOVA8)
+# define machine_is_beect()	(machine_arch_type == MACH_TYPE_BEECT)
 #else
-# define machine_is_omap3505nova8()	(0)
+# define machine_is_beect()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3621_EDP1
+#ifdef CONFIG_MACH_DMA_THUNDERBUG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3621_EDP1
+#  define machine_arch_type	MACH_TYPE_DMA_THUNDERBUG
 # endif
-# define machine_is_omap3621_edp1()	(machine_arch_type == MACH_TYPE_OMAP3621_EDP1)
+# define machine_is_dma_thunderbug()	(machine_arch_type == MACH_TYPE_DMA_THUNDERBUG)
 #else
-# define machine_is_omap3621_edp1()	(0)
+# define machine_is_dma_thunderbug()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ORATISAES
+#ifdef CONFIG_MACH_OMN_AT91SAM9G20
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ORATISAES
+#  define machine_arch_type	MACH_TYPE_OMN_AT91SAM9G20
 # endif
-# define machine_is_oratisaes()	(machine_arch_type == MACH_TYPE_ORATISAES)
+# define machine_is_omn_at91sam9g20()	(machine_arch_type == MACH_TYPE_OMN_AT91SAM9G20)
 #else
-# define machine_is_oratisaes()	(0)
+# define machine_is_omn_at91sam9g20()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SMDKV310
+#ifdef CONFIG_MACH_MX25_E2S_UC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SMDKV310
+#  define machine_arch_type	MACH_TYPE_MX25_E2S_UC
 # endif
-# define machine_is_smdkv310()	(machine_arch_type == MACH_TYPE_SMDKV310)
+# define machine_is_mx25_e2s_uc()	(machine_arch_type == MACH_TYPE_MX25_E2S_UC)
 #else
-# define machine_is_smdkv310()	(0)
+# define machine_is_mx25_e2s_uc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SIEMENS_L0
+#ifdef CONFIG_MACH_MIONE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SIEMENS_L0
+#  define machine_arch_type	MACH_TYPE_MIONE
 # endif
-# define machine_is_siemens_l0()	(machine_arch_type == MACH_TYPE_SIEMENS_L0)
+# define machine_is_mione()	(machine_arch_type == MACH_TYPE_MIONE)
 #else
-# define machine_is_siemens_l0()	(0)
+# define machine_is_mione()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VENTANA
+#ifdef CONFIG_MACH_TOP9000_TCU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VENTANA
+#  define machine_arch_type	MACH_TYPE_TOP9000_TCU
 # endif
-# define machine_is_ventana()	(machine_arch_type == MACH_TYPE_VENTANA)
+# define machine_is_top9000_tcu()	(machine_arch_type == MACH_TYPE_TOP9000_TCU)
 #else
-# define machine_is_ventana()	(0)
+# define machine_is_top9000_tcu()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WM8505_7IN_NETBOOK
+#ifdef CONFIG_MACH_TOP9000_BSL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WM8505_7IN_NETBOOK
+#  define machine_arch_type	MACH_TYPE_TOP9000_BSL
 # endif
-# define machine_is_wm8505_7in_netbook()	(machine_arch_type == MACH_TYPE_WM8505_7IN_NETBOOK)
+# define machine_is_top9000_bsl()	(machine_arch_type == MACH_TYPE_TOP9000_BSL)
 #else
-# define machine_is_wm8505_7in_netbook()	(0)
+# define machine_is_top9000_bsl()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EC4350SDB
+#ifdef CONFIG_MACH_KINGDOM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EC4350SDB
+#  define machine_arch_type	MACH_TYPE_KINGDOM
 # endif
-# define machine_is_ec4350sdb()	(machine_arch_type == MACH_TYPE_EC4350SDB)
+# define machine_is_kingdom()	(machine_arch_type == MACH_TYPE_KINGDOM)
 #else
-# define machine_is_ec4350sdb()	(0)
+# define machine_is_kingdom()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MIMAS
+#ifdef CONFIG_MACH_ARMADILLO460
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MIMAS
+#  define machine_arch_type	MACH_TYPE_ARMADILLO460
 # endif
-# define machine_is_mimas()	(machine_arch_type == MACH_TYPE_MIMAS)
+# define machine_is_armadillo460()	(machine_arch_type == MACH_TYPE_ARMADILLO460)
 #else
-# define machine_is_mimas()	(0)
+# define machine_is_armadillo460()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TITAN
+#ifdef CONFIG_MACH_LQ2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TITAN
+#  define machine_arch_type	MACH_TYPE_LQ2
 # endif
-# define machine_is_titan()	(machine_arch_type == MACH_TYPE_TITAN)
+# define machine_is_lq2()	(machine_arch_type == MACH_TYPE_LQ2)
 #else
-# define machine_is_titan()	(0)
+# define machine_is_lq2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CRANEBOARD
+#ifdef CONFIG_MACH_SWEDA_TMS2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CRANEBOARD
+#  define machine_arch_type	MACH_TYPE_SWEDA_TMS2
 # endif
-# define machine_is_craneboard()	(machine_arch_type == MACH_TYPE_CRANEBOARD)
+# define machine_is_sweda_tms2()	(machine_arch_type == MACH_TYPE_SWEDA_TMS2)
 #else
-# define machine_is_craneboard()	(0)
+# define machine_is_sweda_tms2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ES2440
+#ifdef CONFIG_MACH_MX53_LOCO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ES2440
+#  define machine_arch_type	MACH_TYPE_MX53_LOCO
 # endif
-# define machine_is_es2440()	(machine_arch_type == MACH_TYPE_ES2440)
+# define machine_is_mx53_loco()	(machine_arch_type == MACH_TYPE_MX53_LOCO)
 #else
-# define machine_is_es2440()	(0)
+# define machine_is_mx53_loco()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NAJAY_A9263
+#ifdef CONFIG_MACH_ACER_A8
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NAJAY_A9263
+#  define machine_arch_type	MACH_TYPE_ACER_A8
 # endif
-# define machine_is_najay_a9263()	(machine_arch_type == MACH_TYPE_NAJAY_A9263)
+# define machine_is_acer_a8()	(machine_arch_type == MACH_TYPE_ACER_A8)
 #else
-# define machine_is_najay_a9263()	(0)
+# define machine_is_acer_a8()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HTCTORNADO
+#ifdef CONFIG_MACH_ACER_GAUGUIN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HTCTORNADO
+#  define machine_arch_type	MACH_TYPE_ACER_GAUGUIN
 # endif
-# define machine_is_htctornado()	(machine_arch_type == MACH_TYPE_HTCTORNADO)
+# define machine_is_acer_gauguin()	(machine_arch_type == MACH_TYPE_ACER_GAUGUIN)
 #else
-# define machine_is_htctornado()	(0)
+# define machine_is_acer_gauguin()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DIMM_MX257
+#ifdef CONFIG_MACH_GUPPY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DIMM_MX257
+#  define machine_arch_type	MACH_TYPE_GUPPY
 # endif
-# define machine_is_dimm_mx257()	(machine_arch_type == MACH_TYPE_DIMM_MX257)
+# define machine_is_guppy()	(machine_arch_type == MACH_TYPE_GUPPY)
 #else
-# define machine_is_dimm_mx257()	(0)
+# define machine_is_guppy()	(0)
 #endif
 
-#ifdef CONFIG_MACH_JIGEN
+#ifdef CONFIG_MACH_MX61_ARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_JIGEN
+#  define machine_arch_type	MACH_TYPE_MX61_ARD
 # endif
-# define machine_is_jigen301()	(machine_arch_type == MACH_TYPE_JIGEN)
+# define machine_is_mx61_ard()	(machine_arch_type == MACH_TYPE_MX61_ARD)
 #else
-# define machine_is_jigen301()	(0)
+# define machine_is_mx61_ard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SMDK6450
+#ifdef CONFIG_MACH_TX53
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SMDK6450
+#  define machine_arch_type	MACH_TYPE_TX53
 # endif
-# define machine_is_smdk6450()	(machine_arch_type == MACH_TYPE_SMDK6450)
+# define machine_is_tx53()	(machine_arch_type == MACH_TYPE_TX53)
 #else
-# define machine_is_smdk6450()	(0)
+# define machine_is_tx53()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MENO_QNG
+#ifdef CONFIG_MACH_OMAPL138_CASE_A3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MENO_QNG
+#  define machine_arch_type	MACH_TYPE_OMAPL138_CASE_A3
 # endif
-# define machine_is_meno_qng()	(machine_arch_type == MACH_TYPE_MENO_QNG)
+# define machine_is_omapl138_case_a3()	(machine_arch_type == MACH_TYPE_OMAPL138_CASE_A3)
 #else
-# define machine_is_meno_qng()	(0)
+# define machine_is_omapl138_case_a3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NS2416
+#ifdef CONFIG_MACH_UEMD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NS2416
+#  define machine_arch_type	MACH_TYPE_UEMD
 # endif
-# define machine_is_ns2416()	(machine_arch_type == MACH_TYPE_NS2416)
+# define machine_is_uemd()	(machine_arch_type == MACH_TYPE_UEMD)
 #else
-# define machine_is_ns2416()	(0)
+# define machine_is_uemd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RPC353
+#ifdef CONFIG_MACH_CCWMX51MUT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RPC353
+#  define machine_arch_type	MACH_TYPE_CCWMX51MUT
 # endif
-# define machine_is_rpc353()	(machine_arch_type == MACH_TYPE_RPC353)
+# define machine_is_ccwmx51mut()	(machine_arch_type == MACH_TYPE_CCWMX51MUT)
 #else
-# define machine_is_rpc353()	(0)
+# define machine_is_ccwmx51mut()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TQ6410
+#ifdef CONFIG_MACH_ROCKHOPPER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TQ6410
+#  define machine_arch_type	MACH_TYPE_ROCKHOPPER
 # endif
-# define machine_is_tq6410()	(machine_arch_type == MACH_TYPE_TQ6410)
+# define machine_is_rockhopper()	(machine_arch_type == MACH_TYPE_ROCKHOPPER)
 #else
-# define machine_is_tq6410()	(0)
+# define machine_is_rockhopper()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SKY6410
+#ifdef CONFIG_MACH_ENCORE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SKY6410
+#  define machine_arch_type	MACH_TYPE_ENCORE
 # endif
-# define machine_is_sky6410()	(machine_arch_type == MACH_TYPE_SKY6410)
+# define machine_is_encore()	(machine_arch_type == MACH_TYPE_ENCORE)
 #else
-# define machine_is_sky6410()	(0)
+# define machine_is_encore()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DYNASTY
+#ifdef CONFIG_MACH_HKDKC100
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DYNASTY
+#  define machine_arch_type	MACH_TYPE_HKDKC100
 # endif
-# define machine_is_dynasty()	(machine_arch_type == MACH_TYPE_DYNASTY)
+# define machine_is_hkdkc100()	(machine_arch_type == MACH_TYPE_HKDKC100)
 #else
-# define machine_is_dynasty()	(0)
+# define machine_is_hkdkc100()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VIVO
+#ifdef CONFIG_MACH_TS42XX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VIVO
+#  define machine_arch_type	MACH_TYPE_TS42XX
 # endif
-# define machine_is_vivo()	(machine_arch_type == MACH_TYPE_VIVO)
+# define machine_is_ts42xx()	(machine_arch_type == MACH_TYPE_TS42XX)
 #else
-# define machine_is_vivo()	(0)
+# define machine_is_ts42xx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BURY_BL7582
+#ifdef CONFIG_MACH_AEBL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BURY_BL7582
+#  define machine_arch_type	MACH_TYPE_AEBL
 # endif
-# define machine_is_bury_bl7582()	(machine_arch_type == MACH_TYPE_BURY_BL7582)
+# define machine_is_aebl()	(machine_arch_type == MACH_TYPE_AEBL)
 #else
-# define machine_is_bury_bl7582()	(0)
+# define machine_is_aebl()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BURY_BPS5270
+#ifdef CONFIG_MACH_WARIO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BURY_BPS5270
+#  define machine_arch_type	MACH_TYPE_WARIO
 # endif
-# define machine_is_bury_bps5270()	(machine_arch_type == MACH_TYPE_BURY_BPS5270)
+# define machine_is_wario()	(machine_arch_type == MACH_TYPE_WARIO)
 #else
-# define machine_is_bury_bps5270()	(0)
+# define machine_is_wario()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BASI
+#ifdef CONFIG_MACH_GFS_SPM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BASI
+#  define machine_arch_type	MACH_TYPE_GFS_SPM
 # endif
-# define machine_is_basi()	(machine_arch_type == MACH_TYPE_BASI)
+# define machine_is_gfs_spm()	(machine_arch_type == MACH_TYPE_GFS_SPM)
 #else
-# define machine_is_basi()	(0)
+# define machine_is_gfs_spm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TN200
+#ifdef CONFIG_MACH_CM_T3730
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TN200
+#  define machine_arch_type	MACH_TYPE_CM_T3730
 # endif
-# define machine_is_tn200()	(machine_arch_type == MACH_TYPE_TN200)
+# define machine_is_cm_t3730()	(machine_arch_type == MACH_TYPE_CM_T3730)
 #else
-# define machine_is_tn200()	(0)
+# define machine_is_cm_t3730()	(0)
 #endif
 
-#ifdef CONFIG_MACH_C2MMI
+#ifdef CONFIG_MACH_ISC3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_C2MMI
+#  define machine_arch_type	MACH_TYPE_ISC3
 # endif
-# define machine_is_c2mmi()	(machine_arch_type == MACH_TYPE_C2MMI)
+# define machine_is_isc3()	(machine_arch_type == MACH_TYPE_ISC3)
 #else
-# define machine_is_c2mmi()	(0)
+# define machine_is_isc3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MESON_6236M
+#ifdef CONFIG_MACH_RASCAL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MESON_6236M
+#  define machine_arch_type	MACH_TYPE_RASCAL
 # endif
-# define machine_is_meson_6236m()	(machine_arch_type == MACH_TYPE_MESON_6236M)
+# define machine_is_rascal()	(machine_arch_type == MACH_TYPE_RASCAL)
 #else
-# define machine_is_meson_6236m()	(0)
+# define machine_is_rascal()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MESON_8626M
+#ifdef CONFIG_MACH_HREFV60
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MESON_8626M
+#  define machine_arch_type	MACH_TYPE_HREFV60
 # endif
-# define machine_is_meson_8626m()	(machine_arch_type == MACH_TYPE_MESON_8626M)
+# define machine_is_hrefv60()	(machine_arch_type == MACH_TYPE_HREFV60)
 #else
-# define machine_is_meson_8626m()	(0)
+# define machine_is_hrefv60()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TUBE
+#ifdef CONFIG_MACH_TPT_2_0
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TUBE
+#  define machine_arch_type	MACH_TYPE_TPT_2_0
 # endif
-# define machine_is_tube()	(machine_arch_type == MACH_TYPE_TUBE)
+# define machine_is_tpt_2_0()	(machine_arch_type == MACH_TYPE_TPT_2_0)
 #else
-# define machine_is_tube()	(0)
+# define machine_is_tpt_2_0()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MESSINA
+#ifdef CONFIG_MACH_SPLENDOR
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MESSINA
+#  define machine_arch_type	MACH_TYPE_SPLENDOR
 # endif
-# define machine_is_messina()	(machine_arch_type == MACH_TYPE_MESSINA)
+# define machine_is_splendor()	(machine_arch_type == MACH_TYPE_SPLENDOR)
 #else
-# define machine_is_messina()	(0)
+# define machine_is_splendor()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX50_ARM2
+#ifdef CONFIG_MACH_MSM8X60_QT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX50_ARM2
+#  define machine_arch_type	MACH_TYPE_MSM8X60_QT
 # endif
-# define machine_is_mx50_arm2()	(machine_arch_type == MACH_TYPE_MX50_ARM2)
+# define machine_is_msm8x60_qt()	(machine_arch_type == MACH_TYPE_MSM8X60_QT)
 #else
-# define machine_is_mx50_arm2()	(0)
+# define machine_is_msm8x60_qt()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CETUS9263
+#ifdef CONFIG_MACH_HTC_HD_MINI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CETUS9263
+#  define machine_arch_type	MACH_TYPE_HTC_HD_MINI
 # endif
-# define machine_is_cetus9263()	(machine_arch_type == MACH_TYPE_CETUS9263)
+# define machine_is_htc_hd_mini()	(machine_arch_type == MACH_TYPE_HTC_HD_MINI)
 #else
-# define machine_is_cetus9263()	(0)
+# define machine_is_htc_hd_mini()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BROWNSTONE
+#ifdef CONFIG_MACH_ATHENE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BROWNSTONE
+#  define machine_arch_type	MACH_TYPE_ATHENE
 # endif
-# define machine_is_brownstone()	(machine_arch_type == MACH_TYPE_BROWNSTONE)
+# define machine_is_athene()	(machine_arch_type == MACH_TYPE_ATHENE)
 #else
-# define machine_is_brownstone()	(0)
+# define machine_is_athene()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VMX25
+#ifdef CONFIG_MACH_DEEP_R_EK_1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VMX25
+#  define machine_arch_type	MACH_TYPE_DEEP_R_EK_1
 # endif
-# define machine_is_vmx25()	(machine_arch_type == MACH_TYPE_VMX25)
+# define machine_is_deep_r_ek_1()	(machine_arch_type == MACH_TYPE_DEEP_R_EK_1)
 #else
-# define machine_is_vmx25()	(0)
+# define machine_is_deep_r_ek_1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VMX51
+#ifdef CONFIG_MACH_VIVOW_CT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VMX51
+#  define machine_arch_type	MACH_TYPE_VIVOW_CT
 # endif
-# define machine_is_vmx51()	(machine_arch_type == MACH_TYPE_VMX51)
+# define machine_is_vivow_ct()	(machine_arch_type == MACH_TYPE_VIVOW_CT)
 #else
-# define machine_is_vmx51()	(0)
+# define machine_is_vivow_ct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ABACUS
+#ifdef CONFIG_MACH_NERY_1000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ABACUS
+#  define machine_arch_type	MACH_TYPE_NERY_1000
 # endif
-# define machine_is_abacus()	(machine_arch_type == MACH_TYPE_ABACUS)
+# define machine_is_nery_1000()	(machine_arch_type == MACH_TYPE_NERY_1000)
 #else
-# define machine_is_abacus()	(0)
+# define machine_is_nery_1000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CM4745
+#ifdef CONFIG_MACH_RFL109145_SSRV
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CM4745
+#  define machine_arch_type	MACH_TYPE_RFL109145_SSRV
 # endif
-# define machine_is_cm4745()	(machine_arch_type == MACH_TYPE_CM4745)
+# define machine_is_rfl109145_ssrv()	(machine_arch_type == MACH_TYPE_RFL109145_SSRV)
 #else
-# define machine_is_cm4745()	(0)
+# define machine_is_rfl109145_ssrv()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ORATISLINK
+#ifdef CONFIG_MACH_NMH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ORATISLINK
+#  define machine_arch_type	MACH_TYPE_NMH
 # endif
-# define machine_is_oratislink()	(machine_arch_type == MACH_TYPE_ORATISLINK)
+# define machine_is_nmh()	(machine_arch_type == MACH_TYPE_NMH)
 #else
-# define machine_is_oratislink()	(0)
+# define machine_is_nmh()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DAVINCI_DM365_DVR
+#ifdef CONFIG_MACH_WN802T
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM365_DVR
+#  define machine_arch_type	MACH_TYPE_WN802T
 # endif
-# define machine_is_davinci_dm365_dvr()	(machine_arch_type == MACH_TYPE_DAVINCI_DM365_DVR)
+# define machine_is_wn802t()	(machine_arch_type == MACH_TYPE_WN802T)
 #else
-# define machine_is_davinci_dm365_dvr()	(0)
+# define machine_is_wn802t()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NETVIZ
+#ifdef CONFIG_MACH_DRAGONET
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NETVIZ
+#  define machine_arch_type	MACH_TYPE_DRAGONET
 # endif
-# define machine_is_netviz()	(machine_arch_type == MACH_TYPE_NETVIZ)
+# define machine_is_dragonet()	(machine_arch_type == MACH_TYPE_DRAGONET)
 #else
-# define machine_is_netviz()	(0)
+# define machine_is_dragonet()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FLEXIBITY
+#ifdef CONFIG_MACH_AT91SAM9263DESK16L
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FLEXIBITY
+#  define machine_arch_type	MACH_TYPE_AT91SAM9263DESK16L
 # endif
-# define machine_is_flexibity()	(machine_arch_type == MACH_TYPE_FLEXIBITY)
+# define machine_is_at91sam9263desk16l()	(machine_arch_type == MACH_TYPE_AT91SAM9263DESK16L)
 #else
-# define machine_is_flexibity()	(0)
+# define machine_is_at91sam9263desk16l()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WLAN_COMPUTER
+#ifdef CONFIG_MACH_BCMHANA_SV
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WLAN_COMPUTER
+#  define machine_arch_type	MACH_TYPE_BCMHANA_SV
 # endif
-# define machine_is_wlan_computer()	(machine_arch_type == MACH_TYPE_WLAN_COMPUTER)
+# define machine_is_bcmhana_sv()	(machine_arch_type == MACH_TYPE_BCMHANA_SV)
 #else
-# define machine_is_wlan_computer()	(0)
+# define machine_is_bcmhana_sv()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LPC24XX
+#ifdef CONFIG_MACH_BCMHANA_TABLET
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LPC24XX
+#  define machine_arch_type	MACH_TYPE_BCMHANA_TABLET
 # endif
-# define machine_is_lpc24xx()	(machine_arch_type == MACH_TYPE_LPC24XX)
+# define machine_is_bcmhana_tablet()	(machine_arch_type == MACH_TYPE_BCMHANA_TABLET)
 #else
-# define machine_is_lpc24xx()	(0)
+# define machine_is_bcmhana_tablet()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPICA
+#ifdef CONFIG_MACH_KOI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPICA
+#  define machine_arch_type	MACH_TYPE_KOI
 # endif
-# define machine_is_spica()	(machine_arch_type == MACH_TYPE_SPICA)
+# define machine_is_koi()	(machine_arch_type == MACH_TYPE_KOI)
 #else
-# define machine_is_spica()	(0)
+# define machine_is_koi()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GPSDISPLAY
+#ifdef CONFIG_MACH_TS4800
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GPSDISPLAY
+#  define machine_arch_type	MACH_TYPE_TS4800
 # endif
-# define machine_is_gpsdisplay()	(machine_arch_type == MACH_TYPE_GPSDISPLAY)
+# define machine_is_ts4800()	(machine_arch_type == MACH_TYPE_TS4800)
 #else
-# define machine_is_gpsdisplay()	(0)
+# define machine_is_ts4800()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BIPNET
+#ifdef CONFIG_MACH_TQMA9263
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BIPNET
+#  define machine_arch_type	MACH_TYPE_TQMA9263
 # endif
-# define machine_is_bipnet()	(machine_arch_type == MACH_TYPE_BIPNET)
+# define machine_is_tqma9263()	(machine_arch_type == MACH_TYPE_TQMA9263)
 #else
-# define machine_is_bipnet()	(0)
+# define machine_is_tqma9263()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OVERO_CTU_INERTIAL
+#ifdef CONFIG_MACH_HOLIDAY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OVERO_CTU_INERTIAL
+#  define machine_arch_type	MACH_TYPE_HOLIDAY
 # endif
-# define machine_is_overo_ctu_inertial()	(machine_arch_type == MACH_TYPE_OVERO_CTU_INERTIAL)
+# define machine_is_holiday()	(machine_arch_type == MACH_TYPE_HOLIDAY)
 #else
-# define machine_is_overo_ctu_inertial()	(0)
+# define machine_is_holiday()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DAVINCI_DM355_MMM
+#ifdef CONFIG_MACH_PCATS_OVERLAY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM355_MMM
+#  define machine_arch_type	MACH_TYPE_PCATS_OVERLAY
 # endif
-# define machine_is_davinci_dm355_mmm()	(machine_arch_type == MACH_TYPE_DAVINCI_DM355_MMM)
+# define machine_is_pcats_overlay()	(machine_arch_type == MACH_TYPE_PCATS_OVERLAY)
 #else
-# define machine_is_davinci_dm355_mmm()	(0)
+# define machine_is_pcats_overlay()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PC9260_V2
+#ifdef CONFIG_MACH_HWGW6410
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PC9260_V2
+#  define machine_arch_type	MACH_TYPE_HWGW6410
 # endif
-# define machine_is_pc9260_v2()	(machine_arch_type == MACH_TYPE_PC9260_V2)
+# define machine_is_hwgw6410()	(machine_arch_type == MACH_TYPE_HWGW6410)
 #else
-# define machine_is_pc9260_v2()	(0)
+# define machine_is_hwgw6410()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PTX7545
+#ifdef CONFIG_MACH_SHENZHOU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PTX7545
+#  define machine_arch_type	MACH_TYPE_SHENZHOU
 # endif
-# define machine_is_ptx7545()	(machine_arch_type == MACH_TYPE_PTX7545)
+# define machine_is_shenzhou()	(machine_arch_type == MACH_TYPE_SHENZHOU)
 #else
-# define machine_is_ptx7545()	(0)
+# define machine_is_shenzhou()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TM_EFDC
+#ifdef CONFIG_MACH_CWME9210
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TM_EFDC
+#  define machine_arch_type	MACH_TYPE_CWME9210
 # endif
-# define machine_is_tm_efdc()	(machine_arch_type == MACH_TYPE_TM_EFDC)
+# define machine_is_cwme9210()	(machine_arch_type == MACH_TYPE_CWME9210)
 #else
-# define machine_is_tm_efdc()	(0)
+# define machine_is_cwme9210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_WALDO1
+#ifdef CONFIG_MACH_CWME9210JS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_WALDO1
+#  define machine_arch_type	MACH_TYPE_CWME9210JS
 # endif
-# define machine_is_omap3_waldo1()	(machine_arch_type == MACH_TYPE_OMAP3_WALDO1)
+# define machine_is_cwme9210js()	(machine_arch_type == MACH_TYPE_CWME9210JS)
 #else
-# define machine_is_omap3_waldo1()	(0)
+# define machine_is_cwme9210js()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FLYER
+#ifdef CONFIG_MACH_COLIBRI_TEGRA2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FLYER
+#  define machine_arch_type	MACH_TYPE_COLIBRI_TEGRA2
 # endif
-# define machine_is_flyer()	(machine_arch_type == MACH_TYPE_FLYER)
+# define machine_is_colibri_tegra2()	(machine_arch_type == MACH_TYPE_COLIBRI_TEGRA2)
 #else
-# define machine_is_flyer()	(0)
+# define machine_is_colibri_tegra2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TORNADO3240
+#ifdef CONFIG_MACH_W21
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TORNADO3240
+#  define machine_arch_type	MACH_TYPE_W21
 # endif
-# define machine_is_tornado3240()	(machine_arch_type == MACH_TYPE_TORNADO3240)
+# define machine_is_w21()	(machine_arch_type == MACH_TYPE_W21)
 #else
-# define machine_is_tornado3240()	(0)
+# define machine_is_w21()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SOLI_01
+#ifdef CONFIG_MACH_POLYSAT1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SOLI_01
+#  define machine_arch_type	MACH_TYPE_POLYSAT1
 # endif
-# define machine_is_soli_01()	(machine_arch_type == MACH_TYPE_SOLI_01)
+# define machine_is_polysat1()	(machine_arch_type == MACH_TYPE_POLYSAT1)
 #else
-# define machine_is_soli_01()	(0)
+# define machine_is_polysat1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAPL138_EUROPALC
+#ifdef CONFIG_MACH_DATAWAY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAPL138_EUROPALC
+#  define machine_arch_type	MACH_TYPE_DATAWAY
 # endif
-# define machine_is_omapl138_europalc()	(machine_arch_type == MACH_TYPE_OMAPL138_EUROPALC)
+# define machine_is_dataway()	(machine_arch_type == MACH_TYPE_DATAWAY)
 #else
-# define machine_is_omapl138_europalc()	(0)
+# define machine_is_dataway()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HELIOS_V1
+#ifdef CONFIG_MACH_COBRAL138
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HELIOS_V1
+#  define machine_arch_type	MACH_TYPE_COBRAL138
 # endif
-# define machine_is_helios_v1()	(machine_arch_type == MACH_TYPE_HELIOS_V1)
+# define machine_is_cobral138()	(machine_arch_type == MACH_TYPE_COBRAL138)
 #else
-# define machine_is_helios_v1()	(0)
+# define machine_is_cobral138()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NETSPACE_LITE_V2
+#ifdef CONFIG_MACH_ROVERPCS8
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NETSPACE_LITE_V2
+#  define machine_arch_type	MACH_TYPE_ROVERPCS8
 # endif
-# define machine_is_netspace_lite_v2()	(machine_arch_type == MACH_TYPE_NETSPACE_LITE_V2)
+# define machine_is_roverpcs8()	(machine_arch_type == MACH_TYPE_ROVERPCS8)
 #else
-# define machine_is_netspace_lite_v2()	(0)
+# define machine_is_roverpcs8()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SSC
+#ifdef CONFIG_MACH_MARVELC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SSC
+#  define machine_arch_type	MACH_TYPE_MARVELC
 # endif
-# define machine_is_ssc()	(machine_arch_type == MACH_TYPE_SSC)
+# define machine_is_marvelc()	(machine_arch_type == MACH_TYPE_MARVELC)
 #else
-# define machine_is_ssc()	(0)
+# define machine_is_marvelc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PREMIERWAVE_EN
+#ifdef CONFIG_MACH_NAVEFIHID
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PREMIERWAVE_EN
+#  define machine_arch_type	MACH_TYPE_NAVEFIHID
 # endif
-# define machine_is_premierwave_en()	(machine_arch_type == MACH_TYPE_PREMIERWAVE_EN)
+# define machine_is_navefihid()	(machine_arch_type == MACH_TYPE_NAVEFIHID)
 #else
-# define machine_is_premierwave_en()	(0)
+# define machine_is_navefihid()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WASABI
+#ifdef CONFIG_MACH_DM365_CV100
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WASABI
+#  define machine_arch_type	MACH_TYPE_DM365_CV100
 # endif
-# define machine_is_wasabi()	(machine_arch_type == MACH_TYPE_WASABI)
+# define machine_is_dm365_cv100()	(machine_arch_type == MACH_TYPE_DM365_CV100)
 #else
-# define machine_is_wasabi()	(0)
+# define machine_is_dm365_cv100()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX50_RDP
+#ifdef CONFIG_MACH_ABLE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX50_RDP
+#  define machine_arch_type	MACH_TYPE_ABLE
 # endif
-# define machine_is_mx50_rdp()	(machine_arch_type == MACH_TYPE_MX50_RDP)
+# define machine_is_able()	(machine_arch_type == MACH_TYPE_ABLE)
 #else
-# define machine_is_mx50_rdp()	(0)
+# define machine_is_able()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UNIVERSAL_C210
+#ifdef CONFIG_MACH_LEGACY
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_LEGACY
+# endif
+# define machine_is_legacy()	(machine_arch_type == MACH_TYPE_LEGACY)
+#else
+# define machine_is_legacy()	(0)
+#endif
+
+#ifdef CONFIG_MACH_ICONG
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_ICONG
+# endif
+# define machine_is_icong()	(machine_arch_type == MACH_TYPE_ICONG)
+#else
+# define machine_is_icong()	(0)
+#endif
+
+#ifdef CONFIG_MACH_ROVER_G8
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_ROVER_G8
+# endif
+# define machine_is_rover_g8()	(machine_arch_type == MACH_TYPE_ROVER_G8)
+#else
+# define machine_is_rover_g8()	(0)
+#endif
+
+#ifdef CONFIG_MACH_T5388P
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_T5388P
+# endif
+# define machine_is_t5388p()	(machine_arch_type == MACH_TYPE_T5388P)
+#else
+# define machine_is_t5388p()	(0)
+#endif
+
+#ifdef CONFIG_MACH_DINGO
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_DINGO
+# endif
+# define machine_is_dingo()	(machine_arch_type == MACH_TYPE_DINGO)
+#else
+# define machine_is_dingo()	(0)
+#endif
+
+#ifdef CONFIG_MACH_GOFLEXHOME
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_GOFLEXHOME
+# endif
+# define machine_is_goflexhome()	(machine_arch_type == MACH_TYPE_GOFLEXHOME)
+#else
+# define machine_is_goflexhome()	(0)
+#endif
+
+#ifdef CONFIG_MACH_LANREADYFN511
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_LANREADYFN511
+# endif
+# define machine_is_lanreadyfn511()	(machine_arch_type == MACH_TYPE_LANREADYFN511)
+#else
+# define machine_is_lanreadyfn511()	(0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3_BAIA
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_OMAP3_BAIA
+# endif
+# define machine_is_omap3_baia()	(machine_arch_type == MACH_TYPE_OMAP3_BAIA)
+#else
+# define machine_is_omap3_baia()	(0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3SMARTDISPLAY
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_OMAP3SMARTDISPLAY
+# endif
+# define machine_is_omap3smartdisplay()	(machine_arch_type == MACH_TYPE_OMAP3SMARTDISPLAY)
+#else
+# define machine_is_omap3smartdisplay()	(0)
+#endif
+
+#ifdef CONFIG_MACH_XILINX
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_XILINX
+# endif
+# define machine_is_xilinx()	(machine_arch_type == MACH_TYPE_XILINX)
+#else
+# define machine_is_xilinx()	(0)
+#endif
+
+#ifdef CONFIG_MACH_A2F
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_A2F
+# endif
+# define machine_is_a2f()	(machine_arch_type == MACH_TYPE_A2F)
+#else
+# define machine_is_a2f()	(0)
+#endif
+
+#ifdef CONFIG_MACH_SKY25
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_SKY25
+# endif
+# define machine_is_sky25()	(machine_arch_type == MACH_TYPE_SKY25)
+#else
+# define machine_is_sky25()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CCMX53
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CCMX53
+# endif
+# define machine_is_ccmx53()	(machine_arch_type == MACH_TYPE_CCMX53)
+#else
+# define machine_is_ccmx53()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CCMX53JS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CCMX53JS
+# endif
+# define machine_is_ccmx53js()	(machine_arch_type == MACH_TYPE_CCMX53JS)
+#else
+# define machine_is_ccmx53js()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CCWMX53
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CCWMX53
+# endif
+# define machine_is_ccwmx53()	(machine_arch_type == MACH_TYPE_CCWMX53)
+#else
+# define machine_is_ccwmx53()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CCWMX53JS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CCWMX53JS
+# endif
+# define machine_is_ccwmx53js()	(machine_arch_type == MACH_TYPE_CCWMX53JS)
+#else
+# define machine_is_ccwmx53js()	(0)
+#endif
+
+#ifdef CONFIG_MACH_FRISMS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_FRISMS
+# endif
+# define machine_is_frisms()	(machine_arch_type == MACH_TYPE_FRISMS)
+#else
+# define machine_is_frisms()	(0)
+#endif
+
+#ifdef CONFIG_MACH_MSM7X27A_FFA
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_MSM7X27A_FFA
+# endif
+# define machine_is_msm7x27a_ffa()	(machine_arch_type == MACH_TYPE_MSM7X27A_FFA)
+#else
+# define machine_is_msm7x27a_ffa()	(0)
+#endif
+
+#ifdef CONFIG_MACH_MSM7X27A_SURF
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_MSM7X27A_SURF
+# endif
+# define machine_is_msm7x27a_surf()	(machine_arch_type == MACH_TYPE_MSM7X27A_SURF)
+#else
+# define machine_is_msm7x27a_surf()	(0)
+#endif
+
+#ifdef CONFIG_MACH_MSM7X27A_RUMI3
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_MSM7X27A_RUMI3
+# endif
+# define machine_is_msm7x27a_rumi3()	(machine_arch_type == MACH_TYPE_MSM7X27A_RUMI3)
+#else
+# define machine_is_msm7x27a_rumi3()	(0)
+#endif
+
+#ifdef CONFIG_MACH_DIMMSAM9G20
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_DIMMSAM9G20
+# endif
+# define machine_is_dimmsam9g20()	(machine_arch_type == MACH_TYPE_DIMMSAM9G20)
+#else
+# define machine_is_dimmsam9g20()	(0)
+#endif
+
+#ifdef CONFIG_MACH_DIMM_IMX28
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_DIMM_IMX28
+# endif
+# define machine_is_dimm_imx28()	(machine_arch_type == MACH_TYPE_DIMM_IMX28)
+#else
+# define machine_is_dimm_imx28()	(0)
+#endif
+
+#ifdef CONFIG_MACH_AMK_A4
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_AMK_A4
+# endif
+# define machine_is_amk_a4()	(machine_arch_type == MACH_TYPE_AMK_A4)
+#else
+# define machine_is_amk_a4()	(0)
+#endif
+
+#ifdef CONFIG_MACH_GNET_SGME
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_GNET_SGME
+# endif
+# define machine_is_gnet_sgme()	(machine_arch_type == MACH_TYPE_GNET_SGME)
+#else
+# define machine_is_gnet_sgme()	(0)
+#endif
+
+#ifdef CONFIG_MACH_SHOOTER_U
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_SHOOTER_U
+# endif
+# define machine_is_shooter_u()	(machine_arch_type == MACH_TYPE_SHOOTER_U)
+#else
+# define machine_is_shooter_u()	(0)
+#endif
+
+#ifdef CONFIG_MACH_VMX53
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_VMX53
+# endif
+# define machine_is_vmx53()	(machine_arch_type == MACH_TYPE_VMX53)
+#else
+# define machine_is_vmx53()	(0)
+#endif
+
+#ifdef CONFIG_MACH_RHINO
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_RHINO
+# endif
+# define machine_is_rhino()	(machine_arch_type == MACH_TYPE_RHINO)
+#else
+# define machine_is_rhino()	(0)
+#endif
+
+#ifdef CONFIG_MACH_ARMLEX4210
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UNIVERSAL_C210
+#  define machine_arch_type	MACH_TYPE_ARMLEX4210
 # endif
-# define machine_is_universal_c210()	(machine_arch_type == MACH_TYPE_UNIVERSAL_C210)
+# define machine_is_armlex4210()	(machine_arch_type == MACH_TYPE_ARMLEX4210)
 #else
-# define machine_is_universal_c210()	(0)
+# define machine_is_armlex4210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_REAL6410
+#ifdef CONFIG_MACH_SWARCOEXTMODEM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_REAL6410
+#  define machine_arch_type	MACH_TYPE_SWARCOEXTMODEM
 # endif
-# define machine_is_real6410()	(machine_arch_type == MACH_TYPE_REAL6410)
+# define machine_is_swarcoextmodem()	(machine_arch_type == MACH_TYPE_SWARCOEXTMODEM)
 #else
-# define machine_is_real6410()	(0)
+# define machine_is_swarcoextmodem()	(0)
+#endif
+
+#ifdef CONFIG_MACH_SNOWBALL
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_SNOWBALL
+# endif
+# define machine_is_snowball()	(machine_arch_type == MACH_TYPE_SNOWBALL)
+#else
+# define machine_is_snowball()	(0)
+#endif
+
+#ifdef CONFIG_MACH_PCM049
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_PCM049
+# endif
+# define machine_is_pcm049()	(machine_arch_type == MACH_TYPE_PCM049)
+#else
+# define machine_is_pcm049()	(0)
+#endif
+
+#ifdef CONFIG_MACH_VIGOR
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_VIGOR
+# endif
+# define machine_is_vigor()	(machine_arch_type == MACH_TYPE_VIGOR)
+#else
+# define machine_is_vigor()	(0)
+#endif
+
+#ifdef CONFIG_MACH_OSLO_AMUNDSEN
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_OSLO_AMUNDSEN
+# endif
+# define machine_is_oslo_amundsen()	(machine_arch_type == MACH_TYPE_OSLO_AMUNDSEN)
+#else
+# define machine_is_oslo_amundsen()	(0)
+#endif
+
+#ifdef CONFIG_MACH_GSL_DIAMOND
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_GSL_DIAMOND
+# endif
+# define machine_is_gsl_diamond()	(machine_arch_type == MACH_TYPE_GSL_DIAMOND)
+#else
+# define machine_is_gsl_diamond()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CV2201
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CV2201
+# endif
+# define machine_is_cv2201()	(machine_arch_type == MACH_TYPE_CV2201)
+#else
+# define machine_is_cv2201()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CV2202
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CV2202
+# endif
+# define machine_is_cv2202()	(machine_arch_type == MACH_TYPE_CV2202)
+#else
+# define machine_is_cv2202()	(0)
+#endif
+
+#ifdef CONFIG_MACH_CV2203
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_CV2203
+# endif
+# define machine_is_cv2203()	(machine_arch_type == MACH_TYPE_CV2203)
+#else
+# define machine_is_cv2203()	(0)
+#endif
+
+#ifdef CONFIG_MACH_VIT_IBOX
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_VIT_IBOX
+# endif
+# define machine_is_vit_ibox()	(machine_arch_type == MACH_TYPE_VIT_IBOX)
+#else
+# define machine_is_vit_ibox()	(0)
+#endif
+
+#ifdef CONFIG_MACH_DM6441_ESP
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_DM6441_ESP
+# endif
+# define machine_is_dm6441_esp()	(machine_arch_type == MACH_TYPE_DM6441_ESP)
+#else
+# define machine_is_dm6441_esp()	(0)
+#endif
+
+#ifdef CONFIG_MACH_AT91SAM9X5EK
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_AT91SAM9X5EK
+# endif
+# define machine_is_at91sam9x5ek()	(machine_arch_type == MACH_TYPE_AT91SAM9X5EK)
+#else
+# define machine_is_at91sam9x5ek()	(0)
+#endif
+
+#ifdef CONFIG_MACH_LIBRA
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_LIBRA
+# endif
+# define machine_is_libra()	(machine_arch_type == MACH_TYPE_LIBRA)
+#else
+# define machine_is_libra()	(0)
+#endif
+
+#ifdef CONFIG_MACH_EASYCRRH
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_EASYCRRH
+# endif
+# define machine_is_easycrrh()	(machine_arch_type == MACH_TYPE_EASYCRRH)
+#else
+# define machine_is_easycrrh()	(0)
+#endif
+
+#ifdef CONFIG_MACH_TRIPEL
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_TRIPEL
+# endif
+# define machine_is_tripel()	(machine_arch_type == MACH_TYPE_TRIPEL)
+#else
+# define machine_is_tripel()	(0)
+#endif
+
+#ifdef CONFIG_MACH_ENDIAN_MINI
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_ENDIAN_MINI
+# endif
+# define machine_is_endian_mini()	(machine_arch_type == MACH_TYPE_ENDIAN_MINI)
+#else
+# define machine_is_endian_mini()	(0)
+#endif
+
+#ifdef CONFIG_MACH_XILINX_EP107
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_XILINX_EP107
+# endif
+# define machine_is_xilinx_ep107()	(machine_arch_type == MACH_TYPE_XILINX_EP107)
+#else
+# define machine_is_xilinx_ep107()	(0)
+#endif
+
+#ifdef CONFIG_MACH_NURI
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_NURI
+# endif
+# define machine_is_nuri()	(machine_arch_type == MACH_TYPE_NURI)
+#else
+# define machine_is_nuri()	(0)
+#endif
+
+#ifdef CONFIG_MACH_JANUS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_JANUS
+# endif
+# define machine_is_janus()	(machine_arch_type == MACH_TYPE_JANUS)
+#else
+# define machine_is_janus()	(0)
+#endif
+
+#ifdef CONFIG_MACH_DDNAS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_DDNAS
+# endif
+# define machine_is_ddnas()	(machine_arch_type == MACH_TYPE_DDNAS)
+#else
+# define machine_is_ddnas()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPX_SAKURA
+#ifdef CONFIG_MACH_TAG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPX_SAKURA
+#  define machine_arch_type	MACH_TYPE_TAG
 # endif
-# define machine_is_spx_sakura()	(machine_arch_type == MACH_TYPE_SPX_SAKURA)
+# define machine_is_tag()	(machine_arch_type == MACH_TYPE_TAG)
 #else
-# define machine_is_spx_sakura()	(0)
+# define machine_is_tag()	(0)
 #endif
 
-#ifdef CONFIG_MACH_IJ3K_2440
+#ifdef CONFIG_MACH_TAGW
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_IJ3K_2440
+#  define machine_arch_type	MACH_TYPE_TAGW
 # endif
-# define machine_is_ij3k_2440()	(machine_arch_type == MACH_TYPE_IJ3K_2440)
+# define machine_is_tagw()	(machine_arch_type == MACH_TYPE_TAGW)
 #else
-# define machine_is_ij3k_2440()	(0)
+# define machine_is_tagw()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_BC10
+#ifdef CONFIG_MACH_NITROGEN_VM_IMX51
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_BC10
+#  define machine_arch_type	MACH_TYPE_NITROGEN_VM_IMX51
 # endif
-# define machine_is_omap3_bc10()	(machine_arch_type == MACH_TYPE_OMAP3_BC10)
+# define machine_is_nitrogen_vm_imx51()	(machine_arch_type == MACH_TYPE_NITROGEN_VM_IMX51)
 #else
-# define machine_is_omap3_bc10()	(0)
+# define machine_is_nitrogen_vm_imx51()	(0)
 #endif
 
-#ifdef CONFIG_MACH_THEBE
+#ifdef CONFIG_MACH_VIPRINET
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_THEBE
+#  define machine_arch_type	MACH_TYPE_VIPRINET
 # endif
-# define machine_is_thebe()	(machine_arch_type == MACH_TYPE_THEBE)
+# define machine_is_viprinet()	(machine_arch_type == MACH_TYPE_VIPRINET)
 #else
-# define machine_is_thebe()	(0)
+# define machine_is_viprinet()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RV082
+#ifdef CONFIG_MACH_BOCKW
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RV082
+#  define machine_arch_type	MACH_TYPE_BOCKW
 # endif
-# define machine_is_rv082()	(machine_arch_type == MACH_TYPE_RV082)
+# define machine_is_bockw()	(machine_arch_type == MACH_TYPE_BOCKW)
 #else
-# define machine_is_rv082()	(0)
+# define machine_is_bockw()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARMLGUEST
+#ifdef CONFIG_MACH_EVA2000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARMLGUEST
+#  define machine_arch_type	MACH_TYPE_EVA2000
 # endif
-# define machine_is_armlguest()	(machine_arch_type == MACH_TYPE_ARMLGUEST)
+# define machine_is_eva2000()	(machine_arch_type == MACH_TYPE_EVA2000)
 #else
-# define machine_is_armlguest()	(0)
+# define machine_is_eva2000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TJINC1000
+#ifdef CONFIG_MACH_STEELYARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TJINC1000
+#  define machine_arch_type	MACH_TYPE_STEELYARD
 # endif
-# define machine_is_tjinc1000()	(machine_arch_type == MACH_TYPE_TJINC1000)
+# define machine_is_steelyard()	(machine_arch_type == MACH_TYPE_STEELYARD)
 #else
-# define machine_is_tjinc1000()	(0)
+# define machine_is_steelyard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DOCKSTAR
+#ifdef CONFIG_MACH_NSSLSBOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DOCKSTAR
+#  define machine_arch_type	MACH_TYPE_NSSLSBOARD
 # endif
-# define machine_is_dockstar()	(machine_arch_type == MACH_TYPE_DOCKSTAR)
+# define machine_is_nsslsboard()	(machine_arch_type == MACH_TYPE_NSSLSBOARD)
 #else
-# define machine_is_dockstar()	(0)
+# define machine_is_nsslsboard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AX8008
+#ifdef CONFIG_MACH_GENEVA_B5
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AX8008
+#  define machine_arch_type	MACH_TYPE_GENEVA_B5
 # endif
-# define machine_is_ax8008()	(machine_arch_type == MACH_TYPE_AX8008)
+# define machine_is_geneva_b5()	(machine_arch_type == MACH_TYPE_GENEVA_B5)
 #else
-# define machine_is_ax8008()	(0)
+# define machine_is_geneva_b5()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GNET_SGCE
+#ifdef CONFIG_MACH_SPEAR1340
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GNET_SGCE
+#  define machine_arch_type	MACH_TYPE_SPEAR1340
 # endif
-# define machine_is_gnet_sgce()	(machine_arch_type == MACH_TYPE_GNET_SGCE)
+# define machine_is_spear1340()	(machine_arch_type == MACH_TYPE_SPEAR1340)
 #else
-# define machine_is_gnet_sgce()	(0)
+# define machine_is_spear1340()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PXWNAS_500_1000
+#ifdef CONFIG_MACH_REXMAS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PXWNAS_500_1000
+#  define machine_arch_type	MACH_TYPE_REXMAS
 # endif
-# define machine_is_pxwnas_500_1000()	(machine_arch_type == MACH_TYPE_PXWNAS_500_1000)
+# define machine_is_rexmas()	(machine_arch_type == MACH_TYPE_REXMAS)
 #else
-# define machine_is_pxwnas_500_1000()	(0)
+# define machine_is_rexmas()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EA20
+#ifdef CONFIG_MACH_MSM8960_CDP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EA20
+#  define machine_arch_type	MACH_TYPE_MSM8960_CDP
 # endif
-# define machine_is_ea20()	(machine_arch_type == MACH_TYPE_EA20)
+# define machine_is_msm8960_cdp()	(machine_arch_type == MACH_TYPE_MSM8960_CDP)
 #else
-# define machine_is_ea20()	(0)
+# define machine_is_msm8960_cdp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AWM2
+#ifdef CONFIG_MACH_MSM8960_FLUID
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AWM2
+#  define machine_arch_type	MACH_TYPE_MSM8960_FLUID
 # endif
-# define machine_is_awm2()	(machine_arch_type == MACH_TYPE_AWM2)
+# define machine_is_msm8960_fluid()	(machine_arch_type == MACH_TYPE_MSM8960_FLUID)
 #else
-# define machine_is_awm2()	(0)
+# define machine_is_msm8960_fluid()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TI8148EVM
+#ifdef CONFIG_MACH_MSM8960_APQ
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TI8148EVM
+#  define machine_arch_type	MACH_TYPE_MSM8960_APQ
 # endif
-# define machine_is_ti8148evm()	(machine_arch_type == MACH_TYPE_TI8148EVM)
+# define machine_is_msm8960_apq()	(machine_arch_type == MACH_TYPE_MSM8960_APQ)
 #else
-# define machine_is_ti8148evm()	(0)
+# define machine_is_msm8960_apq()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SEABOARD
+#ifdef CONFIG_MACH_HELIOS_V2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SEABOARD
+#  define machine_arch_type	MACH_TYPE_HELIOS_V2
 # endif
-# define machine_is_seaboard()	(machine_arch_type == MACH_TYPE_SEABOARD)
+# define machine_is_helios_v2()	(machine_arch_type == MACH_TYPE_HELIOS_V2)
 #else
-# define machine_is_seaboard()	(0)
+# define machine_is_helios_v2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LINKSTATION_CHLV2
+#ifdef CONFIG_MACH_MIF10P
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LINKSTATION_CHLV2
+#  define machine_arch_type	MACH_TYPE_MIF10P
 # endif
-# define machine_is_linkstation_chlv2()	(machine_arch_type == MACH_TYPE_LINKSTATION_CHLV2)
+# define machine_is_mif10p()	(machine_arch_type == MACH_TYPE_MIF10P)
 #else
-# define machine_is_linkstation_chlv2()	(0)
+# define machine_is_mif10p()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TERA_PRO2_RACK
+#ifdef CONFIG_MACH_IAM28
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TERA_PRO2_RACK
+#  define machine_arch_type	MACH_TYPE_IAM28
 # endif
-# define machine_is_tera_pro2_rack()	(machine_arch_type == MACH_TYPE_TERA_PRO2_RACK)
+# define machine_is_iam28()	(machine_arch_type == MACH_TYPE_IAM28)
 #else
-# define machine_is_tera_pro2_rack()	(0)
+# define machine_is_iam28()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RUBYS
+#ifdef CONFIG_MACH_PICASSO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RUBYS
+#  define machine_arch_type	MACH_TYPE_PICASSO
 # endif
-# define machine_is_rubys()	(machine_arch_type == MACH_TYPE_RUBYS)
+# define machine_is_picasso()	(machine_arch_type == MACH_TYPE_PICASSO)
 #else
-# define machine_is_rubys()	(0)
+# define machine_is_picasso()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AQUARIUS
+#ifdef CONFIG_MACH_MR301A
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AQUARIUS
+#  define machine_arch_type	MACH_TYPE_MR301A
 # endif
-# define machine_is_aquarius()	(machine_arch_type == MACH_TYPE_AQUARIUS)
+# define machine_is_mr301a()	(machine_arch_type == MACH_TYPE_MR301A)
 #else
-# define machine_is_aquarius()	(0)
+# define machine_is_mr301a()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX53_ARD
+#ifdef CONFIG_MACH_NOTLE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX53_ARD
+#  define machine_arch_type	MACH_TYPE_NOTLE
 # endif
-# define machine_is_mx53_ard()	(machine_arch_type == MACH_TYPE_MX53_ARD)
+# define machine_is_notle()	(machine_arch_type == MACH_TYPE_NOTLE)
 #else
-# define machine_is_mx53_ard()	(0)
+# define machine_is_notle()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX53_SMD
+#ifdef CONFIG_MACH_EELX2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX53_SMD
+#  define machine_arch_type	MACH_TYPE_EELX2
 # endif
-# define machine_is_mx53_smd()	(machine_arch_type == MACH_TYPE_MX53_SMD)
+# define machine_is_eelx2()	(machine_arch_type == MACH_TYPE_EELX2)
 #else
-# define machine_is_mx53_smd()	(0)
+# define machine_is_eelx2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LSWXL
+#ifdef CONFIG_MACH_MOON
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LSWXL
+#  define machine_arch_type	MACH_TYPE_MOON
 # endif
-# define machine_is_lswxl()	(machine_arch_type == MACH_TYPE_LSWXL)
+# define machine_is_moon()	(machine_arch_type == MACH_TYPE_MOON)
 #else
-# define machine_is_lswxl()	(0)
+# define machine_is_moon()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DOVE_AVNG_V3
+#ifdef CONFIG_MACH_RUBY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DOVE_AVNG_V3
+#  define machine_arch_type	MACH_TYPE_RUBY
 # endif
-# define machine_is_dove_avng_v3()	(machine_arch_type == MACH_TYPE_DOVE_AVNG_V3)
+# define machine_is_ruby()	(machine_arch_type == MACH_TYPE_RUBY)
 #else
-# define machine_is_dove_avng_v3()	(0)
+# define machine_is_ruby()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SDI_ESS_9263
+#ifdef CONFIG_MACH_GOLDENGATE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SDI_ESS_9263
+#  define machine_arch_type	MACH_TYPE_GOLDENGATE
 # endif
-# define machine_is_sdi_ess_9263()	(machine_arch_type == MACH_TYPE_SDI_ESS_9263)
+# define machine_is_goldengate()	(machine_arch_type == MACH_TYPE_GOLDENGATE)
 #else
-# define machine_is_sdi_ess_9263()	(0)
+# define machine_is_goldengate()	(0)
 #endif
 
-#ifdef CONFIG_MACH_JOCPU550
+#ifdef CONFIG_MACH_CTBU_GEN2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_JOCPU550
+#  define machine_arch_type	MACH_TYPE_CTBU_GEN2
 # endif
-# define machine_is_jocpu550()	(machine_arch_type == MACH_TYPE_JOCPU550)
+# define machine_is_ctbu_gen2()	(machine_arch_type == MACH_TYPE_CTBU_GEN2)
 #else
-# define machine_is_jocpu550()	(0)
+# define machine_is_ctbu_gen2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X60_RUMI3
+#ifdef CONFIG_MACH_KMP_AM17_01
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X60_RUMI3
+#  define machine_arch_type	MACH_TYPE_KMP_AM17_01
 # endif
-# define machine_is_msm8x60_rumi3()	(machine_arch_type == MACH_TYPE_MSM8X60_RUMI3)
+# define machine_is_kmp_am17_01()	(machine_arch_type == MACH_TYPE_KMP_AM17_01)
 #else
-# define machine_is_msm8x60_rumi3()	(0)
+# define machine_is_kmp_am17_01()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X60_FFA
+#ifdef CONFIG_MACH_WTPLUG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X60_FFA
+#  define machine_arch_type	MACH_TYPE_WTPLUG
 # endif
-# define machine_is_msm8x60_ffa()	(machine_arch_type == MACH_TYPE_MSM8X60_FFA)
+# define machine_is_wtplug()	(machine_arch_type == MACH_TYPE_WTPLUG)
 #else
-# define machine_is_msm8x60_ffa()	(0)
+# define machine_is_wtplug()	(0)
 #endif
 
-#ifdef CONFIG_MACH_YANOMAMI
+#ifdef CONFIG_MACH_MX27SU2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_YANOMAMI
+#  define machine_arch_type	MACH_TYPE_MX27SU2
 # endif
-# define machine_is_yanomami()	(machine_arch_type == MACH_TYPE_YANOMAMI)
+# define machine_is_mx27su2()	(machine_arch_type == MACH_TYPE_MX27SU2)
 #else
-# define machine_is_yanomami()	(0)
+# define machine_is_mx27su2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GTA04
+#ifdef CONFIG_MACH_NB31
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GTA04
+#  define machine_arch_type	MACH_TYPE_NB31
 # endif
-# define machine_is_gta04()	(machine_arch_type == MACH_TYPE_GTA04)
+# define machine_is_nb31()	(machine_arch_type == MACH_TYPE_NB31)
 #else
-# define machine_is_gta04()	(0)
+# define machine_is_nb31()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CM_A510
+#ifdef CONFIG_MACH_HJSDU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CM_A510
+#  define machine_arch_type	MACH_TYPE_HJSDU
 # endif
-# define machine_is_cm_a510()	(machine_arch_type == MACH_TYPE_CM_A510)
+# define machine_is_hjsdu()	(machine_arch_type == MACH_TYPE_HJSDU)
 #else
-# define machine_is_cm_a510()	(0)
+# define machine_is_hjsdu()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_RFS200
+#ifdef CONFIG_MACH_TD3_REV1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_RFS200
+#  define machine_arch_type	MACH_TYPE_TD3_REV1
 # endif
-# define machine_is_omap3_rfs200()	(machine_arch_type == MACH_TYPE_OMAP3_RFS200)
+# define machine_is_td3_rev1()	(machine_arch_type == MACH_TYPE_TD3_REV1)
 #else
-# define machine_is_omap3_rfs200()	(0)
+# define machine_is_td3_rev1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KX33XX
+#ifdef CONFIG_MACH_EAG_CI4000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KX33XX
+#  define machine_arch_type	MACH_TYPE_EAG_CI4000
 # endif
-# define machine_is_kx33xx()	(machine_arch_type == MACH_TYPE_KX33XX)
+# define machine_is_eag_ci4000()	(machine_arch_type == MACH_TYPE_EAG_CI4000)
 #else
-# define machine_is_kx33xx()	(0)
+# define machine_is_eag_ci4000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PTX7510
+#ifdef CONFIG_MACH_NET5BIG_NAND_V2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PTX7510
+#  define machine_arch_type	MACH_TYPE_NET5BIG_NAND_V2
 # endif
-# define machine_is_ptx7510()	(machine_arch_type == MACH_TYPE_PTX7510)
+# define machine_is_net5big_nand_v2()	(machine_arch_type == MACH_TYPE_NET5BIG_NAND_V2)
 #else
-# define machine_is_ptx7510()	(0)
+# define machine_is_net5big_nand_v2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TOP9000
+#ifdef CONFIG_MACH_CPX2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TOP9000
+#  define machine_arch_type	MACH_TYPE_CPX2
 # endif
-# define machine_is_top9000()	(machine_arch_type == MACH_TYPE_TOP9000)
+# define machine_is_cpx2()	(machine_arch_type == MACH_TYPE_CPX2)
 #else
-# define machine_is_top9000()	(0)
+# define machine_is_cpx2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TEENOTE
+#ifdef CONFIG_MACH_NET2BIG_NAND_V2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TEENOTE
+#  define machine_arch_type	MACH_TYPE_NET2BIG_NAND_V2
 # endif
-# define machine_is_teenote()	(machine_arch_type == MACH_TYPE_TEENOTE)
+# define machine_is_net2big_nand_v2()	(machine_arch_type == MACH_TYPE_NET2BIG_NAND_V2)
 #else
-# define machine_is_teenote()	(0)
+# define machine_is_net2big_nand_v2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TS3
+#ifdef CONFIG_MACH_ECUV5
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TS3
+#  define machine_arch_type	MACH_TYPE_ECUV5
 # endif
-# define machine_is_ts3()	(machine_arch_type == MACH_TYPE_TS3)
+# define machine_is_ecuv5()	(machine_arch_type == MACH_TYPE_ECUV5)
 #else
-# define machine_is_ts3()	(0)
+# define machine_is_ecuv5()	(0)
 #endif
 
-#ifdef CONFIG_MACH_A0
+#ifdef CONFIG_MACH_HSGX6D
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_A0
+#  define machine_arch_type	MACH_TYPE_HSGX6D
 # endif
-# define machine_is_a0()	(machine_arch_type == MACH_TYPE_A0)
+# define machine_is_hsgx6d()	(machine_arch_type == MACH_TYPE_HSGX6D)
 #else
-# define machine_is_a0()	(0)
+# define machine_is_hsgx6d()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FSM9XXX_SURF
+#ifdef CONFIG_MACH_DAWAD7
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FSM9XXX_SURF
+#  define machine_arch_type	MACH_TYPE_DAWAD7
 # endif
-# define machine_is_fsm9xxx_surf()	(machine_arch_type == MACH_TYPE_FSM9XXX_SURF)
+# define machine_is_dawad7()	(machine_arch_type == MACH_TYPE_DAWAD7)
 #else
-# define machine_is_fsm9xxx_surf()	(0)
+# define machine_is_dawad7()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FSM9XXX_FFA
+#ifdef CONFIG_MACH_SAM9REPEATER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FSM9XXX_FFA
+#  define machine_arch_type	MACH_TYPE_SAM9REPEATER
 # endif
-# define machine_is_fsm9xxx_ffa()	(machine_arch_type == MACH_TYPE_FSM9XXX_FFA)
+# define machine_is_sam9repeater()	(machine_arch_type == MACH_TYPE_SAM9REPEATER)
 #else
-# define machine_is_fsm9xxx_ffa()	(0)
+# define machine_is_sam9repeater()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FRRHWCDMA60W
+#ifdef CONFIG_MACH_GT_I5700
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FRRHWCDMA60W
+#  define machine_arch_type	MACH_TYPE_GT_I5700
 # endif
-# define machine_is_frrhwcdma60w()	(machine_arch_type == MACH_TYPE_FRRHWCDMA60W)
+# define machine_is_gt_i5700()	(machine_arch_type == MACH_TYPE_GT_I5700)
 #else
-# define machine_is_frrhwcdma60w()	(0)
+# define machine_is_gt_i5700()	(0)
 #endif
 
-#ifdef CONFIG_MACH_REMUS
+#ifdef CONFIG_MACH_CTERA_PLUG_C2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_REMUS
+#  define machine_arch_type	MACH_TYPE_CTERA_PLUG_C2
 # endif
-# define machine_is_remus()	(machine_arch_type == MACH_TYPE_REMUS)
+# define machine_is_ctera_plug_c2()	(machine_arch_type == MACH_TYPE_CTERA_PLUG_C2)
 #else
-# define machine_is_remus()	(0)
+# define machine_is_ctera_plug_c2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AT91CAP7XDK
+#ifdef CONFIG_MACH_MARVELCT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AT91CAP7XDK
+#  define machine_arch_type	MACH_TYPE_MARVELCT
 # endif
-# define machine_is_at91cap7xdk()	(machine_arch_type == MACH_TYPE_AT91CAP7XDK)
+# define machine_is_marvelct()	(machine_arch_type == MACH_TYPE_MARVELCT)
 #else
-# define machine_is_at91cap7xdk()	(0)
+# define machine_is_marvelct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AT91CAP7STK
+#ifdef CONFIG_MACH_AG11005
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AT91CAP7STK
+#  define machine_arch_type	MACH_TYPE_AG11005
 # endif
-# define machine_is_at91cap7stk()	(machine_arch_type == MACH_TYPE_AT91CAP7STK)
+# define machine_is_ag11005()	(machine_arch_type == MACH_TYPE_AG11005)
 #else
-# define machine_is_at91cap7stk()	(0)
+# define machine_is_ag11005()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KT_SBC_SAM9_1
+#ifdef CONFIG_MACH_VANGOGH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KT_SBC_SAM9_1
+#  define machine_arch_type	MACH_TYPE_VANGOGH
 # endif
-# define machine_is_kt_sbc_sam9_1()	(machine_arch_type == MACH_TYPE_KT_SBC_SAM9_1)
+# define machine_is_vangogh()	(machine_arch_type == MACH_TYPE_VANGOGH)
 #else
-# define machine_is_kt_sbc_sam9_1()	(0)
+# define machine_is_vangogh()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARMADA_XP_DB
+#ifdef CONFIG_MACH_MATRIX505
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARMADA_XP_DB
+#  define machine_arch_type	MACH_TYPE_MATRIX505
 # endif
-# define machine_is_armada_xp_db()	(machine_arch_type == MACH_TYPE_ARMADA_XP_DB)
+# define machine_is_matrix505()	(machine_arch_type == MACH_TYPE_MATRIX505)
 #else
-# define machine_is_armada_xp_db()	(0)
+# define machine_is_matrix505()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPDM
+#ifdef CONFIG_MACH_OCE_NIGMA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPDM
+#  define machine_arch_type	MACH_TYPE_OCE_NIGMA
 # endif
-# define machine_is_spdm()	(machine_arch_type == MACH_TYPE_SPDM)
+# define machine_is_oce_nigma()	(machine_arch_type == MACH_TYPE_OCE_NIGMA)
 #else
-# define machine_is_spdm()	(0)
+# define machine_is_oce_nigma()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GTIB
+#ifdef CONFIG_MACH_T55
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GTIB
+#  define machine_arch_type	MACH_TYPE_T55
 # endif
-# define machine_is_gtib()	(machine_arch_type == MACH_TYPE_GTIB)
+# define machine_is_t55()	(machine_arch_type == MACH_TYPE_T55)
 #else
-# define machine_is_gtib()	(0)
+# define machine_is_t55()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DGM3240
+#ifdef CONFIG_MACH_BIO3K
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DGM3240
+#  define machine_arch_type	MACH_TYPE_BIO3K
 # endif
-# define machine_is_dgm3240()	(machine_arch_type == MACH_TYPE_DGM3240)
+# define machine_is_bio3k()	(machine_arch_type == MACH_TYPE_BIO3K)
 #else
-# define machine_is_dgm3240()	(0)
+# define machine_is_bio3k()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HTCMEGA
+#ifdef CONFIG_MACH_EXPRESSCT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HTCMEGA
+#  define machine_arch_type	MACH_TYPE_EXPRESSCT
 # endif
-# define machine_is_htcmega()	(machine_arch_type == MACH_TYPE_HTCMEGA)
+# define machine_is_expressct()	(machine_arch_type == MACH_TYPE_EXPRESSCT)
 #else
-# define machine_is_htcmega()	(0)
+# define machine_is_expressct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TRICORDER
+#ifdef CONFIG_MACH_CARDHU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TRICORDER
+#  define machine_arch_type	MACH_TYPE_CARDHU
 # endif
-# define machine_is_tricorder()	(machine_arch_type == MACH_TYPE_TRICORDER)
+# define machine_is_cardhu()	(machine_arch_type == MACH_TYPE_CARDHU)
 #else
-# define machine_is_tricorder()	(0)
+# define machine_is_cardhu()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TX28
+#ifdef CONFIG_MACH_ARUBA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TX28
+#  define machine_arch_type	MACH_TYPE_ARUBA
 # endif
-# define machine_is_tx28()	(machine_arch_type == MACH_TYPE_TX28)
+# define machine_is_aruba()	(machine_arch_type == MACH_TYPE_ARUBA)
 #else
-# define machine_is_tx28()	(0)
+# define machine_is_aruba()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BSTBRD
+#ifdef CONFIG_MACH_BONAIRE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BSTBRD
+#  define machine_arch_type	MACH_TYPE_BONAIRE
 # endif
-# define machine_is_bstbrd()	(machine_arch_type == MACH_TYPE_BSTBRD)
+# define machine_is_bonaire()	(machine_arch_type == MACH_TYPE_BONAIRE)
 #else
-# define machine_is_bstbrd()	(0)
+# define machine_is_bonaire()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PWB3090
+#ifdef CONFIG_MACH_NUC700EVB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PWB3090
+#  define machine_arch_type	MACH_TYPE_NUC700EVB
 # endif
-# define machine_is_pwb3090()	(machine_arch_type == MACH_TYPE_PWB3090)
+# define machine_is_nuc700evb()	(machine_arch_type == MACH_TYPE_NUC700EVB)
 #else
-# define machine_is_pwb3090()	(0)
+# define machine_is_nuc700evb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_IDEA6410
+#ifdef CONFIG_MACH_NUC710EVB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_IDEA6410
+#  define machine_arch_type	MACH_TYPE_NUC710EVB
 # endif
-# define machine_is_idea6410()	(machine_arch_type == MACH_TYPE_IDEA6410)
+# define machine_is_nuc710evb()	(machine_arch_type == MACH_TYPE_NUC710EVB)
 #else
-# define machine_is_idea6410()	(0)
+# define machine_is_nuc710evb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_QBC9263
+#ifdef CONFIG_MACH_NUC740EVB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_QBC9263
+#  define machine_arch_type	MACH_TYPE_NUC740EVB
 # endif
-# define machine_is_qbc9263()	(machine_arch_type == MACH_TYPE_QBC9263)
+# define machine_is_nuc740evb()	(machine_arch_type == MACH_TYPE_NUC740EVB)
 #else
-# define machine_is_qbc9263()	(0)
+# define machine_is_nuc740evb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BORABORA
+#ifdef CONFIG_MACH_NUC745EVB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BORABORA
+#  define machine_arch_type	MACH_TYPE_NUC745EVB
 # endif
-# define machine_is_borabora()	(machine_arch_type == MACH_TYPE_BORABORA)
+# define machine_is_nuc745evb()	(machine_arch_type == MACH_TYPE_NUC745EVB)
 #else
-# define machine_is_borabora()	(0)
+# define machine_is_nuc745evb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VALDEZ
+#ifdef CONFIG_MACH_TRANSCEDE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VALDEZ
+#  define machine_arch_type	MACH_TYPE_TRANSCEDE
 # endif
-# define machine_is_valdez()	(machine_arch_type == MACH_TYPE_VALDEZ)
+# define machine_is_transcede()	(machine_arch_type == MACH_TYPE_TRANSCEDE)
 #else
-# define machine_is_valdez()	(0)
+# define machine_is_transcede()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LS9G20
+#ifdef CONFIG_MACH_MORA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LS9G20
+#  define machine_arch_type	MACH_TYPE_MORA
 # endif
-# define machine_is_ls9g20()	(machine_arch_type == MACH_TYPE_LS9G20)
+# define machine_is_mora()	(machine_arch_type == MACH_TYPE_MORA)
 #else
-# define machine_is_ls9g20()	(0)
+# define machine_is_mora()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MIOS_V1
+#ifdef CONFIG_MACH_NDA_EVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MIOS_V1
+#  define machine_arch_type	MACH_TYPE_NDA_EVM
 # endif
-# define machine_is_mios_v1()	(machine_arch_type == MACH_TYPE_MIOS_V1)
+# define machine_is_nda_evm()	(machine_arch_type == MACH_TYPE_NDA_EVM)
 #else
-# define machine_is_mios_v1()	(0)
+# define machine_is_nda_evm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_S5PC110_CRESPO
+#ifdef CONFIG_MACH_TIMU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_S5PC110_CRESPO
+#  define machine_arch_type	MACH_TYPE_TIMU
 # endif
-# define machine_is_s5pc110_crespo()	(machine_arch_type == MACH_TYPE_S5PC110_CRESPO)
+# define machine_is_timu()	(machine_arch_type == MACH_TYPE_TIMU)
 #else
-# define machine_is_s5pc110_crespo()	(0)
+# define machine_is_timu()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CONTROLTEK9G20
+#ifdef CONFIG_MACH_EXPRESSH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CONTROLTEK9G20
+#  define machine_arch_type	MACH_TYPE_EXPRESSH
 # endif
-# define machine_is_controltek9g20()	(machine_arch_type == MACH_TYPE_CONTROLTEK9G20)
+# define machine_is_expressh()	(machine_arch_type == MACH_TYPE_EXPRESSH)
 #else
-# define machine_is_controltek9g20()	(0)
+# define machine_is_expressh()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TIN307
+#ifdef CONFIG_MACH_VERIDIS_A300
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TIN307
+#  define machine_arch_type	MACH_TYPE_VERIDIS_A300
 # endif
-# define machine_is_tin307()	(machine_arch_type == MACH_TYPE_TIN307)
+# define machine_is_veridis_a300()	(machine_arch_type == MACH_TYPE_VERIDIS_A300)
 #else
-# define machine_is_tin307()	(0)
+# define machine_is_veridis_a300()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TIN510
+#ifdef CONFIG_MACH_DM368_LEOPARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TIN510
+#  define machine_arch_type	MACH_TYPE_DM368_LEOPARD
 # endif
-# define machine_is_tin510()	(machine_arch_type == MACH_TYPE_TIN510)
+# define machine_is_dm368_leopard()	(machine_arch_type == MACH_TYPE_DM368_LEOPARD)
 #else
-# define machine_is_tin510()	(0)
+# define machine_is_dm368_leopard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BLUECHEESE
+#ifdef CONFIG_MACH_OMAP_MCOP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BLUECHEESE
+#  define machine_arch_type	MACH_TYPE_OMAP_MCOP
 # endif
-# define machine_is_bluecheese()	(machine_arch_type == MACH_TYPE_BLUECHEESE)
+# define machine_is_omap_mcop()	(machine_arch_type == MACH_TYPE_OMAP_MCOP)
 #else
-# define machine_is_bluecheese()	(0)
+# define machine_is_omap_mcop()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TEM3X30
+#ifdef CONFIG_MACH_TRITIP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TEM3X30
+#  define machine_arch_type	MACH_TYPE_TRITIP
 # endif
-# define machine_is_tem3x30()	(machine_arch_type == MACH_TYPE_TEM3X30)
+# define machine_is_tritip()	(machine_arch_type == MACH_TYPE_TRITIP)
 #else
-# define machine_is_tem3x30()	(0)
+# define machine_is_tritip()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HARVEST_DESOTO
+#ifdef CONFIG_MACH_SM1K
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HARVEST_DESOTO
+#  define machine_arch_type	MACH_TYPE_SM1K
 # endif
-# define machine_is_harvest_desoto()	(machine_arch_type == MACH_TYPE_HARVEST_DESOTO)
+# define machine_is_sm1k()	(machine_arch_type == MACH_TYPE_SM1K)
 #else
-# define machine_is_harvest_desoto()	(0)
+# define machine_is_sm1k()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X60_QRDC
+#ifdef CONFIG_MACH_MONCH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X60_QRDC
+#  define machine_arch_type	MACH_TYPE_MONCH
 # endif
-# define machine_is_msm8x60_qrdc()	(machine_arch_type == MACH_TYPE_MSM8X60_QRDC)
+# define machine_is_monch()	(machine_arch_type == MACH_TYPE_MONCH)
 #else
-# define machine_is_msm8x60_qrdc()	(0)
+# define machine_is_monch()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPEAR900
+#ifdef CONFIG_MACH_CURACAO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPEAR900
+#  define machine_arch_type	MACH_TYPE_CURACAO
 # endif
-# define machine_is_spear900()	(machine_arch_type == MACH_TYPE_SPEAR900)
+# define machine_is_curacao()	(machine_arch_type == MACH_TYPE_CURACAO)
 #else
-# define machine_is_spear900()	(0)
+# define machine_is_curacao()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PCONTROL_G20
+#ifdef CONFIG_MACH_ORIGEN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PCONTROL_G20
+#  define machine_arch_type	MACH_TYPE_ORIGEN
 # endif
-# define machine_is_pcontrol_g20()	(machine_arch_type == MACH_TYPE_PCONTROL_G20)
+# define machine_is_origen()	(machine_arch_type == MACH_TYPE_ORIGEN)
 #else
-# define machine_is_pcontrol_g20()	(0)
+# define machine_is_origen()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RDSTOR
+#ifdef CONFIG_MACH_EPC10
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RDSTOR
+#  define machine_arch_type	MACH_TYPE_EPC10
 # endif
-# define machine_is_rdstor()	(machine_arch_type == MACH_TYPE_RDSTOR)
+# define machine_is_epc10()	(machine_arch_type == MACH_TYPE_EPC10)
 #else
-# define machine_is_rdstor()	(0)
+# define machine_is_epc10()	(0)
 #endif
 
-#ifdef CONFIG_MACH_USDLOADER
+#ifdef CONFIG_MACH_SGH_I740
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_USDLOADER
+#  define machine_arch_type	MACH_TYPE_SGH_I740
 # endif
-# define machine_is_usdloader()	(machine_arch_type == MACH_TYPE_USDLOADER)
+# define machine_is_sgh_i740()	(machine_arch_type == MACH_TYPE_SGH_I740)
 #else
-# define machine_is_usdloader()	(0)
+# define machine_is_sgh_i740()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TSOPLOADER
+#ifdef CONFIG_MACH_TUNA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TSOPLOADER
+#  define machine_arch_type	MACH_TYPE_TUNA
 # endif
-# define machine_is_tsoploader()	(machine_arch_type == MACH_TYPE_TSOPLOADER)
+# define machine_is_tuna()	(machine_arch_type == MACH_TYPE_TUNA)
 #else
-# define machine_is_tsoploader()	(0)
+# define machine_is_tuna()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KRONOS
+#ifdef CONFIG_MACH_MX51_TULIP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KRONOS
+#  define machine_arch_type	MACH_TYPE_MX51_TULIP
 # endif
-# define machine_is_kronos()	(machine_arch_type == MACH_TYPE_KRONOS)
+# define machine_is_mx51_tulip()	(machine_arch_type == MACH_TYPE_MX51_TULIP)
 #else
-# define machine_is_kronos()	(0)
+# define machine_is_mx51_tulip()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FFCORE
+#ifdef CONFIG_MACH_MX51_ASTER7
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FFCORE
+#  define machine_arch_type	MACH_TYPE_MX51_ASTER7
 # endif
-# define machine_is_ffcore()	(machine_arch_type == MACH_TYPE_FFCORE)
+# define machine_is_mx51_aster7()	(machine_arch_type == MACH_TYPE_MX51_ASTER7)
 #else
-# define machine_is_ffcore()	(0)
+# define machine_is_mx51_aster7()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MONE
+#ifdef CONFIG_MACH_ACRO37XBRD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MONE
+#  define machine_arch_type	MACH_TYPE_ACRO37XBRD
 # endif
-# define machine_is_mone()	(machine_arch_type == MACH_TYPE_MONE)
+# define machine_is_acro37xbrd()	(machine_arch_type == MACH_TYPE_ACRO37XBRD)
 #else
-# define machine_is_mone()	(0)
+# define machine_is_acro37xbrd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UNIT2S
+#ifdef CONFIG_MACH_ELKE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UNIT2S
+#  define machine_arch_type	MACH_TYPE_ELKE
 # endif
-# define machine_is_unit2s()	(machine_arch_type == MACH_TYPE_UNIT2S)
+# define machine_is_elke()	(machine_arch_type == MACH_TYPE_ELKE)
 #else
-# define machine_is_unit2s()	(0)
+# define machine_is_elke()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACER_A5
+#ifdef CONFIG_MACH_SBC6000X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACER_A5
+#  define machine_arch_type	MACH_TYPE_SBC6000X
 # endif
-# define machine_is_acer_a5()	(machine_arch_type == MACH_TYPE_ACER_A5)
+# define machine_is_sbc6000x()	(machine_arch_type == MACH_TYPE_SBC6000X)
 #else
-# define machine_is_acer_a5()	(0)
+# define machine_is_sbc6000x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ETHERPRO_ISP
+#ifdef CONFIG_MACH_R1801E
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ETHERPRO_ISP
+#  define machine_arch_type	MACH_TYPE_R1801E
 # endif
-# define machine_is_etherpro_isp()	(machine_arch_type == MACH_TYPE_ETHERPRO_ISP)
+# define machine_is_r1801e()	(machine_arch_type == MACH_TYPE_R1801E)
 #else
-# define machine_is_etherpro_isp()	(0)
+# define machine_is_r1801e()	(0)
 #endif
 
-#ifdef CONFIG_MACH_STRETCHS7000
+#ifdef CONFIG_MACH_H1600
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_STRETCHS7000
+#  define machine_arch_type	MACH_TYPE_H1600
 # endif
-# define machine_is_stretchs7000()	(machine_arch_type == MACH_TYPE_STRETCHS7000)
+# define machine_is_h1600()	(machine_arch_type == MACH_TYPE_H1600)
 #else
-# define machine_is_stretchs7000()	(0)
+# define machine_is_h1600()	(0)
 #endif
 
-#ifdef CONFIG_MACH_P87_SMARTSIM
+#ifdef CONFIG_MACH_MINI210
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_P87_SMARTSIM
+#  define machine_arch_type	MACH_TYPE_MINI210
 # endif
-# define machine_is_p87_smartsim()	(machine_arch_type == MACH_TYPE_P87_SMARTSIM)
+# define machine_is_mini210()	(machine_arch_type == MACH_TYPE_MINI210)
 #else
-# define machine_is_p87_smartsim()	(0)
+# define machine_is_mini210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TULIP
+#ifdef CONFIG_MACH_MINI8168
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TULIP
+#  define machine_arch_type	MACH_TYPE_MINI8168
 # endif
-# define machine_is_tulip()	(machine_arch_type == MACH_TYPE_TULIP)
+# define machine_is_mini8168()	(machine_arch_type == MACH_TYPE_MINI8168)
 #else
-# define machine_is_tulip()	(0)
+# define machine_is_mini8168()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SUNFLOWER
+#ifdef CONFIG_MACH_PC7308
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SUNFLOWER
+#  define machine_arch_type	MACH_TYPE_PC7308
 # endif
-# define machine_is_sunflower()	(machine_arch_type == MACH_TYPE_SUNFLOWER)
+# define machine_is_pc7308()	(machine_arch_type == MACH_TYPE_PC7308)
 #else
-# define machine_is_sunflower()	(0)
+# define machine_is_pc7308()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RIB
+#ifdef CONFIG_MACH_KMM2M01
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RIB
+#  define machine_arch_type	MACH_TYPE_KMM2M01
 # endif
-# define machine_is_rib()	(machine_arch_type == MACH_TYPE_RIB)
+# define machine_is_kmm2m01()	(machine_arch_type == MACH_TYPE_KMM2M01)
 #else
-# define machine_is_rib()	(0)
+# define machine_is_kmm2m01()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CLOD
+#ifdef CONFIG_MACH_MX51EREBUS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CLOD
+#  define machine_arch_type	MACH_TYPE_MX51EREBUS
 # endif
-# define machine_is_clod()	(machine_arch_type == MACH_TYPE_CLOD)
+# define machine_is_mx51erebus()	(machine_arch_type == MACH_TYPE_MX51EREBUS)
 #else
-# define machine_is_clod()	(0)
+# define machine_is_mx51erebus()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RUMP
+#ifdef CONFIG_MACH_WM8650REFBOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RUMP
+#  define machine_arch_type	MACH_TYPE_WM8650REFBOARD
 # endif
-# define machine_is_rump()	(machine_arch_type == MACH_TYPE_RUMP)
+# define machine_is_wm8650refboard()	(machine_arch_type == MACH_TYPE_WM8650REFBOARD)
 #else
-# define machine_is_rump()	(0)
+# define machine_is_wm8650refboard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TENDERLOIN
+#ifdef CONFIG_MACH_TUXRAIL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TENDERLOIN
+#  define machine_arch_type	MACH_TYPE_TUXRAIL
 # endif
-# define machine_is_tenderloin()	(machine_arch_type == MACH_TYPE_TENDERLOIN)
+# define machine_is_tuxrail()	(machine_arch_type == MACH_TYPE_TUXRAIL)
 #else
-# define machine_is_tenderloin()	(0)
+# define machine_is_tuxrail()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SHORTLOIN
+#ifdef CONFIG_MACH_ARTHUR
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SHORTLOIN
+#  define machine_arch_type	MACH_TYPE_ARTHUR
 # endif
-# define machine_is_shortloin()	(machine_arch_type == MACH_TYPE_SHORTLOIN)
+# define machine_is_arthur()	(machine_arch_type == MACH_TYPE_ARTHUR)
 #else
-# define machine_is_shortloin()	(0)
+# define machine_is_arthur()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ANTARES
+#ifdef CONFIG_MACH_DOORBOY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ANTARES
+#  define machine_arch_type	MACH_TYPE_DOORBOY
 # endif
-# define machine_is_antares()	(machine_arch_type == MACH_TYPE_ANTARES)
+# define machine_is_doorboy()	(machine_arch_type == MACH_TYPE_DOORBOY)
 #else
-# define machine_is_antares()	(0)
+# define machine_is_doorboy()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WB40N
+#ifdef CONFIG_MACH_XARINA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WB40N
+#  define machine_arch_type	MACH_TYPE_XARINA
 # endif
-# define machine_is_wb40n()	(machine_arch_type == MACH_TYPE_WB40N)
+# define machine_is_xarina()	(machine_arch_type == MACH_TYPE_XARINA)
 #else
-# define machine_is_wb40n()	(0)
+# define machine_is_xarina()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HERRING
+#ifdef CONFIG_MACH_ROVERX7
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HERRING
+#  define machine_arch_type	MACH_TYPE_ROVERX7
 # endif
-# define machine_is_herring()	(machine_arch_type == MACH_TYPE_HERRING)
+# define machine_is_roverx7()	(machine_arch_type == MACH_TYPE_ROVERX7)
 #else
-# define machine_is_herring()	(0)
+# define machine_is_roverx7()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NAXY400
+#ifdef CONFIG_MACH_SDVR
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NAXY400
+#  define machine_arch_type	MACH_TYPE_SDVR
 # endif
-# define machine_is_naxy400()	(machine_arch_type == MACH_TYPE_NAXY400)
+# define machine_is_sdvr()	(machine_arch_type == MACH_TYPE_SDVR)
 #else
-# define machine_is_naxy400()	(0)
+# define machine_is_sdvr()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NAXY1200
+#ifdef CONFIG_MACH_ACER_MAYA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NAXY1200
+#  define machine_arch_type	MACH_TYPE_ACER_MAYA
 # endif
-# define machine_is_naxy1200()	(machine_arch_type == MACH_TYPE_NAXY1200)
+# define machine_is_acer_maya()	(machine_arch_type == MACH_TYPE_ACER_MAYA)
 #else
-# define machine_is_naxy1200()	(0)
+# define machine_is_acer_maya()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VPR200
+#ifdef CONFIG_MACH_PICO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VPR200
+#  define machine_arch_type	MACH_TYPE_PICO
 # endif
-# define machine_is_vpr200()	(machine_arch_type == MACH_TYPE_VPR200)
+# define machine_is_pico()	(machine_arch_type == MACH_TYPE_PICO)
 #else
-# define machine_is_vpr200()	(0)
+# define machine_is_pico()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BUG20
+#ifdef CONFIG_MACH_CWMX233
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BUG20
+#  define machine_arch_type	MACH_TYPE_CWMX233
 # endif
-# define machine_is_bug20()	(machine_arch_type == MACH_TYPE_BUG20)
+# define machine_is_cwmx233()	(machine_arch_type == MACH_TYPE_CWMX233)
 #else
-# define machine_is_bug20()	(0)
+# define machine_is_cwmx233()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GOFLEXNET
+#ifdef CONFIG_MACH_CWAM1808
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GOFLEXNET
+#  define machine_arch_type	MACH_TYPE_CWAM1808
 # endif
-# define machine_is_goflexnet()	(machine_arch_type == MACH_TYPE_GOFLEXNET)
+# define machine_is_cwam1808()	(machine_arch_type == MACH_TYPE_CWAM1808)
 #else
-# define machine_is_goflexnet()	(0)
+# define machine_is_cwam1808()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TORBRECK
+#ifdef CONFIG_MACH_CWDM365
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TORBRECK
+#  define machine_arch_type	MACH_TYPE_CWDM365
 # endif
-# define machine_is_torbreck()	(machine_arch_type == MACH_TYPE_TORBRECK)
+# define machine_is_cwdm365()	(machine_arch_type == MACH_TYPE_CWDM365)
 #else
-# define machine_is_torbreck()	(0)
+# define machine_is_cwdm365()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SAARB_MG1
+#ifdef CONFIG_MACH_MX51_MORAY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SAARB_MG1
+#  define machine_arch_type	MACH_TYPE_MX51_MORAY
 # endif
-# define machine_is_saarb_mg1()	(machine_arch_type == MACH_TYPE_SAARB_MG1)
+# define machine_is_mx51_moray()	(machine_arch_type == MACH_TYPE_MX51_MORAY)
 #else
-# define machine_is_saarb_mg1()	(0)
+# define machine_is_mx51_moray()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CALLISTO
+#ifdef CONFIG_MACH_THALES_CBC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CALLISTO
+#  define machine_arch_type	MACH_TYPE_THALES_CBC
 # endif
-# define machine_is_callisto()	(machine_arch_type == MACH_TYPE_CALLISTO)
+# define machine_is_thales_cbc()	(machine_arch_type == MACH_TYPE_THALES_CBC)
 #else
-# define machine_is_callisto()	(0)
+# define machine_is_thales_cbc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MULTHSU
+#ifdef CONFIG_MACH_BLUEPOINT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MULTHSU
+#  define machine_arch_type	MACH_TYPE_BLUEPOINT
 # endif
-# define machine_is_multhsu()	(machine_arch_type == MACH_TYPE_MULTHSU)
+# define machine_is_bluepoint()	(machine_arch_type == MACH_TYPE_BLUEPOINT)
 #else
-# define machine_is_multhsu()	(0)
+# define machine_is_bluepoint()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SALUDA
+#ifdef CONFIG_MACH_DIR665
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SALUDA
+#  define machine_arch_type	MACH_TYPE_DIR665
 # endif
-# define machine_is_saluda()	(machine_arch_type == MACH_TYPE_SALUDA)
+# define machine_is_dir665()	(machine_arch_type == MACH_TYPE_DIR665)
 #else
-# define machine_is_saluda()	(0)
+# define machine_is_dir665()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PEMP_OMAP3_APOLLO
+#ifdef CONFIG_MACH_ACMEROVER1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PEMP_OMAP3_APOLLO
+#  define machine_arch_type	MACH_TYPE_ACMEROVER1
 # endif
-# define machine_is_pemp_omap3_apollo()	(machine_arch_type == MACH_TYPE_PEMP_OMAP3_APOLLO)
+# define machine_is_acmerover1()	(machine_arch_type == MACH_TYPE_ACMEROVER1)
 #else
-# define machine_is_pemp_omap3_apollo()	(0)
+# define machine_is_acmerover1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VC0718
+#ifdef CONFIG_MACH_SHOOTER_CT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VC0718
+#  define machine_arch_type	MACH_TYPE_SHOOTER_CT
 # endif
-# define machine_is_vc0718()	(machine_arch_type == MACH_TYPE_VC0718)
+# define machine_is_shooter_ct()	(machine_arch_type == MACH_TYPE_SHOOTER_CT)
 #else
-# define machine_is_vc0718()	(0)
+# define machine_is_shooter_ct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MVBLX
+#ifdef CONFIG_MACH_BLISS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MVBLX
+#  define machine_arch_type	MACH_TYPE_BLISS
 # endif
-# define machine_is_mvblx()	(machine_arch_type == MACH_TYPE_MVBLX)
+# define machine_is_bliss()	(machine_arch_type == MACH_TYPE_BLISS)
 #else
-# define machine_is_mvblx()	(0)
+# define machine_is_bliss()	(0)
 #endif
 
-#ifdef CONFIG_MACH_INHAND_APEIRON
+#ifdef CONFIG_MACH_BLISSC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_INHAND_APEIRON
+#  define machine_arch_type	MACH_TYPE_BLISSC
 # endif
-# define machine_is_inhand_apeiron()	(machine_arch_type == MACH_TYPE_INHAND_APEIRON)
+# define machine_is_blissc()	(machine_arch_type == MACH_TYPE_BLISSC)
 #else
-# define machine_is_inhand_apeiron()	(0)
+# define machine_is_blissc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_INHAND_FURY
+#ifdef CONFIG_MACH_THALES_ADC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_INHAND_FURY
+#  define machine_arch_type	MACH_TYPE_THALES_ADC
 # endif
-# define machine_is_inhand_fury()	(machine_arch_type == MACH_TYPE_INHAND_FURY)
+# define machine_is_thales_adc()	(machine_arch_type == MACH_TYPE_THALES_ADC)
 #else
-# define machine_is_inhand_fury()	(0)
+# define machine_is_thales_adc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_INHAND_SIREN
+#ifdef CONFIG_MACH_UBISYS_P9D_EVP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_INHAND_SIREN
+#  define machine_arch_type	MACH_TYPE_UBISYS_P9D_EVP
 # endif
-# define machine_is_inhand_siren()	(machine_arch_type == MACH_TYPE_INHAND_SIREN)
+# define machine_is_ubisys_p9d_evp()	(machine_arch_type == MACH_TYPE_UBISYS_P9D_EVP)
 #else
-# define machine_is_inhand_siren()	(0)
+# define machine_is_ubisys_p9d_evp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HDNVP
+#ifdef CONFIG_MACH_ATDGP318
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HDNVP
+#  define machine_arch_type	MACH_TYPE_ATDGP318
 # endif
-# define machine_is_hdnvp()	(machine_arch_type == MACH_TYPE_HDNVP)
+# define machine_is_atdgp318()	(machine_arch_type == MACH_TYPE_ATDGP318)
 #else
-# define machine_is_hdnvp()	(0)
+# define machine_is_atdgp318()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SOFTWINNER
+#ifdef CONFIG_MACH_DMA210U
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SOFTWINNER
+#  define machine_arch_type	MACH_TYPE_DMA210U
 # endif
-# define machine_is_softwinner()	(machine_arch_type == MACH_TYPE_SOFTWINNER)
+# define machine_is_dma210u()	(machine_arch_type == MACH_TYPE_DMA210U)
 #else
-# define machine_is_softwinner()	(0)
+# define machine_is_dma210u()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PRIMA2_EVB
+#ifdef CONFIG_MACH_EM_T3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PRIMA2_EVB
+#  define machine_arch_type	MACH_TYPE_EM_T3
 # endif
-# define machine_is_prima2_evb()	(machine_arch_type == MACH_TYPE_PRIMA2_EVB)
+# define machine_is_em_t3()	(machine_arch_type == MACH_TYPE_EM_T3)
 #else
-# define machine_is_prima2_evb()	(0)
+# define machine_is_em_t3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NAS6210
+#ifdef CONFIG_MACH_HTX3250
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NAS6210
+#  define machine_arch_type	MACH_TYPE_HTX3250
 # endif
-# define machine_is_nas6210()	(machine_arch_type == MACH_TYPE_NAS6210)
+# define machine_is_htx3250()	(machine_arch_type == MACH_TYPE_HTX3250)
 #else
-# define machine_is_nas6210()	(0)
+# define machine_is_htx3250()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UNISDEV
+#ifdef CONFIG_MACH_G50
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UNISDEV
+#  define machine_arch_type	MACH_TYPE_G50
 # endif
-# define machine_is_unisdev()	(machine_arch_type == MACH_TYPE_UNISDEV)
+# define machine_is_g50()	(machine_arch_type == MACH_TYPE_G50)
 #else
-# define machine_is_unisdev()	(0)
+# define machine_is_g50()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SBCA11
+#ifdef CONFIG_MACH_ECO5
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SBCA11
+#  define machine_arch_type	MACH_TYPE_ECO5
 # endif
-# define machine_is_sbca11()	(machine_arch_type == MACH_TYPE_SBCA11)
+# define machine_is_eco5()	(machine_arch_type == MACH_TYPE_ECO5)
 #else
-# define machine_is_sbca11()	(0)
+# define machine_is_eco5()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SAGA
+#ifdef CONFIG_MACH_WINTERGRASP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SAGA
+#  define machine_arch_type	MACH_TYPE_WINTERGRASP
 # endif
-# define machine_is_saga()	(machine_arch_type == MACH_TYPE_SAGA)
+# define machine_is_wintergrasp()	(machine_arch_type == MACH_TYPE_WINTERGRASP)
 #else
-# define machine_is_saga()	(0)
+# define machine_is_wintergrasp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NS_K330
+#ifdef CONFIG_MACH_PURO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NS_K330
+#  define machine_arch_type	MACH_TYPE_PURO
 # endif
-# define machine_is_ns_k330()	(machine_arch_type == MACH_TYPE_NS_K330)
+# define machine_is_puro()	(machine_arch_type == MACH_TYPE_PURO)
 #else
-# define machine_is_ns_k330()	(0)
+# define machine_is_puro()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TANNA
+#ifdef CONFIG_MACH_SHOOTER_K
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TANNA
+#  define machine_arch_type	MACH_TYPE_SHOOTER_K
 # endif
-# define machine_is_tanna()	(machine_arch_type == MACH_TYPE_TANNA)
+# define machine_is_shooter_k()	(machine_arch_type == MACH_TYPE_SHOOTER_K)
 #else
-# define machine_is_tanna()	(0)
+# define machine_is_shooter_k()	(0)
 #endif
 
-#ifdef CONFIG_MACH_IMATE8502
+#ifdef CONFIG_MACH_NSPIRE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_IMATE8502
+#  define machine_arch_type	MACH_TYPE_NSPIRE
 # endif
-# define machine_is_imate8502()	(machine_arch_type == MACH_TYPE_IMATE8502)
+# define machine_is_nspire()	(machine_arch_type == MACH_TYPE_NSPIRE)
 #else
-# define machine_is_imate8502()	(0)
+# define machine_is_nspire()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ASPEN
+#ifdef CONFIG_MACH_MICKXX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ASPEN
+#  define machine_arch_type	MACH_TYPE_MICKXX
 # endif
-# define machine_is_aspen()	(machine_arch_type == MACH_TYPE_ASPEN)
+# define machine_is_mickxx()	(machine_arch_type == MACH_TYPE_MICKXX)
 #else
-# define machine_is_aspen()	(0)
+# define machine_is_mickxx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DAINTREE_CWAC
+#ifdef CONFIG_MACH_LXMB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DAINTREE_CWAC
+#  define machine_arch_type	MACH_TYPE_LXMB
 # endif
-# define machine_is_daintree_cwac()	(machine_arch_type == MACH_TYPE_DAINTREE_CWAC)
+# define machine_is_lxmb()	(machine_arch_type == MACH_TYPE_LXMB)
 #else
-# define machine_is_daintree_cwac()	(0)
+# define machine_is_lxmb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ZMX25
+#ifdef CONFIG_MACH_ADAM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ZMX25
+#  define machine_arch_type	MACH_TYPE_ADAM
 # endif
-# define machine_is_zmx25()	(machine_arch_type == MACH_TYPE_ZMX25)
+# define machine_is_adam()	(machine_arch_type == MACH_TYPE_ADAM)
 #else
-# define machine_is_zmx25()	(0)
+# define machine_is_adam()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MAPLE1
+#ifdef CONFIG_MACH_B1004
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MAPLE1
+#  define machine_arch_type	MACH_TYPE_B1004
 # endif
-# define machine_is_maple1()	(machine_arch_type == MACH_TYPE_MAPLE1)
+# define machine_is_b1004()	(machine_arch_type == MACH_TYPE_B1004)
 #else
-# define machine_is_maple1()	(0)
+# define machine_is_b1004()	(0)
 #endif
 
-#ifdef CONFIG_MACH_QSD8X72_SURF
+#ifdef CONFIG_MACH_OBOEA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_QSD8X72_SURF
+#  define machine_arch_type	MACH_TYPE_OBOEA
 # endif
-# define machine_is_qsd8x72_surf()	(machine_arch_type == MACH_TYPE_QSD8X72_SURF)
+# define machine_is_oboea()	(machine_arch_type == MACH_TYPE_OBOEA)
 #else
-# define machine_is_qsd8x72_surf()	(0)
+# define machine_is_oboea()	(0)
 #endif
 
-#ifdef CONFIG_MACH_QSD8X72_FFA
+#ifdef CONFIG_MACH_A1015
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_QSD8X72_FFA
+#  define machine_arch_type	MACH_TYPE_A1015
 # endif
-# define machine_is_qsd8x72_ffa()	(machine_arch_type == MACH_TYPE_QSD8X72_FFA)
+# define machine_is_a1015()	(machine_arch_type == MACH_TYPE_A1015)
 #else
-# define machine_is_qsd8x72_ffa()	(0)
+# define machine_is_a1015()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ABILENE
+#ifdef CONFIG_MACH_ROBIN_VBDT30
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ABILENE
+#  define machine_arch_type	MACH_TYPE_ROBIN_VBDT30
 # endif
-# define machine_is_abilene()	(machine_arch_type == MACH_TYPE_ABILENE)
+# define machine_is_robin_vbdt30()	(machine_arch_type == MACH_TYPE_ROBIN_VBDT30)
 #else
-# define machine_is_abilene()	(0)
+# define machine_is_robin_vbdt30()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EIGEN_TTR
+#ifdef CONFIG_MACH_TEGRA_ENTERPRISE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EIGEN_TTR
+#  define machine_arch_type	MACH_TYPE_TEGRA_ENTERPRISE
 # endif
-# define machine_is_eigen_ttr()	(machine_arch_type == MACH_TYPE_EIGEN_TTR)
+# define machine_is_tegra_enterprise()	(machine_arch_type == MACH_TYPE_TEGRA_ENTERPRISE)
 #else
-# define machine_is_eigen_ttr()	(0)
+# define machine_is_tegra_enterprise()	(0)
 #endif
 
-#ifdef CONFIG_MACH_IOMEGA_IX2_200
+#ifdef CONFIG_MACH_RFL108200_MK10
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_IOMEGA_IX2_200
+#  define machine_arch_type	MACH_TYPE_RFL108200_MK10
 # endif
-# define machine_is_iomega_ix2_200()	(machine_arch_type == MACH_TYPE_IOMEGA_IX2_200)
+# define machine_is_rfl108200_mk10()	(machine_arch_type == MACH_TYPE_RFL108200_MK10)
 #else
-# define machine_is_iomega_ix2_200()	(0)
+# define machine_is_rfl108200_mk10()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CORETEC_VCX7400
+#ifdef CONFIG_MACH_RFL108300_MK16
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CORETEC_VCX7400
+#  define machine_arch_type	MACH_TYPE_RFL108300_MK16
 # endif
-# define machine_is_coretec_vcx7400()	(machine_arch_type == MACH_TYPE_CORETEC_VCX7400)
+# define machine_is_rfl108300_mk16()	(machine_arch_type == MACH_TYPE_RFL108300_MK16)
 #else
-# define machine_is_coretec_vcx7400()	(0)
+# define machine_is_rfl108300_mk16()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SANTIAGO
+#ifdef CONFIG_MACH_ROVER_V7
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SANTIAGO
+#  define machine_arch_type	MACH_TYPE_ROVER_V7
 # endif
-# define machine_is_santiago()	(machine_arch_type == MACH_TYPE_SANTIAGO)
+# define machine_is_rover_v7()	(machine_arch_type == MACH_TYPE_ROVER_V7)
 #else
-# define machine_is_santiago()	(0)
+# define machine_is_rover_v7()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX257SOL
+#ifdef CONFIG_MACH_MIPHONE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX257SOL
+#  define machine_arch_type	MACH_TYPE_MIPHONE
 # endif
-# define machine_is_mx257sol()	(machine_arch_type == MACH_TYPE_MX257SOL)
+# define machine_is_miphone()	(machine_arch_type == MACH_TYPE_MIPHONE)
 #else
-# define machine_is_mx257sol()	(0)
+# define machine_is_miphone()	(0)
 #endif
 
-#ifdef CONFIG_MACH_STRASBOURG
+#ifdef CONFIG_MACH_FEMTOBTS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_STRASBOURG
+#  define machine_arch_type	MACH_TYPE_FEMTOBTS
 # endif
-# define machine_is_strasbourg()	(machine_arch_type == MACH_TYPE_STRASBOURG)
+# define machine_is_femtobts()	(machine_arch_type == MACH_TYPE_FEMTOBTS)
 #else
-# define machine_is_strasbourg()	(0)
+# define machine_is_femtobts()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X60_FLUID
+#ifdef CONFIG_MACH_MONOPOLI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X60_FLUID
+#  define machine_arch_type	MACH_TYPE_MONOPOLI
 # endif
-# define machine_is_msm8x60_fluid()	(machine_arch_type == MACH_TYPE_MSM8X60_FLUID)
+# define machine_is_monopoli()	(machine_arch_type == MACH_TYPE_MONOPOLI)
 #else
-# define machine_is_msm8x60_fluid()	(0)
+# define machine_is_monopoli()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SMARTQV5
+#ifdef CONFIG_MACH_BOSS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SMARTQV5
+#  define machine_arch_type	MACH_TYPE_BOSS
 # endif
-# define machine_is_smartqv5()	(machine_arch_type == MACH_TYPE_SMARTQV5)
+# define machine_is_boss()	(machine_arch_type == MACH_TYPE_BOSS)
 #else
-# define machine_is_smartqv5()	(0)
+# define machine_is_boss()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SMARTQV3
+#ifdef CONFIG_MACH_DAVINCI_DM368_VTAM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SMARTQV3
+#  define machine_arch_type	MACH_TYPE_DAVINCI_DM368_VTAM
 # endif
-# define machine_is_smartqv3()	(machine_arch_type == MACH_TYPE_SMARTQV3)
+# define machine_is_davinci_dm368_vtam()	(machine_arch_type == MACH_TYPE_DAVINCI_DM368_VTAM)
 #else
-# define machine_is_smartqv3()	(0)
+# define machine_is_davinci_dm368_vtam()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SMARTQV7
+#ifdef CONFIG_MACH_CLCON
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SMARTQV7
+#  define machine_arch_type	MACH_TYPE_CLCON
 # endif
-# define machine_is_smartqv7()	(machine_arch_type == MACH_TYPE_SMARTQV7)
+# define machine_is_clcon()	(machine_arch_type == MACH_TYPE_CLCON)
 #else
-# define machine_is_smartqv7()	(0)
+# define machine_is_clcon()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PAZ00
+#ifdef CONFIG_MACH_NOKIA_RM696
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PAZ00
+#  define machine_arch_type	MACH_TYPE_NOKIA_RM696
 # endif
-# define machine_is_paz00()	(machine_arch_type == MACH_TYPE_PAZ00)
+# define machine_is_nokia_rm696()	(machine_arch_type == MACH_TYPE_NOKIA_RM696)
 #else
-# define machine_is_paz00()	(0)
+# define machine_is_nokia_rm696()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACMENETUSFOXG20
+#ifdef CONFIG_MACH_TAHITI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACMENETUSFOXG20
+#  define machine_arch_type	MACH_TYPE_TAHITI
 # endif
-# define machine_is_acmenetusfoxg20()	(machine_arch_type == MACH_TYPE_ACMENETUSFOXG20)
+# define machine_is_tahiti()	(machine_arch_type == MACH_TYPE_TAHITI)
 #else
-# define machine_is_acmenetusfoxg20()	(0)
+# define machine_is_tahiti()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FWBD_0404
+#ifdef CONFIG_MACH_FIGHTER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FWBD_0404
+#  define machine_arch_type	MACH_TYPE_FIGHTER
 # endif
-# define machine_is_fwbd_0404()	(machine_arch_type == MACH_TYPE_FWBD_0404)
+# define machine_is_fighter()	(machine_arch_type == MACH_TYPE_FIGHTER)
 #else
-# define machine_is_fwbd_0404()	(0)
+# define machine_is_fighter()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HDGU
+#ifdef CONFIG_MACH_SGH_I710
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HDGU
+#  define machine_arch_type	MACH_TYPE_SGH_I710
 # endif
-# define machine_is_hdgu()	(machine_arch_type == MACH_TYPE_HDGU)
+# define machine_is_sgh_i710()	(machine_arch_type == MACH_TYPE_SGH_I710)
 #else
-# define machine_is_hdgu()	(0)
+# define machine_is_sgh_i710()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PYRAMID
+#ifdef CONFIG_MACH_INTEGREPROSCB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PYRAMID
+#  define machine_arch_type	MACH_TYPE_INTEGREPROSCB
 # endif
-# define machine_is_pyramid()	(machine_arch_type == MACH_TYPE_PYRAMID)
+# define machine_is_integreproscb()	(machine_arch_type == MACH_TYPE_INTEGREPROSCB)
 #else
-# define machine_is_pyramid()	(0)
+# define machine_is_integreproscb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EPIPHAN
+#ifdef CONFIG_MACH_MONZA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EPIPHAN
+#  define machine_arch_type	MACH_TYPE_MONZA
 # endif
-# define machine_is_epiphan()	(machine_arch_type == MACH_TYPE_EPIPHAN)
+# define machine_is_monza()	(machine_arch_type == MACH_TYPE_MONZA)
 #else
-# define machine_is_epiphan()	(0)
+# define machine_is_monza()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP_BENDER
+#ifdef CONFIG_MACH_CALIMAIN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP_BENDER
+#  define machine_arch_type	MACH_TYPE_CALIMAIN
 # endif
-# define machine_is_omap_bender()	(machine_arch_type == MACH_TYPE_OMAP_BENDER)
+# define machine_is_calimain()	(machine_arch_type == MACH_TYPE_CALIMAIN)
 #else
-# define machine_is_omap_bender()	(0)
+# define machine_is_calimain()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GURNARD
+#ifdef CONFIG_MACH_MX6Q_SABREAUTO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GURNARD
+#  define machine_arch_type	MACH_TYPE_MX6Q_SABREAUTO
 # endif
-# define machine_is_gurnard()	(machine_arch_type == MACH_TYPE_GURNARD)
+# define machine_is_mx6q_sabreauto()	(machine_arch_type == MACH_TYPE_MX6Q_SABREAUTO)
 #else
-# define machine_is_gurnard()	(0)
+# define machine_is_mx6q_sabreauto()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GTL_IT5100
+#ifdef CONFIG_MACH_GMA01X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GTL_IT5100
+#  define machine_arch_type	MACH_TYPE_GMA01X
 # endif
-# define machine_is_gtl_it5100()	(machine_arch_type == MACH_TYPE_GTL_IT5100)
+# define machine_is_gma01x()	(machine_arch_type == MACH_TYPE_GMA01X)
 #else
-# define machine_is_gtl_it5100()	(0)
+# define machine_is_gma01x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BCM2708
+#ifdef CONFIG_MACH_SBC51
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BCM2708
+#  define machine_arch_type	MACH_TYPE_SBC51
 # endif
-# define machine_is_bcm2708()	(machine_arch_type == MACH_TYPE_BCM2708)
+# define machine_is_sbc51()	(machine_arch_type == MACH_TYPE_SBC51)
 #else
-# define machine_is_bcm2708()	(0)
+# define machine_is_sbc51()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX51_GGC
+#ifdef CONFIG_MACH_FIT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX51_GGC
+#  define machine_arch_type	MACH_TYPE_FIT
 # endif
-# define machine_is_mx51_ggc()	(machine_arch_type == MACH_TYPE_MX51_GGC)
+# define machine_is_fit()	(machine_arch_type == MACH_TYPE_FIT)
 #else
-# define machine_is_mx51_ggc()	(0)
+# define machine_is_fit()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SHARESPACE
+#ifdef CONFIG_MACH_STEELHEAD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SHARESPACE
+#  define machine_arch_type	MACH_TYPE_STEELHEAD
 # endif
-# define machine_is_sharespace()	(machine_arch_type == MACH_TYPE_SHARESPACE)
+# define machine_is_steelhead()	(machine_arch_type == MACH_TYPE_STEELHEAD)
 #else
-# define machine_is_sharespace()	(0)
+# define machine_is_steelhead()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HABA_KNX_EXPLORER
+#ifdef CONFIG_MACH_PANTHER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HABA_KNX_EXPLORER
+#  define machine_arch_type	MACH_TYPE_PANTHER
 # endif
-# define machine_is_haba_knx_explorer()	(machine_arch_type == MACH_TYPE_HABA_KNX_EXPLORER)
+# define machine_is_panther()	(machine_arch_type == MACH_TYPE_PANTHER)
 #else
-# define machine_is_haba_knx_explorer()	(0)
+# define machine_is_panther()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SIMTEC_KIRKMOD
+#ifdef CONFIG_MACH_MSM8960_LIQUID
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SIMTEC_KIRKMOD
+#  define machine_arch_type	MACH_TYPE_MSM8960_LIQUID
 # endif
-# define machine_is_simtec_kirkmod()	(machine_arch_type == MACH_TYPE_SIMTEC_KIRKMOD)
+# define machine_is_msm8960_liquid()	(machine_arch_type == MACH_TYPE_MSM8960_LIQUID)
 #else
-# define machine_is_simtec_kirkmod()	(0)
+# define machine_is_msm8960_liquid()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CRUX
+#ifdef CONFIG_MACH_LEXIKONCT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CRUX
+#  define machine_arch_type	MACH_TYPE_LEXIKONCT
 # endif
-# define machine_is_crux()	(machine_arch_type == MACH_TYPE_CRUX)
+# define machine_is_lexikonct()	(machine_arch_type == MACH_TYPE_LEXIKONCT)
 #else
-# define machine_is_crux()	(0)
+# define machine_is_lexikonct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX51_BRAVO
+#ifdef CONFIG_MACH_NS2816_STB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX51_BRAVO
+#  define machine_arch_type	MACH_TYPE_NS2816_STB
 # endif
-# define machine_is_mx51_bravo()	(machine_arch_type == MACH_TYPE_MX51_BRAVO)
+# define machine_is_ns2816_stb()	(machine_arch_type == MACH_TYPE_NS2816_STB)
 #else
-# define machine_is_mx51_bravo()	(0)
+# define machine_is_ns2816_stb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CHARON
+#ifdef CONFIG_MACH_SEI_MM2_LPC3250
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CHARON
+#  define machine_arch_type	MACH_TYPE_SEI_MM2_LPC3250
 # endif
-# define machine_is_charon()	(machine_arch_type == MACH_TYPE_CHARON)
+# define machine_is_sei_mm2_lpc3250()	(machine_arch_type == MACH_TYPE_SEI_MM2_LPC3250)
 #else
-# define machine_is_charon()	(0)
+# define machine_is_sei_mm2_lpc3250()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PICOCOM3
+#ifdef CONFIG_MACH_CMIMX53
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PICOCOM3
+#  define machine_arch_type	MACH_TYPE_CMIMX53
 # endif
-# define machine_is_picocom3()	(machine_arch_type == MACH_TYPE_PICOCOM3)
+# define machine_is_cmimx53()	(machine_arch_type == MACH_TYPE_CMIMX53)
 #else
-# define machine_is_picocom3()	(0)
+# define machine_is_cmimx53()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PICOCOM4
+#ifdef CONFIG_MACH_SANDWICH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PICOCOM4
+#  define machine_arch_type	MACH_TYPE_SANDWICH
 # endif
-# define machine_is_picocom4()	(machine_arch_type == MACH_TYPE_PICOCOM4)
+# define machine_is_sandwich()	(machine_arch_type == MACH_TYPE_SANDWICH)
 #else
-# define machine_is_picocom4()	(0)
+# define machine_is_sandwich()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SERRANO
+#ifdef CONFIG_MACH_CHIEF
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SERRANO
+#  define machine_arch_type	MACH_TYPE_CHIEF
 # endif
-# define machine_is_serrano()	(machine_arch_type == MACH_TYPE_SERRANO)
+# define machine_is_chief()	(machine_arch_type == MACH_TYPE_CHIEF)
 #else
-# define machine_is_serrano()	(0)
+# define machine_is_chief()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DOUBLESHOT
+#ifdef CONFIG_MACH_POGO_E02
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DOUBLESHOT
+#  define machine_arch_type	MACH_TYPE_POGO_E02
 # endif
-# define machine_is_doubleshot()	(machine_arch_type == MACH_TYPE_DOUBLESHOT)
+# define machine_is_pogo_e02()	(machine_arch_type == MACH_TYPE_POGO_E02)
 #else
-# define machine_is_doubleshot()	(0)
+# define machine_is_pogo_e02()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EVSY
+#ifdef CONFIG_MACH_MIKRAP_X168
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EVSY
+#  define machine_arch_type	MACH_TYPE_MIKRAP_X168
 # endif
-# define machine_is_evsy()	(machine_arch_type == MACH_TYPE_EVSY)
+# define machine_is_mikrap_x168()	(machine_arch_type == MACH_TYPE_MIKRAP_X168)
 #else
-# define machine_is_evsy()	(0)
+# define machine_is_mikrap_x168()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HUASHAN
+#ifdef CONFIG_MACH_HTCMOZART
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HUASHAN
+#  define machine_arch_type	MACH_TYPE_HTCMOZART
 # endif
-# define machine_is_huashan()	(machine_arch_type == MACH_TYPE_HUASHAN)
+# define machine_is_htcmozart()	(machine_arch_type == MACH_TYPE_HTCMOZART)
 #else
-# define machine_is_huashan()	(0)
+# define machine_is_htcmozart()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LAUSANNE
+#ifdef CONFIG_MACH_HTCGOLD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LAUSANNE
+#  define machine_arch_type	MACH_TYPE_HTCGOLD
 # endif
-# define machine_is_lausanne()	(machine_arch_type == MACH_TYPE_LAUSANNE)
+# define machine_is_htcgold()	(machine_arch_type == MACH_TYPE_HTCGOLD)
 #else
-# define machine_is_lausanne()	(0)
+# define machine_is_htcgold()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EMERALD
+#ifdef CONFIG_MACH_MT72XX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EMERALD
+#  define machine_arch_type	MACH_TYPE_MT72XX
 # endif
-# define machine_is_emerald()	(machine_arch_type == MACH_TYPE_EMERALD)
+# define machine_is_mt72xx()	(machine_arch_type == MACH_TYPE_MT72XX)
 #else
-# define machine_is_emerald()	(0)
+# define machine_is_mt72xx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TQMA35
+#ifdef CONFIG_MACH_MX51_IVY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TQMA35
+#  define machine_arch_type	MACH_TYPE_MX51_IVY
 # endif
-# define machine_is_tqma35()	(machine_arch_type == MACH_TYPE_TQMA35)
+# define machine_is_mx51_ivy()	(machine_arch_type == MACH_TYPE_MX51_IVY)
 #else
-# define machine_is_tqma35()	(0)
+# define machine_is_mx51_ivy()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MARVEL
+#ifdef CONFIG_MACH_MX51_LVD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MARVEL
+#  define machine_arch_type	MACH_TYPE_MX51_LVD
 # endif
-# define machine_is_marvel()	(machine_arch_type == MACH_TYPE_MARVEL)
+# define machine_is_mx51_lvd()	(machine_arch_type == MACH_TYPE_MX51_LVD)
 #else
-# define machine_is_marvel()	(0)
+# define machine_is_mx51_lvd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MANUAE
+#ifdef CONFIG_MACH_OMAP3_WISER2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MANUAE
+#  define machine_arch_type	MACH_TYPE_OMAP3_WISER2
 # endif
-# define machine_is_manuae()	(machine_arch_type == MACH_TYPE_MANUAE)
+# define machine_is_omap3_wiser2()	(machine_arch_type == MACH_TYPE_OMAP3_WISER2)
 #else
-# define machine_is_manuae()	(0)
+# define machine_is_omap3_wiser2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CHACHA
+#ifdef CONFIG_MACH_DREAMPLUG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CHACHA
+#  define machine_arch_type	MACH_TYPE_DREAMPLUG
 # endif
-# define machine_is_chacha()	(machine_arch_type == MACH_TYPE_CHACHA)
+# define machine_is_dreamplug()	(machine_arch_type == MACH_TYPE_DREAMPLUG)
 #else
-# define machine_is_chacha()	(0)
+# define machine_is_dreamplug()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LEMON
+#ifdef CONFIG_MACH_COBAS_C_111
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LEMON
+#  define machine_arch_type	MACH_TYPE_COBAS_C_111
 # endif
-# define machine_is_lemon()	(machine_arch_type == MACH_TYPE_LEMON)
+# define machine_is_cobas_c_111()	(machine_arch_type == MACH_TYPE_COBAS_C_111)
 #else
-# define machine_is_lemon()	(0)
+# define machine_is_cobas_c_111()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CSC
+#ifdef CONFIG_MACH_COBAS_U_411
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CSC
+#  define machine_arch_type	MACH_TYPE_COBAS_U_411
 # endif
-# define machine_is_csc()	(machine_arch_type == MACH_TYPE_CSC)
+# define machine_is_cobas_u_411()	(machine_arch_type == MACH_TYPE_COBAS_U_411)
 #else
-# define machine_is_csc()	(0)
+# define machine_is_cobas_u_411()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GIRA_KNXIP_ROUTER
+#ifdef CONFIG_MACH_HSSD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GIRA_KNXIP_ROUTER
+#  define machine_arch_type	MACH_TYPE_HSSD
 # endif
-# define machine_is_gira_knxip_router()	(machine_arch_type == MACH_TYPE_GIRA_KNXIP_ROUTER)
+# define machine_is_hssd()	(machine_arch_type == MACH_TYPE_HSSD)
 #else
-# define machine_is_gira_knxip_router()	(0)
+# define machine_is_hssd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_T20
+#ifdef CONFIG_MACH_IOM35X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_T20
+#  define machine_arch_type	MACH_TYPE_IOM35X
 # endif
-# define machine_is_t20()	(machine_arch_type == MACH_TYPE_T20)
+# define machine_is_iom35x()	(machine_arch_type == MACH_TYPE_IOM35X)
 #else
-# define machine_is_t20()	(0)
+# define machine_is_iom35x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HDMINI
+#ifdef CONFIG_MACH_PSOM_OMAP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HDMINI
+#  define machine_arch_type	MACH_TYPE_PSOM_OMAP
 # endif
-# define machine_is_hdmini()	(machine_arch_type == MACH_TYPE_HDMINI)
+# define machine_is_psom_omap()	(machine_arch_type == MACH_TYPE_PSOM_OMAP)
 #else
-# define machine_is_hdmini()	(0)
+# define machine_is_psom_omap()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SCIPHONE_G2
+#ifdef CONFIG_MACH_IPHONE_2G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SCIPHONE_G2
+#  define machine_arch_type	MACH_TYPE_IPHONE_2G
 # endif
-# define machine_is_sciphone_g2()	(machine_arch_type == MACH_TYPE_SCIPHONE_G2)
+# define machine_is_iphone_2g()	(machine_arch_type == MACH_TYPE_IPHONE_2G)
 #else
-# define machine_is_sciphone_g2()	(0)
+# define machine_is_iphone_2g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EXPRESS
+#ifdef CONFIG_MACH_IPHONE_3G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EXPRESS
+#  define machine_arch_type	MACH_TYPE_IPHONE_3G
 # endif
-# define machine_is_express()	(machine_arch_type == MACH_TYPE_EXPRESS)
+# define machine_is_iphone_3g()	(machine_arch_type == MACH_TYPE_IPHONE_3G)
 #else
-# define machine_is_express()	(0)
+# define machine_is_iphone_3g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EXPRESS_KT
+#ifdef CONFIG_MACH_IPOD_TOUCH_1G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EXPRESS_KT
+#  define machine_arch_type	MACH_TYPE_IPOD_TOUCH_1G
 # endif
-# define machine_is_express_kt()	(machine_arch_type == MACH_TYPE_EXPRESS_KT)
+# define machine_is_ipod_touch_1g()	(machine_arch_type == MACH_TYPE_IPOD_TOUCH_1G)
 #else
-# define machine_is_express_kt()	(0)
+# define machine_is_ipod_touch_1g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MAXIMASP
+#ifdef CONFIG_MACH_PHAROS_TPC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MAXIMASP
+#  define machine_arch_type	MACH_TYPE_PHAROS_TPC
 # endif
-# define machine_is_maximasp()	(machine_arch_type == MACH_TYPE_MAXIMASP)
+# define machine_is_pharos_tpc()	(machine_arch_type == MACH_TYPE_PHAROS_TPC)
 #else
-# define machine_is_maximasp()	(0)
+# define machine_is_pharos_tpc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NITROGEN_IMX51
+#ifdef CONFIG_MACH_MX53_HYDRA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NITROGEN_IMX51
+#  define machine_arch_type	MACH_TYPE_MX53_HYDRA
 # endif
-# define machine_is_nitrogen_imx51()	(machine_arch_type == MACH_TYPE_NITROGEN_IMX51)
+# define machine_is_mx53_hydra()	(machine_arch_type == MACH_TYPE_MX53_HYDRA)
 #else
-# define machine_is_nitrogen_imx51()	(0)
+# define machine_is_mx53_hydra()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NITROGEN_IMX53
+#ifdef CONFIG_MACH_NS2816_DEV_BOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NITROGEN_IMX53
+#  define machine_arch_type	MACH_TYPE_NS2816_DEV_BOARD
 # endif
-# define machine_is_nitrogen_imx53()	(machine_arch_type == MACH_TYPE_NITROGEN_IMX53)
+# define machine_is_ns2816_dev_board()	(machine_arch_type == MACH_TYPE_NS2816_DEV_BOARD)
 #else
-# define machine_is_nitrogen_imx53()	(0)
+# define machine_is_ns2816_dev_board()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SUNFIRE
+#ifdef CONFIG_MACH_IPHONE_3GS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SUNFIRE
+#  define machine_arch_type	MACH_TYPE_IPHONE_3GS
 # endif
-# define machine_is_sunfire()	(machine_arch_type == MACH_TYPE_SUNFIRE)
+# define machine_is_iphone_3gs()	(machine_arch_type == MACH_TYPE_IPHONE_3GS)
 #else
-# define machine_is_sunfire()	(0)
+# define machine_is_iphone_3gs()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AROWANA
+#ifdef CONFIG_MACH_IPHONE_4
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AROWANA
+#  define machine_arch_type	MACH_TYPE_IPHONE_4
 # endif
-# define machine_is_arowana()	(machine_arch_type == MACH_TYPE_AROWANA)
+# define machine_is_iphone_4()	(machine_arch_type == MACH_TYPE_IPHONE_4)
 #else
-# define machine_is_arowana()	(0)
+# define machine_is_iphone_4()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TEGRA_DAYTONA
+#ifdef CONFIG_MACH_IPOD_TOUCH_4G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TEGRA_DAYTONA
+#  define machine_arch_type	MACH_TYPE_IPOD_TOUCH_4G
 # endif
-# define machine_is_tegra_daytona()	(machine_arch_type == MACH_TYPE_TEGRA_DAYTONA)
+# define machine_is_ipod_touch_4g()	(machine_arch_type == MACH_TYPE_IPOD_TOUCH_4G)
 #else
-# define machine_is_tegra_daytona()	(0)
+# define machine_is_ipod_touch_4g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TEGRA_SWORDFISH
+#ifdef CONFIG_MACH_DRAGON_E1100
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TEGRA_SWORDFISH
+#  define machine_arch_type	MACH_TYPE_DRAGON_E1100
 # endif
-# define machine_is_tegra_swordfish()	(machine_arch_type == MACH_TYPE_TEGRA_SWORDFISH)
+# define machine_is_dragon_e1100()	(machine_arch_type == MACH_TYPE_DRAGON_E1100)
 #else
-# define machine_is_tegra_swordfish()	(0)
+# define machine_is_dragon_e1100()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EDISON
+#ifdef CONFIG_MACH_TOPSIDE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EDISON
+#  define machine_arch_type	MACH_TYPE_TOPSIDE
 # endif
-# define machine_is_edison()	(machine_arch_type == MACH_TYPE_EDISON)
+# define machine_is_topside()	(machine_arch_type == MACH_TYPE_TOPSIDE)
 #else
-# define machine_is_edison()	(0)
+# define machine_is_topside()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SVP8500V1
+#ifdef CONFIG_MACH_IRISIII
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SVP8500V1
+#  define machine_arch_type	MACH_TYPE_IRISIII
 # endif
-# define machine_is_svp8500v1()	(machine_arch_type == MACH_TYPE_SVP8500V1)
+# define machine_is_irisiii()	(machine_arch_type == MACH_TYPE_IRISIII)
 #else
-# define machine_is_svp8500v1()	(0)
+# define machine_is_irisiii()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SVP8500V2
+#ifdef CONFIG_MACH_DETO_MACARM9
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SVP8500V2
+#  define machine_arch_type	MACH_TYPE_DETO_MACARM9
 # endif
-# define machine_is_svp8500v2()	(machine_arch_type == MACH_TYPE_SVP8500V2)
+# define machine_is_deto_macarm9()	(machine_arch_type == MACH_TYPE_DETO_MACARM9)
 #else
-# define machine_is_svp8500v2()	(0)
+# define machine_is_deto_macarm9()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SVP5500
+#ifdef CONFIG_MACH_ETI_D1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SVP5500
+#  define machine_arch_type	MACH_TYPE_ETI_D1
 # endif
-# define machine_is_svp5500()	(machine_arch_type == MACH_TYPE_SVP5500)
+# define machine_is_eti_d1()	(machine_arch_type == MACH_TYPE_ETI_D1)
 #else
-# define machine_is_svp5500()	(0)
+# define machine_is_eti_d1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_B5500
+#ifdef CONFIG_MACH_SOM3530SDK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_B5500
+#  define machine_arch_type	MACH_TYPE_SOM3530SDK
 # endif
-# define machine_is_b5500()	(machine_arch_type == MACH_TYPE_B5500)
+# define machine_is_som3530sdk()	(machine_arch_type == MACH_TYPE_SOM3530SDK)
 #else
-# define machine_is_b5500()	(0)
+# define machine_is_som3530sdk()	(0)
 #endif
 
-#ifdef CONFIG_MACH_S5500
+#ifdef CONFIG_MACH_OC_ENGINE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_S5500
+#  define machine_arch_type	MACH_TYPE_OC_ENGINE
 # endif
-# define machine_is_s5500()	(machine_arch_type == MACH_TYPE_S5500)
+# define machine_is_oc_engine()	(machine_arch_type == MACH_TYPE_OC_ENGINE)
 #else
-# define machine_is_s5500()	(0)
+# define machine_is_oc_engine()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ICON
+#ifdef CONFIG_MACH_APQ8064_SIM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ICON
+#  define machine_arch_type	MACH_TYPE_APQ8064_SIM
 # endif
-# define machine_is_icon()	(machine_arch_type == MACH_TYPE_ICON)
+# define machine_is_apq8064_sim()	(machine_arch_type == MACH_TYPE_APQ8064_SIM)
 #else
-# define machine_is_icon()	(0)
+# define machine_is_apq8064_sim()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ELEPHANT
+#ifdef CONFIG_MACH_ALPS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ELEPHANT
+#  define machine_arch_type	MACH_TYPE_ALPS
 # endif
-# define machine_is_elephant()	(machine_arch_type == MACH_TYPE_ELEPHANT)
+# define machine_is_alps()	(machine_arch_type == MACH_TYPE_ALPS)
 #else
-# define machine_is_elephant()	(0)
+# define machine_is_alps()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SHOOTER
+#ifdef CONFIG_MACH_TNY_T3730
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SHOOTER
+#  define machine_arch_type	MACH_TYPE_TNY_T3730
 # endif
-# define machine_is_shooter()	(machine_arch_type == MACH_TYPE_SHOOTER)
+# define machine_is_tny_t3730()	(machine_arch_type == MACH_TYPE_TNY_T3730)
 #else
-# define machine_is_shooter()	(0)
+# define machine_is_tny_t3730()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPADE_LTE
+#ifdef CONFIG_MACH_GERYON_NFE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPADE_LTE
+#  define machine_arch_type	MACH_TYPE_GERYON_NFE
 # endif
-# define machine_is_spade_lte()	(machine_arch_type == MACH_TYPE_SPADE_LTE)
+# define machine_is_geryon_nfe()	(machine_arch_type == MACH_TYPE_GERYON_NFE)
 #else
-# define machine_is_spade_lte()	(0)
+# define machine_is_geryon_nfe()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PHILHWANI
+#ifdef CONFIG_MACH_NS2816_REF_BOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PHILHWANI
+#  define machine_arch_type	MACH_TYPE_NS2816_REF_BOARD
 # endif
-# define machine_is_philhwani()	(machine_arch_type == MACH_TYPE_PHILHWANI)
+# define machine_is_ns2816_ref_board()	(machine_arch_type == MACH_TYPE_NS2816_REF_BOARD)
 #else
-# define machine_is_philhwani()	(0)
+# define machine_is_ns2816_ref_board()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GSNCOMM
+#ifdef CONFIG_MACH_SILVERSTONE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GSNCOMM
+#  define machine_arch_type	MACH_TYPE_SILVERSTONE
 # endif
-# define machine_is_gsncomm()	(machine_arch_type == MACH_TYPE_GSNCOMM)
+# define machine_is_silverstone()	(machine_arch_type == MACH_TYPE_SILVERSTONE)
 #else
-# define machine_is_gsncomm()	(0)
+# define machine_is_silverstone()	(0)
 #endif
 
-#ifdef CONFIG_MACH_STRASBOURG_A2
+#ifdef CONFIG_MACH_MTT2440
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_STRASBOURG_A2
+#  define machine_arch_type	MACH_TYPE_MTT2440
 # endif
-# define machine_is_strasbourg_a2()	(machine_arch_type == MACH_TYPE_STRASBOURG_A2)
+# define machine_is_mtt2440()	(machine_arch_type == MACH_TYPE_MTT2440)
 #else
-# define machine_is_strasbourg_a2()	(0)
+# define machine_is_mtt2440()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MMM
+#ifdef CONFIG_MACH_YNICDB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MMM
+#  define machine_arch_type	MACH_TYPE_YNICDB
 # endif
-# define machine_is_mmm()	(machine_arch_type == MACH_TYPE_MMM)
+# define machine_is_ynicdb()	(machine_arch_type == MACH_TYPE_YNICDB)
 #else
-# define machine_is_mmm()	(0)
+# define machine_is_ynicdb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DAVINCI_DM365_BV
+#ifdef CONFIG_MACH_BCT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM365_BV
+#  define machine_arch_type	MACH_TYPE_BCT
 # endif
-# define machine_is_davinci_dm365_bv()	(machine_arch_type == MACH_TYPE_DAVINCI_DM365_BV)
+# define machine_is_bct()	(machine_arch_type == MACH_TYPE_BCT)
 #else
-# define machine_is_davinci_dm365_bv()	(0)
+# define machine_is_bct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AG5EVM
+#ifdef CONFIG_MACH_TUSCAN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AG5EVM
+#  define machine_arch_type	MACH_TYPE_TUSCAN
 # endif
-# define machine_is_ag5evm()	(machine_arch_type == MACH_TYPE_AG5EVM)
+# define machine_is_tuscan()	(machine_arch_type == MACH_TYPE_TUSCAN)
 #else
-# define machine_is_ag5evm()	(0)
+# define machine_is_tuscan()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SC575PLC
+#ifdef CONFIG_MACH_XBT_SAM9G45
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SC575PLC
+#  define machine_arch_type	MACH_TYPE_XBT_SAM9G45
 # endif
-# define machine_is_sc575plc()	(machine_arch_type == MACH_TYPE_SC575PLC)
+# define machine_is_xbt_sam9g45()	(machine_arch_type == MACH_TYPE_XBT_SAM9G45)
 #else
-# define machine_is_sc575plc()	(0)
+# define machine_is_xbt_sam9g45()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SC575IPC
+#ifdef CONFIG_MACH_ENBW_CMC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SC575IPC
+#  define machine_arch_type	MACH_TYPE_ENBW_CMC
 # endif
-# define machine_is_sc575hmi()	(machine_arch_type == MACH_TYPE_SC575IPC)
+# define machine_is_enbw_cmc()	(machine_arch_type == MACH_TYPE_ENBW_CMC)
 #else
-# define machine_is_sc575hmi()	(0)
+# define machine_is_enbw_cmc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_TDM3730
+#ifdef CONFIG_MACH_CH104MX257
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_TDM3730
+#  define machine_arch_type	MACH_TYPE_CH104MX257
 # endif
-# define machine_is_omap3_tdm3730()	(machine_arch_type == MACH_TYPE_OMAP3_TDM3730)
+# define machine_is_ch104mx257()	(machine_arch_type == MACH_TYPE_CH104MX257)
 #else
-# define machine_is_omap3_tdm3730()	(0)
+# define machine_is_ch104mx257()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TOP9000_EVAL
+#ifdef CONFIG_MACH_OPENPRI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TOP9000_EVAL
+#  define machine_arch_type	MACH_TYPE_OPENPRI
 # endif
-# define machine_is_top9000_eval()	(machine_arch_type == MACH_TYPE_TOP9000_EVAL)
+# define machine_is_openpri()	(machine_arch_type == MACH_TYPE_OPENPRI)
 #else
-# define machine_is_top9000_eval()	(0)
+# define machine_is_openpri()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TOP9000_SU
+#ifdef CONFIG_MACH_AM335XEVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TOP9000_SU
+#  define machine_arch_type	MACH_TYPE_AM335XEVM
 # endif
-# define machine_is_top9000_su()	(machine_arch_type == MACH_TYPE_TOP9000_SU)
+# define machine_is_am335xevm()	(machine_arch_type == MACH_TYPE_AM335XEVM)
 #else
-# define machine_is_top9000_su()	(0)
+# define machine_is_am335xevm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UTM300
+#ifdef CONFIG_MACH_PICODMB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UTM300
+#  define machine_arch_type	MACH_TYPE_PICODMB
 # endif
-# define machine_is_utm300()	(machine_arch_type == MACH_TYPE_UTM300)
+# define machine_is_picodmb()	(machine_arch_type == MACH_TYPE_PICODMB)
 #else
-# define machine_is_utm300()	(0)
+# define machine_is_picodmb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TSUNAGI
+#ifdef CONFIG_MACH_WALUIGI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TSUNAGI
+#  define machine_arch_type	MACH_TYPE_WALUIGI
 # endif
-# define machine_is_tsunagi()	(machine_arch_type == MACH_TYPE_TSUNAGI)
+# define machine_is_waluigi()	(machine_arch_type == MACH_TYPE_WALUIGI)
 #else
-# define machine_is_tsunagi()	(0)
+# define machine_is_waluigi()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TS75XX
+#ifdef CONFIG_MACH_PUNICAG7
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TS75XX
+#  define machine_arch_type	MACH_TYPE_PUNICAG7
 # endif
-# define machine_is_ts75xx()	(machine_arch_type == MACH_TYPE_TS75XX)
+# define machine_is_punicag7()	(machine_arch_type == MACH_TYPE_PUNICAG7)
 #else
-# define machine_is_ts75xx()	(0)
+# define machine_is_punicag7()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TS47XX
+#ifdef CONFIG_MACH_IPAD_1G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TS47XX
+#  define machine_arch_type	MACH_TYPE_IPAD_1G
 # endif
-# define machine_is_ts47xx()	(machine_arch_type == MACH_TYPE_TS47XX)
+# define machine_is_ipad_1g()	(machine_arch_type == MACH_TYPE_IPAD_1G)
 #else
-# define machine_is_ts47xx()	(0)
+# define machine_is_ipad_1g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DA850_K5
+#ifdef CONFIG_MACH_APPLETV_2G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DA850_K5
+#  define machine_arch_type	MACH_TYPE_APPLETV_2G
 # endif
-# define machine_is_da850_k5()	(machine_arch_type == MACH_TYPE_DA850_K5)
+# define machine_is_appletv_2g()	(machine_arch_type == MACH_TYPE_APPLETV_2G)
 #else
-# define machine_is_da850_k5()	(0)
+# define machine_is_appletv_2g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AX502
+#ifdef CONFIG_MACH_MACH_ECOG45
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AX502
+#  define machine_arch_type	MACH_TYPE_MACH_ECOG45
 # endif
-# define machine_is_ax502()	(machine_arch_type == MACH_TYPE_AX502)
+# define machine_is_mach_ecog45()	(machine_arch_type == MACH_TYPE_MACH_ECOG45)
 #else
-# define machine_is_ax502()	(0)
+# define machine_is_mach_ecog45()	(0)
 #endif
 
-#ifdef CONFIG_MACH_IGEP0032
+#ifdef CONFIG_MACH_AIT_CAM_ENC_4XX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_IGEP0032
+#  define machine_arch_type	MACH_TYPE_AIT_CAM_ENC_4XX
 # endif
-# define machine_is_igep0032()	(machine_arch_type == MACH_TYPE_IGEP0032)
+# define machine_is_ait_cam_enc_4xx()	(machine_arch_type == MACH_TYPE_AIT_CAM_ENC_4XX)
 #else
-# define machine_is_igep0032()	(0)
+# define machine_is_ait_cam_enc_4xx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ANTERO
+#ifdef CONFIG_MACH_RUNNYMEDE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ANTERO
+#  define machine_arch_type	MACH_TYPE_RUNNYMEDE
 # endif
-# define machine_is_antero()	(machine_arch_type == MACH_TYPE_ANTERO)
+# define machine_is_runnymede()	(machine_arch_type == MACH_TYPE_RUNNYMEDE)
 #else
-# define machine_is_antero()	(0)
+# define machine_is_runnymede()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SYNERGY
+#ifdef CONFIG_MACH_PLAY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SYNERGY
+#  define machine_arch_type	MACH_TYPE_PLAY
 # endif
-# define machine_is_synergy()	(machine_arch_type == MACH_TYPE_SYNERGY)
+# define machine_is_play()	(machine_arch_type == MACH_TYPE_PLAY)
 #else
-# define machine_is_synergy()	(0)
+# define machine_is_play()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ICS_IF_VOIP
+#ifdef CONFIG_MACH_HW90260
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ICS_IF_VOIP
+#  define machine_arch_type	MACH_TYPE_HW90260
 # endif
-# define machine_is_ics_if_voip()	(machine_arch_type == MACH_TYPE_ICS_IF_VOIP)
+# define machine_is_hw90260()	(machine_arch_type == MACH_TYPE_HW90260)
 #else
-# define machine_is_ics_if_voip()	(0)
+# define machine_is_hw90260()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WLF_CRAGG_6410
+#ifdef CONFIG_MACH_TAGH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WLF_CRAGG_6410
+#  define machine_arch_type	MACH_TYPE_TAGH
 # endif
-# define machine_is_wlf_cragg_6410()	(machine_arch_type == MACH_TYPE_WLF_CRAGG_6410)
+# define machine_is_tagh()	(machine_arch_type == MACH_TYPE_TAGH)
 #else
-# define machine_is_wlf_cragg_6410()	(0)
+# define machine_is_tagh()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PUNICA
+#ifdef CONFIG_MACH_FILBERT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PUNICA
+#  define machine_arch_type	MACH_TYPE_FILBERT
 # endif
-# define machine_is_punica()	(machine_arch_type == MACH_TYPE_PUNICA)
+# define machine_is_filbert()	(machine_arch_type == MACH_TYPE_FILBERT)
 #else
-# define machine_is_punica()	(0)
+# define machine_is_filbert()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TRIMSLICE
+#ifdef CONFIG_MACH_GETINGE_NETCOMV3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TRIMSLICE
+#  define machine_arch_type	MACH_TYPE_GETINGE_NETCOMV3
 # endif
-# define machine_is_trimslice()	(machine_arch_type == MACH_TYPE_TRIMSLICE)
+# define machine_is_getinge_netcomv3()	(machine_arch_type == MACH_TYPE_GETINGE_NETCOMV3)
 #else
-# define machine_is_trimslice()	(0)
+# define machine_is_getinge_netcomv3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX27_WMULTRA
+#ifdef CONFIG_MACH_CW20
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX27_WMULTRA
+#  define machine_arch_type	MACH_TYPE_CW20
 # endif
-# define machine_is_mx27_wmultra()	(machine_arch_type == MACH_TYPE_MX27_WMULTRA)
+# define machine_is_cw20()	(machine_arch_type == MACH_TYPE_CW20)
 #else
-# define machine_is_mx27_wmultra()	(0)
+# define machine_is_cw20()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MACKEREL
+#ifdef CONFIG_MACH_CINEMA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MACKEREL
+#  define machine_arch_type	MACH_TYPE_CINEMA
 # endif
-# define machine_is_mackerel()	(machine_arch_type == MACH_TYPE_MACKEREL)
+# define machine_is_cinema()	(machine_arch_type == MACH_TYPE_CINEMA)
 #else
-# define machine_is_mackerel()	(0)
+# define machine_is_cinema()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FA9X27
+#ifdef CONFIG_MACH_CINEMA_TEA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FA9X27
+#  define machine_arch_type	MACH_TYPE_CINEMA_TEA
 # endif
-# define machine_is_fa9x27()	(machine_arch_type == MACH_TYPE_FA9X27)
+# define machine_is_cinema_tea()	(machine_arch_type == MACH_TYPE_CINEMA_TEA)
 #else
-# define machine_is_fa9x27()	(0)
+# define machine_is_cinema_tea()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NS2816TB
+#ifdef CONFIG_MACH_CINEMA_COFFEE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NS2816TB
+#  define machine_arch_type	MACH_TYPE_CINEMA_COFFEE
 # endif
-# define machine_is_ns2816tb()	(machine_arch_type == MACH_TYPE_NS2816TB)
+# define machine_is_cinema_coffee()	(machine_arch_type == MACH_TYPE_CINEMA_COFFEE)
 #else
-# define machine_is_ns2816tb()	(0)
+# define machine_is_cinema_coffee()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NS2816_NTPAD
+#ifdef CONFIG_MACH_CINEMA_JUICE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NS2816_NTPAD
+#  define machine_arch_type	MACH_TYPE_CINEMA_JUICE
 # endif
-# define machine_is_ns2816_ntpad()	(machine_arch_type == MACH_TYPE_NS2816_NTPAD)
+# define machine_is_cinema_juice()	(machine_arch_type == MACH_TYPE_CINEMA_JUICE)
 #else
-# define machine_is_ns2816_ntpad()	(0)
+# define machine_is_cinema_juice()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NS2816_NTNB
+#ifdef CONFIG_MACH_MX53_MIRAGE2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NS2816_NTNB
+#  define machine_arch_type	MACH_TYPE_MX53_MIRAGE2
 # endif
-# define machine_is_ns2816_ntnb()	(machine_arch_type == MACH_TYPE_NS2816_NTNB)
+# define machine_is_mx53_mirage2()	(machine_arch_type == MACH_TYPE_MX53_MIRAGE2)
 #else
-# define machine_is_ns2816_ntnb()	(0)
+# define machine_is_mx53_mirage2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KAEN
+#ifdef CONFIG_MACH_MX53_EFIKASB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KAEN
+#  define machine_arch_type	MACH_TYPE_MX53_EFIKASB
 # endif
-# define machine_is_kaen()	(machine_arch_type == MACH_TYPE_KAEN)
+# define machine_is_mx53_efikasb()	(machine_arch_type == MACH_TYPE_MX53_EFIKASB)
 #else
-# define machine_is_kaen()	(0)
+# define machine_is_mx53_efikasb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NV1000
+#ifdef CONFIG_MACH_STM_B2000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NV1000
+#  define machine_arch_type	MACH_TYPE_STM_B2000
 # endif
-# define machine_is_nv1000()	(machine_arch_type == MACH_TYPE_NV1000)
+# define machine_is_stm_b2000()	(machine_arch_type == MACH_TYPE_STM_B2000)
 #else
-# define machine_is_nv1000()	(0)
+# define machine_is_stm_b2000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NUC950TS
+#ifdef CONFIG_MACH_M28EVK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NUC950TS
+#  define machine_arch_type	MACH_TYPE_M28EVK
 # endif
-# define machine_is_nuc950ts()	(machine_arch_type == MACH_TYPE_NUC950TS)
+# define machine_is_m28evk()	(machine_arch_type == MACH_TYPE_M28EVK)
 #else
-# define machine_is_nuc950ts()	(0)
+# define machine_is_m28evk()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NOKIA_RM680
+#ifdef CONFIG_MACH_PDA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NOKIA_RM680
+#  define machine_arch_type	MACH_TYPE_PDA
 # endif
-# define machine_is_nokia_rm680()	(machine_arch_type == MACH_TYPE_NOKIA_RM680)
+# define machine_is_pda()	(machine_arch_type == MACH_TYPE_PDA)
 #else
-# define machine_is_nokia_rm680()	(0)
+# define machine_is_pda()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AST2200
+#ifdef CONFIG_MACH_MERAKI_MR58
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AST2200
+#  define machine_arch_type	MACH_TYPE_MERAKI_MR58
 # endif
-# define machine_is_ast2200()	(machine_arch_type == MACH_TYPE_AST2200)
+# define machine_is_meraki_mr58()	(machine_arch_type == MACH_TYPE_MERAKI_MR58)
 #else
-# define machine_is_ast2200()	(0)
+# define machine_is_meraki_mr58()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LEAD
+#ifdef CONFIG_MACH_KOTA2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LEAD
+#  define machine_arch_type	MACH_TYPE_KOTA2
 # endif
-# define machine_is_lead()	(machine_arch_type == MACH_TYPE_LEAD)
+# define machine_is_kota2()	(machine_arch_type == MACH_TYPE_KOTA2)
 #else
-# define machine_is_lead()	(0)
+# define machine_is_kota2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UNINO1
+#ifdef CONFIG_MACH_LETCOOL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UNINO1
+#  define machine_arch_type	MACH_TYPE_LETCOOL
 # endif
-# define machine_is_unino1()	(machine_arch_type == MACH_TYPE_UNINO1)
+# define machine_is_letcool()	(machine_arch_type == MACH_TYPE_LETCOOL)
 #else
-# define machine_is_unino1()	(0)
+# define machine_is_letcool()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GREECO
+#ifdef CONFIG_MACH_MX27IAT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GREECO
+#  define machine_arch_type	MACH_TYPE_MX27IAT
 # endif
-# define machine_is_greeco()	(machine_arch_type == MACH_TYPE_GREECO)
+# define machine_is_mx27iat()	(machine_arch_type == MACH_TYPE_MX27IAT)
 #else
-# define machine_is_greeco()	(0)
+# define machine_is_mx27iat()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VERDI
+#ifdef CONFIG_MACH_APOLLO_TD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VERDI
+#  define machine_arch_type	MACH_TYPE_APOLLO_TD
 # endif
-# define machine_is_verdi()	(machine_arch_type == MACH_TYPE_VERDI)
+# define machine_is_apollo_td()	(machine_arch_type == MACH_TYPE_APOLLO_TD)
 #else
-# define machine_is_verdi()	(0)
+# define machine_is_apollo_td()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DM6446_ADBOX
+#ifdef CONFIG_MACH_ARENA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DM6446_ADBOX
+#  define machine_arch_type	MACH_TYPE_ARENA
 # endif
-# define machine_is_dm6446_adbox()	(machine_arch_type == MACH_TYPE_DM6446_ADBOX)
+# define machine_is_arena()	(machine_arch_type == MACH_TYPE_ARENA)
 #else
-# define machine_is_dm6446_adbox()	(0)
+# define machine_is_arena()	(0)
 #endif
 
-#ifdef CONFIG_MACH_QUAD_SALSA
+#ifdef CONFIG_MACH_GSNGATEWAY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_QUAD_SALSA
+#  define machine_arch_type	MACH_TYPE_GSNGATEWAY
 # endif
-# define machine_is_quad_salsa()	(machine_arch_type == MACH_TYPE_QUAD_SALSA)
+# define machine_is_gsngateway()	(machine_arch_type == MACH_TYPE_GSNGATEWAY)
 #else
-# define machine_is_quad_salsa()	(0)
+# define machine_is_gsngateway()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ABB_GMA_1_1
+#ifdef CONFIG_MACH_LF2000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ABB_GMA_1_1
+#  define machine_arch_type	MACH_TYPE_LF2000
 # endif
-# define machine_is_abb_gma_1_1()	(machine_arch_type == MACH_TYPE_ABB_GMA_1_1)
+# define machine_is_lf2000()	(machine_arch_type == MACH_TYPE_LF2000)
 #else
-# define machine_is_abb_gma_1_1()	(0)
+# define machine_is_lf2000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SVCID
+#ifdef CONFIG_MACH_BONITO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SVCID
+#  define machine_arch_type	MACH_TYPE_BONITO
 # endif
-# define machine_is_svcid()	(machine_arch_type == MACH_TYPE_SVCID)
+# define machine_is_bonito()	(machine_arch_type == MACH_TYPE_BONITO)
 #else
-# define machine_is_svcid()	(0)
+# define machine_is_bonito()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8960_SIM
+#ifdef CONFIG_MACH_ASYMPTOTE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8960_SIM
+#  define machine_arch_type	MACH_TYPE_ASYMPTOTE
 # endif
-# define machine_is_msm8960_sim()	(machine_arch_type == MACH_TYPE_MSM8960_SIM)
+# define machine_is_asymptote()	(machine_arch_type == MACH_TYPE_ASYMPTOTE)
 #else
-# define machine_is_msm8960_sim()	(0)
+# define machine_is_asymptote()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8960_RUMI3
+#ifdef CONFIG_MACH_BST2BRD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8960_RUMI3
+#  define machine_arch_type	MACH_TYPE_BST2BRD
 # endif
-# define machine_is_msm8960_rumi3()	(machine_arch_type == MACH_TYPE_MSM8960_RUMI3)
+# define machine_is_bst2brd()	(machine_arch_type == MACH_TYPE_BST2BRD)
 #else
-# define machine_is_msm8960_rumi3()	(0)
+# define machine_is_bst2brd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ICON_G
+#ifdef CONFIG_MACH_TX335S
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ICON_G
+#  define machine_arch_type	MACH_TYPE_TX335S
 # endif
-# define machine_is_icon_g()	(machine_arch_type == MACH_TYPE_ICON_G)
+# define machine_is_tx335s()	(machine_arch_type == MACH_TYPE_TX335S)
 #else
-# define machine_is_icon_g()	(0)
+# define machine_is_tx335s()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MB3
+#ifdef CONFIG_MACH_PELCO_TESLA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MB3
+#  define machine_arch_type	MACH_TYPE_PELCO_TESLA
 # endif
-# define machine_is_mb3()	(machine_arch_type == MACH_TYPE_MB3)
+# define machine_is_pelco_tesla()	(machine_arch_type == MACH_TYPE_PELCO_TESLA)
 #else
-# define machine_is_mb3()	(0)
+# define machine_is_pelco_tesla()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GSIA18S
+#ifdef CONFIG_MACH_RRHTESTPLAT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GSIA18S
+#  define machine_arch_type	MACH_TYPE_RRHTESTPLAT
 # endif
-# define machine_is_gsia18s()	(machine_arch_type == MACH_TYPE_GSIA18S)
+# define machine_is_rrhtestplat()	(machine_arch_type == MACH_TYPE_RRHTESTPLAT)
 #else
-# define machine_is_gsia18s()	(0)
+# define machine_is_rrhtestplat()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PIVICC
+#ifdef CONFIG_MACH_VIDTONIC_PRO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PIVICC
+#  define machine_arch_type	MACH_TYPE_VIDTONIC_PRO
 # endif
-# define machine_is_pivicc()	(machine_arch_type == MACH_TYPE_PIVICC)
+# define machine_is_vidtonic_pro()	(machine_arch_type == MACH_TYPE_VIDTONIC_PRO)
 #else
-# define machine_is_pivicc()	(0)
+# define machine_is_vidtonic_pro()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PCM048
+#ifdef CONFIG_MACH_PL_APOLLO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PCM048
+#  define machine_arch_type	MACH_TYPE_PL_APOLLO
 # endif
-# define machine_is_pcm048()	(machine_arch_type == MACH_TYPE_PCM048)
+# define machine_is_pl_apollo()	(machine_arch_type == MACH_TYPE_PL_APOLLO)
 #else
-# define machine_is_pcm048()	(0)
+# define machine_is_pl_apollo()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DDS
+#ifdef CONFIG_MACH_PL_PHOENIX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DDS
+#  define machine_arch_type	MACH_TYPE_PL_PHOENIX
 # endif
-# define machine_is_dds()	(machine_arch_type == MACH_TYPE_DDS)
+# define machine_is_pl_phoenix()	(machine_arch_type == MACH_TYPE_PL_PHOENIX)
 #else
-# define machine_is_dds()	(0)
+# define machine_is_pl_phoenix()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CHALTEN_XA1
+#ifdef CONFIG_MACH_M28CU3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CHALTEN_XA1
+#  define machine_arch_type	MACH_TYPE_M28CU3
 # endif
-# define machine_is_chalten_xa1()	(machine_arch_type == MACH_TYPE_CHALTEN_XA1)
+# define machine_is_m28cu3()	(machine_arch_type == MACH_TYPE_M28CU3)
 #else
-# define machine_is_chalten_xa1()	(0)
+# define machine_is_m28cu3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TS48XX
+#ifdef CONFIG_MACH_VVBOX_HD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TS48XX
+#  define machine_arch_type	MACH_TYPE_VVBOX_HD
 # endif
-# define machine_is_ts48xx()	(machine_arch_type == MACH_TYPE_TS48XX)
+# define machine_is_vvbox_hd()	(machine_arch_type == MACH_TYPE_VVBOX_HD)
 #else
-# define machine_is_ts48xx()	(0)
+# define machine_is_vvbox_hd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TONGA2_TFTTIMER
+#ifdef CONFIG_MACH_COREWARE_SAM9260_
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TONGA2_TFTTIMER
+#  define machine_arch_type	MACH_TYPE_COREWARE_SAM9260_
 # endif
-# define machine_is_tonga2_tfttimer()	(machine_arch_type == MACH_TYPE_TONGA2_TFTTIMER)
+# define machine_is_coreware_sam9260_()	(machine_arch_type == MACH_TYPE_COREWARE_SAM9260_)
 #else
-# define machine_is_tonga2_tfttimer()	(0)
+# define machine_is_coreware_sam9260_()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WHISTLER
+#ifdef CONFIG_MACH_MARMADUKE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WHISTLER
+#  define machine_arch_type	MACH_TYPE_MARMADUKE
 # endif
-# define machine_is_whistler()	(machine_arch_type == MACH_TYPE_WHISTLER)
+# define machine_is_marmaduke()	(machine_arch_type == MACH_TYPE_MARMADUKE)
 #else
-# define machine_is_whistler()	(0)
+# define machine_is_marmaduke()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ASL_PHOENIX
+#ifdef CONFIG_MACH_AMG_XLCORE_CAMERA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ASL_PHOENIX
+#  define machine_arch_type	MACH_TYPE_AMG_XLCORE_CAMERA
 # endif
-# define machine_is_asl_phoenix()	(machine_arch_type == MACH_TYPE_ASL_PHOENIX)
+# define machine_is_amg_xlcore_camera()	(machine_arch_type == MACH_TYPE_AMG_XLCORE_CAMERA)
 #else
-# define machine_is_asl_phoenix()	(0)
+# define machine_is_amg_xlcore_camera()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AT91SAM9263OTLITE
+#ifdef CONFIG_MACH_OMAP3_EGF
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9263OTLITE
+#  define machine_arch_type	MACH_TYPE_OMAP3_EGF
 # endif
-# define machine_is_at91sam9263otlite()	(machine_arch_type == MACH_TYPE_AT91SAM9263OTLITE)
+# define machine_is_omap3_egf()	(machine_arch_type == MACH_TYPE_OMAP3_EGF)
 #else
-# define machine_is_at91sam9263otlite()	(0)
+# define machine_is_omap3_egf()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DDPLUG
+#ifdef CONFIG_MACH_SMDK4212
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DDPLUG
+#  define machine_arch_type	MACH_TYPE_SMDK4212
 # endif
-# define machine_is_ddplug()	(machine_arch_type == MACH_TYPE_DDPLUG)
+# define machine_is_smdk4212()	(machine_arch_type == MACH_TYPE_SMDK4212)
 #else
-# define machine_is_ddplug()	(0)
+# define machine_is_smdk4212()	(0)
 #endif
 
-#ifdef CONFIG_MACH_D2PLUG
+#ifdef CONFIG_MACH_DNP9200
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_D2PLUG
+#  define machine_arch_type	MACH_TYPE_DNP9200
 # endif
-# define machine_is_d2plug()	(machine_arch_type == MACH_TYPE_D2PLUG)
+# define machine_is_dnp9200()	(machine_arch_type == MACH_TYPE_DNP9200)
 #else
-# define machine_is_d2plug()	(0)
+# define machine_is_dnp9200()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KZM9D
+#ifdef CONFIG_MACH_TF101
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KZM9D
+#  define machine_arch_type	MACH_TYPE_TF101
 # endif
-# define machine_is_kzm9d()	(machine_arch_type == MACH_TYPE_KZM9D)
+# define machine_is_tf101()	(machine_arch_type == MACH_TYPE_TF101)
 #else
-# define machine_is_kzm9d()	(0)
+# define machine_is_tf101()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VERDI_LTE
+#ifdef CONFIG_MACH_OMAP3SILVIO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VERDI_LTE
+#  define machine_arch_type	MACH_TYPE_OMAP3SILVIO
 # endif
-# define machine_is_verdi_lte()	(machine_arch_type == MACH_TYPE_VERDI_LTE)
+# define machine_is_omap3silvio()	(machine_arch_type == MACH_TYPE_OMAP3SILVIO)
 #else
-# define machine_is_verdi_lte()	(0)
+# define machine_is_omap3silvio()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NANOZOOM
+#ifdef CONFIG_MACH_PICASSO2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NANOZOOM
+#  define machine_arch_type	MACH_TYPE_PICASSO2
 # endif
-# define machine_is_nanozoom()	(machine_arch_type == MACH_TYPE_NANOZOOM)
+# define machine_is_picasso2()	(machine_arch_type == MACH_TYPE_PICASSO2)
 #else
-# define machine_is_nanozoom()	(0)
+# define machine_is_picasso2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DM3730_SOM_LV
+#ifdef CONFIG_MACH_VANGOGH2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DM3730_SOM_LV
+#  define machine_arch_type	MACH_TYPE_VANGOGH2
 # endif
-# define machine_is_dm3730_som_lv()	(machine_arch_type == MACH_TYPE_DM3730_SOM_LV)
+# define machine_is_vangogh2()	(machine_arch_type == MACH_TYPE_VANGOGH2)
 #else
-# define machine_is_dm3730_som_lv()	(0)
+# define machine_is_vangogh2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DM3730_TORPEDO
+#ifdef CONFIG_MACH_OLPC_XO_1_75
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DM3730_TORPEDO
+#  define machine_arch_type	MACH_TYPE_OLPC_XO_1_75
 # endif
-# define machine_is_dm3730_torpedo()	(machine_arch_type == MACH_TYPE_DM3730_TORPEDO)
+# define machine_is_olpc_xo_1_75()	(machine_arch_type == MACH_TYPE_OLPC_XO_1_75)
 #else
-# define machine_is_dm3730_torpedo()	(0)
+# define machine_is_olpc_xo_1_75()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ANCHOVY
+#ifdef CONFIG_MACH_GX400
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ANCHOVY
+#  define machine_arch_type	MACH_TYPE_GX400
 # endif
-# define machine_is_anchovy()	(machine_arch_type == MACH_TYPE_ANCHOVY)
+# define machine_is_gx400()	(machine_arch_type == MACH_TYPE_GX400)
 #else
-# define machine_is_anchovy()	(0)
+# define machine_is_gx400()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RE2REV20
+#ifdef CONFIG_MACH_GS300
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RE2REV20
+#  define machine_arch_type	MACH_TYPE_GS300
 # endif
-# define machine_is_re2rev20()	(machine_arch_type == MACH_TYPE_RE2REV20)
+# define machine_is_gs300()	(machine_arch_type == MACH_TYPE_GS300)
 #else
-# define machine_is_re2rev20()	(0)
+# define machine_is_gs300()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RE2REV21
+#ifdef CONFIG_MACH_ACER_A9
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RE2REV21
+#  define machine_arch_type	MACH_TYPE_ACER_A9
 # endif
-# define machine_is_re2rev21()	(machine_arch_type == MACH_TYPE_RE2REV21)
+# define machine_is_acer_a9()	(machine_arch_type == MACH_TYPE_ACER_A9)
 #else
-# define machine_is_re2rev21()	(0)
+# define machine_is_acer_a9()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CNS21XX
+#ifdef CONFIG_MACH_VIVOW_EVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CNS21XX
+#  define machine_arch_type	MACH_TYPE_VIVOW_EVM
 # endif
-# define machine_is_cns21xx()	(machine_arch_type == MACH_TYPE_CNS21XX)
+# define machine_is_vivow_evm()	(machine_arch_type == MACH_TYPE_VIVOW_EVM)
 #else
-# define machine_is_cns21xx()	(0)
+# define machine_is_vivow_evm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RIDER
+#ifdef CONFIG_MACH_VELOCE_CXQ
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RIDER
+#  define machine_arch_type	MACH_TYPE_VELOCE_CXQ
 # endif
-# define machine_is_rider()	(machine_arch_type == MACH_TYPE_RIDER)
+# define machine_is_veloce_cxq()	(machine_arch_type == MACH_TYPE_VELOCE_CXQ)
 #else
-# define machine_is_rider()	(0)
+# define machine_is_veloce_cxq()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NSK330
+#ifdef CONFIG_MACH_VELOCE_CXM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NSK330
+#  define machine_arch_type	MACH_TYPE_VELOCE_CXM
 # endif
-# define machine_is_nsk330()	(machine_arch_type == MACH_TYPE_NSK330)
+# define machine_is_veloce_cxm()	(machine_arch_type == MACH_TYPE_VELOCE_CXM)
 #else
-# define machine_is_nsk330()	(0)
+# define machine_is_veloce_cxm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CNS2133EVB
+#ifdef CONFIG_MACH_P1852
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CNS2133EVB
+#  define machine_arch_type	MACH_TYPE_P1852
 # endif
-# define machine_is_cns2133evb()	(machine_arch_type == MACH_TYPE_CNS2133EVB)
+# define machine_is_p1852()	(machine_arch_type == MACH_TYPE_P1852)
 #else
-# define machine_is_cns2133evb()	(0)
+# define machine_is_p1852()	(0)
 #endif
 
-#ifdef CONFIG_MACH_Z3_816X_MOD
+#ifdef CONFIG_MACH_NAXY100
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_Z3_816X_MOD
+#  define machine_arch_type	MACH_TYPE_NAXY100
 # endif
-# define machine_is_z3_816x_mod()	(machine_arch_type == MACH_TYPE_Z3_816X_MOD)
+# define machine_is_naxy100()	(machine_arch_type == MACH_TYPE_NAXY100)
 #else
-# define machine_is_z3_816x_mod()	(0)
+# define machine_is_naxy100()	(0)
 #endif
 
-#ifdef CONFIG_MACH_Z3_814X_MOD
+#ifdef CONFIG_MACH_TAISHAN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_Z3_814X_MOD
+#  define machine_arch_type	MACH_TYPE_TAISHAN
 # endif
-# define machine_is_z3_814x_mod()	(machine_arch_type == MACH_TYPE_Z3_814X_MOD)
+# define machine_is_taishan()	(machine_arch_type == MACH_TYPE_TAISHAN)
 #else
-# define machine_is_z3_814x_mod()	(0)
+# define machine_is_taishan()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BEECT
+#ifdef CONFIG_MACH_TOUCHLINK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BEECT
+#  define machine_arch_type	MACH_TYPE_TOUCHLINK
 # endif
-# define machine_is_beect()	(machine_arch_type == MACH_TYPE_BEECT)
+# define machine_is_touchlink()	(machine_arch_type == MACH_TYPE_TOUCHLINK)
 #else
-# define machine_is_beect()	(0)
+# define machine_is_touchlink()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DMA_THUNDERBUG
+#ifdef CONFIG_MACH_STM32F103ZE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DMA_THUNDERBUG
+#  define machine_arch_type	MACH_TYPE_STM32F103ZE
 # endif
-# define machine_is_dma_thunderbug()	(machine_arch_type == MACH_TYPE_DMA_THUNDERBUG)
+# define machine_is_stm32f103ze()	(machine_arch_type == MACH_TYPE_STM32F103ZE)
 #else
-# define machine_is_dma_thunderbug()	(0)
+# define machine_is_stm32f103ze()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMN_AT91SAM9G20
+#ifdef CONFIG_MACH_MCX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMN_AT91SAM9G20
+#  define machine_arch_type	MACH_TYPE_MCX
 # endif
-# define machine_is_omn_at91sam9g20()	(machine_arch_type == MACH_TYPE_OMN_AT91SAM9G20)
+# define machine_is_mcx()	(machine_arch_type == MACH_TYPE_MCX)
 #else
-# define machine_is_omn_at91sam9g20()	(0)
+# define machine_is_mcx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX25_E2S_UC
+#ifdef CONFIG_MACH_STM_NMHDK_FLI7610
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX25_E2S_UC
+#  define machine_arch_type	MACH_TYPE_STM_NMHDK_FLI7610
 # endif
-# define machine_is_mx25_e2s_uc()	(machine_arch_type == MACH_TYPE_MX25_E2S_UC)
+# define machine_is_stm_nmhdk_fli7610()	(machine_arch_type == MACH_TYPE_STM_NMHDK_FLI7610)
 #else
-# define machine_is_mx25_e2s_uc()	(0)
+# define machine_is_stm_nmhdk_fli7610()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MIONE
+#ifdef CONFIG_MACH_TOP28X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MIONE
+#  define machine_arch_type	MACH_TYPE_TOP28X
 # endif
-# define machine_is_mione()	(machine_arch_type == MACH_TYPE_MIONE)
+# define machine_is_top28x()	(machine_arch_type == MACH_TYPE_TOP28X)
 #else
-# define machine_is_mione()	(0)
+# define machine_is_top28x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TOP9000_TCU
+#ifdef CONFIG_MACH_OKL4VP_MICROVISOR
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TOP9000_TCU
+#  define machine_arch_type	MACH_TYPE_OKL4VP_MICROVISOR
 # endif
-# define machine_is_top9000_tcu()	(machine_arch_type == MACH_TYPE_TOP9000_TCU)
+# define machine_is_okl4vp_microvisor()	(machine_arch_type == MACH_TYPE_OKL4VP_MICROVISOR)
 #else
-# define machine_is_top9000_tcu()	(0)
+# define machine_is_okl4vp_microvisor()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TOP9000_BSL
+#ifdef CONFIG_MACH_POP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TOP9000_BSL
+#  define machine_arch_type	MACH_TYPE_POP
 # endif
-# define machine_is_top9000_bsl()	(machine_arch_type == MACH_TYPE_TOP9000_BSL)
+# define machine_is_pop()	(machine_arch_type == MACH_TYPE_POP)
 #else
-# define machine_is_top9000_bsl()	(0)
+# define machine_is_pop()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KINGDOM
+#ifdef CONFIG_MACH_LAYER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KINGDOM
+#  define machine_arch_type	MACH_TYPE_LAYER
 # endif
-# define machine_is_kingdom()	(machine_arch_type == MACH_TYPE_KINGDOM)
+# define machine_is_layer()	(machine_arch_type == MACH_TYPE_LAYER)
 #else
-# define machine_is_kingdom()	(0)
+# define machine_is_layer()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARMADILLO460
+#ifdef CONFIG_MACH_TRONDHEIM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARMADILLO460
+#  define machine_arch_type	MACH_TYPE_TRONDHEIM
 # endif
-# define machine_is_armadillo460()	(machine_arch_type == MACH_TYPE_ARMADILLO460)
+# define machine_is_trondheim()	(machine_arch_type == MACH_TYPE_TRONDHEIM)
 #else
-# define machine_is_armadillo460()	(0)
+# define machine_is_trondheim()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LQ2
+#ifdef CONFIG_MACH_EVA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LQ2
+#  define machine_arch_type	MACH_TYPE_EVA
 # endif
-# define machine_is_lq2()	(machine_arch_type == MACH_TYPE_LQ2)
+# define machine_is_eva()	(machine_arch_type == MACH_TYPE_EVA)
 #else
-# define machine_is_lq2()	(0)
+# define machine_is_eva()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SWEDA_TMS2
+#ifdef CONFIG_MACH_TRUST_TAURUS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SWEDA_TMS2
+#  define machine_arch_type	MACH_TYPE_TRUST_TAURUS
 # endif
-# define machine_is_sweda_tms2()	(machine_arch_type == MACH_TYPE_SWEDA_TMS2)
+# define machine_is_trust_taurus()	(machine_arch_type == MACH_TYPE_TRUST_TAURUS)
 #else
-# define machine_is_sweda_tms2()	(0)
+# define machine_is_trust_taurus()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX53_LOCO
+#ifdef CONFIG_MACH_NS2816_HUASHAN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX53_LOCO
+#  define machine_arch_type	MACH_TYPE_NS2816_HUASHAN
 # endif
-# define machine_is_mx53_loco()	(machine_arch_type == MACH_TYPE_MX53_LOCO)
+# define machine_is_ns2816_huashan()	(machine_arch_type == MACH_TYPE_NS2816_HUASHAN)
 #else
-# define machine_is_mx53_loco()	(0)
+# define machine_is_ns2816_huashan()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACER_A8
+#ifdef CONFIG_MACH_NS2816_YANGCHENG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACER_A8
+#  define machine_arch_type	MACH_TYPE_NS2816_YANGCHENG
 # endif
-# define machine_is_acer_a8()	(machine_arch_type == MACH_TYPE_ACER_A8)
+# define machine_is_ns2816_yangcheng()	(machine_arch_type == MACH_TYPE_NS2816_YANGCHENG)
 #else
-# define machine_is_acer_a8()	(0)
+# define machine_is_ns2816_yangcheng()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACER_GAUGUIN
+#ifdef CONFIG_MACH_P852
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACER_GAUGUIN
+#  define machine_arch_type	MACH_TYPE_P852
 # endif
-# define machine_is_acer_gauguin()	(machine_arch_type == MACH_TYPE_ACER_GAUGUIN)
+# define machine_is_p852()	(machine_arch_type == MACH_TYPE_P852)
 #else
-# define machine_is_acer_gauguin()	(0)
+# define machine_is_p852()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GUPPY
+#ifdef CONFIG_MACH_FLEA3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GUPPY
+#  define machine_arch_type	MACH_TYPE_FLEA3
 # endif
-# define machine_is_guppy()	(machine_arch_type == MACH_TYPE_GUPPY)
+# define machine_is_flea3()	(machine_arch_type == MACH_TYPE_FLEA3)
 #else
-# define machine_is_guppy()	(0)
+# define machine_is_flea3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX61_ARD
+#ifdef CONFIG_MACH_BOWFIN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX61_ARD
+#  define machine_arch_type	MACH_TYPE_BOWFIN
 # endif
-# define machine_is_mx61_ard()	(machine_arch_type == MACH_TYPE_MX61_ARD)
+# define machine_is_bowfin()	(machine_arch_type == MACH_TYPE_BOWFIN)
 #else
-# define machine_is_mx61_ard()	(0)
+# define machine_is_bowfin()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TX53
+#ifdef CONFIG_MACH_MV88DE3100
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TX53
+#  define machine_arch_type	MACH_TYPE_MV88DE3100
 # endif
-# define machine_is_tx53()	(machine_arch_type == MACH_TYPE_TX53)
+# define machine_is_mv88de3100()	(machine_arch_type == MACH_TYPE_MV88DE3100)
 #else
-# define machine_is_tx53()	(0)
+# define machine_is_mv88de3100()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAPL138_CASE_A3
+#ifdef CONFIG_MACH_PIA_AM35X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAPL138_CASE_A3
+#  define machine_arch_type	MACH_TYPE_PIA_AM35X
 # endif
-# define machine_is_omapl138_case_a3()	(machine_arch_type == MACH_TYPE_OMAPL138_CASE_A3)
+# define machine_is_pia_am35x()	(machine_arch_type == MACH_TYPE_PIA_AM35X)
 #else
-# define machine_is_omapl138_case_a3()	(0)
+# define machine_is_pia_am35x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UEMD
+#ifdef CONFIG_MACH_CEDAR
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UEMD
+#  define machine_arch_type	MACH_TYPE_CEDAR
 # endif
-# define machine_is_uemd()	(machine_arch_type == MACH_TYPE_UEMD)
+# define machine_is_cedar()	(machine_arch_type == MACH_TYPE_CEDAR)
 #else
-# define machine_is_uemd()	(0)
+# define machine_is_cedar()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CCWMX51MUT
+#ifdef CONFIG_MACH_PICASSO_E
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CCWMX51MUT
+#  define machine_arch_type	MACH_TYPE_PICASSO_E
 # endif
-# define machine_is_ccwmx51mut()	(machine_arch_type == MACH_TYPE_CCWMX51MUT)
+# define machine_is_picasso_e()	(machine_arch_type == MACH_TYPE_PICASSO_E)
 #else
-# define machine_is_ccwmx51mut()	(0)
+# define machine_is_picasso_e()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ROCKHOPPER
+#ifdef CONFIG_MACH_SAMSUNG_E60
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ROCKHOPPER
+#  define machine_arch_type	MACH_TYPE_SAMSUNG_E60
 # endif
-# define machine_is_rockhopper()	(machine_arch_type == MACH_TYPE_ROCKHOPPER)
+# define machine_is_samsung_e60()	(machine_arch_type == MACH_TYPE_SAMSUNG_E60)
 #else
-# define machine_is_rockhopper()	(0)
+# define machine_is_samsung_e60()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ENCORE
+#ifdef CONFIG_MACH_SDVR_MINI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ENCORE
+#  define machine_arch_type	MACH_TYPE_SDVR_MINI
 # endif
-# define machine_is_encore()	(machine_arch_type == MACH_TYPE_ENCORE)
+# define machine_is_sdvr_mini()	(machine_arch_type == MACH_TYPE_SDVR_MINI)
 #else
-# define machine_is_encore()	(0)
+# define machine_is_sdvr_mini()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HKDKC100
+#ifdef CONFIG_MACH_OMAP3_IJ3K
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HKDKC100
+#  define machine_arch_type	MACH_TYPE_OMAP3_IJ3K
 # endif
-# define machine_is_hkdkc100()	(machine_arch_type == MACH_TYPE_HKDKC100)
+# define machine_is_omap3_ij3k()	(machine_arch_type == MACH_TYPE_OMAP3_IJ3K)
 #else
-# define machine_is_hkdkc100()	(0)
+# define machine_is_omap3_ij3k()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TS42XX
+#ifdef CONFIG_MACH_MODASMC1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TS42XX
+#  define machine_arch_type	MACH_TYPE_MODASMC1
 # endif
-# define machine_is_ts42xx()	(machine_arch_type == MACH_TYPE_TS42XX)
+# define machine_is_modasmc1()	(machine_arch_type == MACH_TYPE_MODASMC1)
 #else
-# define machine_is_ts42xx()	(0)
+# define machine_is_modasmc1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AEBL
+#ifdef CONFIG_MACH_APQ8064_RUMI3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AEBL
+#  define machine_arch_type	MACH_TYPE_APQ8064_RUMI3
 # endif
-# define machine_is_aebl()	(machine_arch_type == MACH_TYPE_AEBL)
+# define machine_is_apq8064_rumi3()	(machine_arch_type == MACH_TYPE_APQ8064_RUMI3)
 #else
-# define machine_is_aebl()	(0)
+# define machine_is_apq8064_rumi3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WARIO
+#ifdef CONFIG_MACH_MATRIX506
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WARIO
+#  define machine_arch_type	MACH_TYPE_MATRIX506
 # endif
-# define machine_is_wario()	(machine_arch_type == MACH_TYPE_WARIO)
+# define machine_is_matrix506()	(machine_arch_type == MACH_TYPE_MATRIX506)
 #else
-# define machine_is_wario()	(0)
+# define machine_is_matrix506()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GFS_SPM
+#ifdef CONFIG_MACH_MSM9615_MTP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GFS_SPM
+#  define machine_arch_type	MACH_TYPE_MSM9615_MTP
 # endif
-# define machine_is_gfs_spm()	(machine_arch_type == MACH_TYPE_GFS_SPM)
+# define machine_is_msm9615_mtp()	(machine_arch_type == MACH_TYPE_MSM9615_MTP)
 #else
-# define machine_is_gfs_spm()	(0)
+# define machine_is_msm9615_mtp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CM_T3730
+#ifdef CONFIG_MACH_DM36X_SPAWNDC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CM_T3730
+#  define machine_arch_type	MACH_TYPE_DM36X_SPAWNDC
 # endif
-# define machine_is_cm_t3730()	(machine_arch_type == MACH_TYPE_CM_T3730)
+# define machine_is_dm36x_spawndc()	(machine_arch_type == MACH_TYPE_DM36X_SPAWNDC)
 #else
-# define machine_is_cm_t3730()	(0)
+# define machine_is_dm36x_spawndc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ISC3
+#ifdef CONFIG_MACH_SFF792
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ISC3
+#  define machine_arch_type	MACH_TYPE_SFF792
 # endif
-# define machine_is_isc3()	(machine_arch_type == MACH_TYPE_ISC3)
+# define machine_is_sff792()	(machine_arch_type == MACH_TYPE_SFF792)
 #else
-# define machine_is_isc3()	(0)
+# define machine_is_sff792()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RASCAL
+#ifdef CONFIG_MACH_AM335XIAEVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RASCAL
+#  define machine_arch_type	MACH_TYPE_AM335XIAEVM
 # endif
-# define machine_is_rascal()	(machine_arch_type == MACH_TYPE_RASCAL)
+# define machine_is_am335xiaevm()	(machine_arch_type == MACH_TYPE_AM335XIAEVM)
 #else
-# define machine_is_rascal()	(0)
+# define machine_is_am335xiaevm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HREFV60
+#ifdef CONFIG_MACH_G3C2440
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HREFV60
+#  define machine_arch_type	MACH_TYPE_G3C2440
 # endif
-# define machine_is_hrefv60()	(machine_arch_type == MACH_TYPE_HREFV60)
+# define machine_is_g3c2440()	(machine_arch_type == MACH_TYPE_G3C2440)
 #else
-# define machine_is_hrefv60()	(0)
+# define machine_is_g3c2440()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TPT_2_0
+#ifdef CONFIG_MACH_TION270
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TPT_2_0
+#  define machine_arch_type	MACH_TYPE_TION270
 # endif
-# define machine_is_tpt_2_0()	(machine_arch_type == MACH_TYPE_TPT_2_0)
+# define machine_is_tion270()	(machine_arch_type == MACH_TYPE_TION270)
 #else
-# define machine_is_tpt_2_0()	(0)
+# define machine_is_tion270()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPLENDOR
+#ifdef CONFIG_MACH_W22Q7ARM02
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPLENDOR
+#  define machine_arch_type	MACH_TYPE_W22Q7ARM02
 # endif
-# define machine_is_splendor()	(machine_arch_type == MACH_TYPE_SPLENDOR)
+# define machine_is_w22q7arm02()	(machine_arch_type == MACH_TYPE_W22Q7ARM02)
 #else
-# define machine_is_splendor()	(0)
+# define machine_is_w22q7arm02()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8X60_QT
+#ifdef CONFIG_MACH_OMAP_CAT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8X60_QT
+#  define machine_arch_type	MACH_TYPE_OMAP_CAT
 # endif
-# define machine_is_msm8x60_qt()	(machine_arch_type == MACH_TYPE_MSM8X60_QT)
+# define machine_is_omap_cat()	(machine_arch_type == MACH_TYPE_OMAP_CAT)
 #else
-# define machine_is_msm8x60_qt()	(0)
+# define machine_is_omap_cat()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HTC_HD_MINI
+#ifdef CONFIG_MACH_AT91SAM9N12EK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HTC_HD_MINI
+#  define machine_arch_type	MACH_TYPE_AT91SAM9N12EK
 # endif
-# define machine_is_htc_hd_mini()	(machine_arch_type == MACH_TYPE_HTC_HD_MINI)
+# define machine_is_at91sam9n12ek()	(machine_arch_type == MACH_TYPE_AT91SAM9N12EK)
 #else
-# define machine_is_htc_hd_mini()	(0)
+# define machine_is_at91sam9n12ek()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ATHENE
+#ifdef CONFIG_MACH_MORRISON
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ATHENE
+#  define machine_arch_type	MACH_TYPE_MORRISON
 # endif
-# define machine_is_athene()	(machine_arch_type == MACH_TYPE_ATHENE)
+# define machine_is_morrison()	(machine_arch_type == MACH_TYPE_MORRISON)
 #else
-# define machine_is_athene()	(0)
+# define machine_is_morrison()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DEEP_R_EK_1
+#ifdef CONFIG_MACH_SVDU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DEEP_R_EK_1
+#  define machine_arch_type	MACH_TYPE_SVDU
 # endif
-# define machine_is_deep_r_ek_1()	(machine_arch_type == MACH_TYPE_DEEP_R_EK_1)
+# define machine_is_svdu()	(machine_arch_type == MACH_TYPE_SVDU)
 #else
-# define machine_is_deep_r_ek_1()	(0)
+# define machine_is_svdu()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VIVOW_CT
+#ifdef CONFIG_MACH_LPP01
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VIVOW_CT
+#  define machine_arch_type	MACH_TYPE_LPP01
 # endif
-# define machine_is_vivow_ct()	(machine_arch_type == MACH_TYPE_VIVOW_CT)
+# define machine_is_lpp01()	(machine_arch_type == MACH_TYPE_LPP01)
 #else
-# define machine_is_vivow_ct()	(0)
+# define machine_is_lpp01()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NERY_1000
+#ifdef CONFIG_MACH_UBC283
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NERY_1000
+#  define machine_arch_type	MACH_TYPE_UBC283
 # endif
-# define machine_is_nery_1000()	(machine_arch_type == MACH_TYPE_NERY_1000)
+# define machine_is_ubc283()	(machine_arch_type == MACH_TYPE_UBC283)
 #else
-# define machine_is_nery_1000()	(0)
+# define machine_is_ubc283()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RFL109145_SSRV
+#ifdef CONFIG_MACH_ZEPPELIN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RFL109145_SSRV
+#  define machine_arch_type	MACH_TYPE_ZEPPELIN
 # endif
-# define machine_is_rfl109145_ssrv()	(machine_arch_type == MACH_TYPE_RFL109145_SSRV)
+# define machine_is_zeppelin()	(machine_arch_type == MACH_TYPE_ZEPPELIN)
 #else
-# define machine_is_rfl109145_ssrv()	(0)
+# define machine_is_zeppelin()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NMH
+#ifdef CONFIG_MACH_MOTUS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NMH
+#  define machine_arch_type	MACH_TYPE_MOTUS
 # endif
-# define machine_is_nmh()	(machine_arch_type == MACH_TYPE_NMH)
+# define machine_is_motus()	(machine_arch_type == MACH_TYPE_MOTUS)
 #else
-# define machine_is_nmh()	(0)
+# define machine_is_motus()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WN802T
+#ifdef CONFIG_MACH_NEOMAINBOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WN802T
+#  define machine_arch_type	MACH_TYPE_NEOMAINBOARD
 # endif
-# define machine_is_wn802t()	(machine_arch_type == MACH_TYPE_WN802T)
+# define machine_is_neomainboard()	(machine_arch_type == MACH_TYPE_NEOMAINBOARD)
 #else
-# define machine_is_wn802t()	(0)
+# define machine_is_neomainboard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DRAGONET
+#ifdef CONFIG_MACH_DEVKIT3250
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DRAGONET
+#  define machine_arch_type	MACH_TYPE_DEVKIT3250
 # endif
-# define machine_is_dragonet()	(machine_arch_type == MACH_TYPE_DRAGONET)
+# define machine_is_devkit3250()	(machine_arch_type == MACH_TYPE_DEVKIT3250)
 #else
-# define machine_is_dragonet()	(0)
+# define machine_is_devkit3250()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AT91SAM9263DESK16L
+#ifdef CONFIG_MACH_DEVKIT7000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9263DESK16L
+#  define machine_arch_type	MACH_TYPE_DEVKIT7000
 # endif
-# define machine_is_at91sam9263desk16l()	(machine_arch_type == MACH_TYPE_AT91SAM9263DESK16L)
+# define machine_is_devkit7000()	(machine_arch_type == MACH_TYPE_DEVKIT7000)
 #else
-# define machine_is_at91sam9263desk16l()	(0)
+# define machine_is_devkit7000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BCMHANA_SV
+#ifdef CONFIG_MACH_FMC_UIC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BCMHANA_SV
+#  define machine_arch_type	MACH_TYPE_FMC_UIC
 # endif
-# define machine_is_bcmhana_sv()	(machine_arch_type == MACH_TYPE_BCMHANA_SV)
+# define machine_is_fmc_uic()	(machine_arch_type == MACH_TYPE_FMC_UIC)
 #else
-# define machine_is_bcmhana_sv()	(0)
+# define machine_is_fmc_uic()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BCMHANA_TABLET
+#ifdef CONFIG_MACH_FMC_DCM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BCMHANA_TABLET
+#  define machine_arch_type	MACH_TYPE_FMC_DCM
 # endif
-# define machine_is_bcmhana_tablet()	(machine_arch_type == MACH_TYPE_BCMHANA_TABLET)
+# define machine_is_fmc_dcm()	(machine_arch_type == MACH_TYPE_FMC_DCM)
 #else
-# define machine_is_bcmhana_tablet()	(0)
+# define machine_is_fmc_dcm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KOI
+#ifdef CONFIG_MACH_BATWM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KOI
+#  define machine_arch_type	MACH_TYPE_BATWM
 # endif
-# define machine_is_koi()	(machine_arch_type == MACH_TYPE_KOI)
+# define machine_is_batwm()	(machine_arch_type == MACH_TYPE_BATWM)
 #else
-# define machine_is_koi()	(0)
+# define machine_is_batwm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TS4800
+#ifdef CONFIG_MACH_ATLAS6CB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TS4800
+#  define machine_arch_type	MACH_TYPE_ATLAS6CB
 # endif
-# define machine_is_ts4800()	(machine_arch_type == MACH_TYPE_TS4800)
+# define machine_is_atlas6cb()	(machine_arch_type == MACH_TYPE_ATLAS6CB)
 #else
-# define machine_is_ts4800()	(0)
+# define machine_is_atlas6cb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TQMA9263
+#ifdef CONFIG_MACH_BLUE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TQMA9263
+#  define machine_arch_type	MACH_TYPE_BLUE
 # endif
-# define machine_is_tqma9263()	(machine_arch_type == MACH_TYPE_TQMA9263)
+# define machine_is_blue()	(machine_arch_type == MACH_TYPE_BLUE)
 #else
-# define machine_is_tqma9263()	(0)
+# define machine_is_blue()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HOLIDAY
+#ifdef CONFIG_MACH_COLORADO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HOLIDAY
+#  define machine_arch_type	MACH_TYPE_COLORADO
 # endif
-# define machine_is_holiday()	(machine_arch_type == MACH_TYPE_HOLIDAY)
+# define machine_is_colorado()	(machine_arch_type == MACH_TYPE_COLORADO)
 #else
-# define machine_is_holiday()	(0)
+# define machine_is_colorado()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DMA6410
+#ifdef CONFIG_MACH_POPC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DMA6410
+#  define machine_arch_type	MACH_TYPE_POPC
 # endif
-# define machine_is_dma_6410()	(machine_arch_type == MACH_TYPE_DMA6410)
+# define machine_is_popc()	(machine_arch_type == MACH_TYPE_POPC)
 #else
-# define machine_is_dma_6410()	(0)
+# define machine_is_popc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PCATS_OVERLAY
+#ifdef CONFIG_MACH_PROMWAD_JADE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PCATS_OVERLAY
+#  define machine_arch_type	MACH_TYPE_PROMWAD_JADE
 # endif
-# define machine_is_pcats_overlay()	(machine_arch_type == MACH_TYPE_PCATS_OVERLAY)
+# define machine_is_promwad_jade()	(machine_arch_type == MACH_TYPE_PROMWAD_JADE)
 #else
-# define machine_is_pcats_overlay()	(0)
+# define machine_is_promwad_jade()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HWGW6410
+#ifdef CONFIG_MACH_AMP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HWGW6410
+#  define machine_arch_type	MACH_TYPE_AMP
 # endif
-# define machine_is_hwgw6410()	(machine_arch_type == MACH_TYPE_HWGW6410)
+# define machine_is_amp()	(machine_arch_type == MACH_TYPE_AMP)
 #else
-# define machine_is_hwgw6410()	(0)
+# define machine_is_amp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SHENZHOU
+#ifdef CONFIG_MACH_GNET_AMP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SHENZHOU
+#  define machine_arch_type	MACH_TYPE_GNET_AMP
 # endif
-# define machine_is_shenzhou()	(machine_arch_type == MACH_TYPE_SHENZHOU)
+# define machine_is_gnet_amp()	(machine_arch_type == MACH_TYPE_GNET_AMP)
 #else
-# define machine_is_shenzhou()	(0)
+# define machine_is_gnet_amp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CWME9210
+#ifdef CONFIG_MACH_TOQUES
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CWME9210
+#  define machine_arch_type	MACH_TYPE_TOQUES
 # endif
-# define machine_is_cwme9210()	(machine_arch_type == MACH_TYPE_CWME9210)
+# define machine_is_toques()	(machine_arch_type == MACH_TYPE_TOQUES)
 #else
-# define machine_is_cwme9210()	(0)
+# define machine_is_toques()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CWME9210JS
+#ifdef CONFIG_MACH_DCT_STORM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CWME9210JS
+#  define machine_arch_type	MACH_TYPE_DCT_STORM
 # endif
-# define machine_is_cwme9210js()	(machine_arch_type == MACH_TYPE_CWME9210JS)
+# define machine_is_dct_storm()	(machine_arch_type == MACH_TYPE_DCT_STORM)
 #else
-# define machine_is_cwme9210js()	(0)
+# define machine_is_dct_storm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PGS_SITARA
+#ifdef CONFIG_MACH_OWL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PGS_SITARA
+#  define machine_arch_type	MACH_TYPE_OWL
 # endif
-# define machine_is_pgs_v1()	(machine_arch_type == MACH_TYPE_PGS_SITARA)
+# define machine_is_owl()	(machine_arch_type == MACH_TYPE_OWL)
 #else
-# define machine_is_pgs_v1()	(0)
+# define machine_is_owl()	(0)
 #endif
 
-#ifdef CONFIG_MACH_COLIBRI_TEGRA2
+#ifdef CONFIG_MACH_COGENT_CSB1741
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_COLIBRI_TEGRA2
+#  define machine_arch_type	MACH_TYPE_COGENT_CSB1741
 # endif
-# define machine_is_colibri_tegra2()	(machine_arch_type == MACH_TYPE_COLIBRI_TEGRA2)
+# define machine_is_cogent_csb1741()	(machine_arch_type == MACH_TYPE_COGENT_CSB1741)
 #else
-# define machine_is_colibri_tegra2()	(0)
+# define machine_is_cogent_csb1741()	(0)
 #endif
 
-#ifdef CONFIG_MACH_W21
+#ifdef CONFIG_MACH_ADILLUSTRA610
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_W21
+#  define machine_arch_type	MACH_TYPE_ADILLUSTRA610
 # endif
-# define machine_is_w21()	(machine_arch_type == MACH_TYPE_W21)
+# define machine_is_adillustra610()	(machine_arch_type == MACH_TYPE_ADILLUSTRA610)
 #else
-# define machine_is_w21()	(0)
+# define machine_is_adillustra610()	(0)
 #endif
 
-#ifdef CONFIG_MACH_POLYSAT1
+#ifdef CONFIG_MACH_ECAFE_NA04
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_POLYSAT1
+#  define machine_arch_type	MACH_TYPE_ECAFE_NA04
 # endif
-# define machine_is_polysat1()	(machine_arch_type == MACH_TYPE_POLYSAT1)
+# define machine_is_ecafe_na04()	(machine_arch_type == MACH_TYPE_ECAFE_NA04)
 #else
-# define machine_is_polysat1()	(0)
+# define machine_is_ecafe_na04()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DATAWAY
+#ifdef CONFIG_MACH_POPCT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DATAWAY
+#  define machine_arch_type	MACH_TYPE_POPCT
 # endif
-# define machine_is_dataway()	(machine_arch_type == MACH_TYPE_DATAWAY)
+# define machine_is_popct()	(machine_arch_type == MACH_TYPE_POPCT)
 #else
-# define machine_is_dataway()	(0)
+# define machine_is_popct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_COBRAL138
+#ifdef CONFIG_MACH_OMAP3_HELENA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_COBRAL138
+#  define machine_arch_type	MACH_TYPE_OMAP3_HELENA
 # endif
-# define machine_is_cobral138()	(machine_arch_type == MACH_TYPE_COBRAL138)
+# define machine_is_omap3_helena()	(machine_arch_type == MACH_TYPE_OMAP3_HELENA)
 #else
-# define machine_is_cobral138()	(0)
+# define machine_is_omap3_helena()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ROVERPCS8
+#ifdef CONFIG_MACH_ACH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ROVERPCS8
+#  define machine_arch_type	MACH_TYPE_ACH
 # endif
-# define machine_is_roverpcs8()	(machine_arch_type == MACH_TYPE_ROVERPCS8)
+# define machine_is_ach()	(machine_arch_type == MACH_TYPE_ACH)
 #else
-# define machine_is_roverpcs8()	(0)
+# define machine_is_ach()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MARVELC
+#ifdef CONFIG_MACH_MODULE_DTB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MARVELC
+#  define machine_arch_type	MACH_TYPE_MODULE_DTB
 # endif
-# define machine_is_marvelc()	(machine_arch_type == MACH_TYPE_MARVELC)
+# define machine_is_module_dtb()	(machine_arch_type == MACH_TYPE_MODULE_DTB)
 #else
-# define machine_is_marvelc()	(0)
+# define machine_is_module_dtb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NAVEFIHID
+#ifdef CONFIG_MACH_OSLO_ELISABETH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NAVEFIHID
+#  define machine_arch_type	MACH_TYPE_OSLO_ELISABETH
 # endif
-# define machine_is_navefihid()	(machine_arch_type == MACH_TYPE_NAVEFIHID)
+# define machine_is_oslo_elisabeth()	(machine_arch_type == MACH_TYPE_OSLO_ELISABETH)
 #else
-# define machine_is_navefihid()	(0)
+# define machine_is_oslo_elisabeth()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DM365_CV100
+#ifdef CONFIG_MACH_TT01
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DM365_CV100
+#  define machine_arch_type	MACH_TYPE_TT01
 # endif
-# define machine_is_dm365_cv100()	(machine_arch_type == MACH_TYPE_DM365_CV100)
+# define machine_is_tt01()	(machine_arch_type == MACH_TYPE_TT01)
 #else
-# define machine_is_dm365_cv100()	(0)
+# define machine_is_tt01()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ABLE
+#ifdef CONFIG_MACH_MSM8930_CDP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ABLE
+#  define machine_arch_type	MACH_TYPE_MSM8930_CDP
 # endif
-# define machine_is_able()	(machine_arch_type == MACH_TYPE_ABLE)
+# define machine_is_msm8930_cdp()	(machine_arch_type == MACH_TYPE_MSM8930_CDP)
 #else
-# define machine_is_able()	(0)
+# define machine_is_msm8930_cdp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LEGACY
+#ifdef CONFIG_MACH_MSM8930_MTP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LEGACY
+#  define machine_arch_type	MACH_TYPE_MSM8930_MTP
 # endif
-# define machine_is_legacy()	(machine_arch_type == MACH_TYPE_LEGACY)
+# define machine_is_msm8930_mtp()	(machine_arch_type == MACH_TYPE_MSM8930_MTP)
 #else
-# define machine_is_legacy()	(0)
+# define machine_is_msm8930_mtp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ICONG
+#ifdef CONFIG_MACH_MSM8930_FLUID
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ICONG
+#  define machine_arch_type	MACH_TYPE_MSM8930_FLUID
 # endif
-# define machine_is_icong()	(machine_arch_type == MACH_TYPE_ICONG)
+# define machine_is_msm8930_fluid()	(machine_arch_type == MACH_TYPE_MSM8930_FLUID)
 #else
-# define machine_is_icong()	(0)
+# define machine_is_msm8930_fluid()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ROVER_G8
+#ifdef CONFIG_MACH_LTU11
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ROVER_G8
+#  define machine_arch_type	MACH_TYPE_LTU11
 # endif
-# define machine_is_rover_g8()	(machine_arch_type == MACH_TYPE_ROVER_G8)
+# define machine_is_ltu11()	(machine_arch_type == MACH_TYPE_LTU11)
 #else
-# define machine_is_rover_g8()	(0)
+# define machine_is_ltu11()	(0)
 #endif
 
-#ifdef CONFIG_MACH_T5388P
+#ifdef CONFIG_MACH_AM1808_SPAWNCO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_T5388P
+#  define machine_arch_type	MACH_TYPE_AM1808_SPAWNCO
 # endif
-# define machine_is_t5388p()	(machine_arch_type == MACH_TYPE_T5388P)
+# define machine_is_am1808_spawnco()	(machine_arch_type == MACH_TYPE_AM1808_SPAWNCO)
 #else
-# define machine_is_t5388p()	(0)
+# define machine_is_am1808_spawnco()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DINGO
+#ifdef CONFIG_MACH_FLX6410
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DINGO
+#  define machine_arch_type	MACH_TYPE_FLX6410
 # endif
-# define machine_is_dingo()	(machine_arch_type == MACH_TYPE_DINGO)
+# define machine_is_flx6410()	(machine_arch_type == MACH_TYPE_FLX6410)
 #else
-# define machine_is_dingo()	(0)
+# define machine_is_flx6410()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GOFLEXHOME
+#ifdef CONFIG_MACH_MX6Q_QSB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GOFLEXHOME
+#  define machine_arch_type	MACH_TYPE_MX6Q_QSB
 # endif
-# define machine_is_goflexhome()	(machine_arch_type == MACH_TYPE_GOFLEXHOME)
+# define machine_is_mx6q_qsb()	(machine_arch_type == MACH_TYPE_MX6Q_QSB)
 #else
-# define machine_is_goflexhome()	(0)
+# define machine_is_mx6q_qsb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LANREADYFN511
+#ifdef CONFIG_MACH_MX53_PLT424
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LANREADYFN511
+#  define machine_arch_type	MACH_TYPE_MX53_PLT424
 # endif
-# define machine_is_lanreadyfn511()	(machine_arch_type == MACH_TYPE_LANREADYFN511)
+# define machine_is_mx53_plt424()	(machine_arch_type == MACH_TYPE_MX53_PLT424)
 #else
-# define machine_is_lanreadyfn511()	(0)
+# define machine_is_mx53_plt424()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3_BAIA
+#ifdef CONFIG_MACH_JASMINE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3_BAIA
+#  define machine_arch_type	MACH_TYPE_JASMINE
 # endif
-# define machine_is_omap3_baia()	(machine_arch_type == MACH_TYPE_OMAP3_BAIA)
+# define machine_is_jasmine()	(machine_arch_type == MACH_TYPE_JASMINE)
 #else
-# define machine_is_omap3_baia()	(0)
+# define machine_is_jasmine()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP3SMARTDISPLAY
+#ifdef CONFIG_MACH_L138_OWLBOARD_PLUS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP3SMARTDISPLAY
+#  define machine_arch_type	MACH_TYPE_L138_OWLBOARD_PLUS
 # endif
-# define machine_is_omap3smartdisplay()	(machine_arch_type == MACH_TYPE_OMAP3SMARTDISPLAY)
+# define machine_is_l138_owlboard_plus()	(machine_arch_type == MACH_TYPE_L138_OWLBOARD_PLUS)
 #else
-# define machine_is_omap3smartdisplay()	(0)
+# define machine_is_l138_owlboard_plus()	(0)
 #endif
 
-#ifdef CONFIG_MACH_XILINX
+#ifdef CONFIG_MACH_WR21
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_XILINX
+#  define machine_arch_type	MACH_TYPE_WR21
 # endif
-# define machine_is_xilinx()	(machine_arch_type == MACH_TYPE_XILINX)
+# define machine_is_wr21()	(machine_arch_type == MACH_TYPE_WR21)
 #else
-# define machine_is_xilinx()	(0)
+# define machine_is_wr21()	(0)
 #endif
 
-#ifdef CONFIG_MACH_A2F
+#ifdef CONFIG_MACH_PEABOY
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_A2F
+#  define machine_arch_type	MACH_TYPE_PEABOY
 # endif
-# define machine_is_a2f()	(machine_arch_type == MACH_TYPE_A2F)
+# define machine_is_peaboy()	(machine_arch_type == MACH_TYPE_PEABOY)
 #else
-# define machine_is_a2f()	(0)
+# define machine_is_peaboy()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SKY25
+#ifdef CONFIG_MACH_MX28_PLATO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SKY25
+#  define machine_arch_type	MACH_TYPE_MX28_PLATO
 # endif
-# define machine_is_sky25()	(machine_arch_type == MACH_TYPE_SKY25)
+# define machine_is_mx28_plato()	(machine_arch_type == MACH_TYPE_MX28_PLATO)
 #else
-# define machine_is_sky25()	(0)
+# define machine_is_mx28_plato()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CCMX53
+#ifdef CONFIG_MACH_KACOM2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CCMX53
+#  define machine_arch_type	MACH_TYPE_KACOM2
 # endif
-# define machine_is_ccmx53()	(machine_arch_type == MACH_TYPE_CCMX53)
+# define machine_is_kacom2()	(machine_arch_type == MACH_TYPE_KACOM2)
 #else
-# define machine_is_ccmx53()	(0)
+# define machine_is_kacom2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CCMX53JS
+#ifdef CONFIG_MACH_SLCO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CCMX53JS
+#  define machine_arch_type	MACH_TYPE_SLCO
 # endif
-# define machine_is_ccmx53js()	(machine_arch_type == MACH_TYPE_CCMX53JS)
+# define machine_is_slco()	(machine_arch_type == MACH_TYPE_SLCO)
 #else
-# define machine_is_ccmx53js()	(0)
+# define machine_is_slco()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CCWMX53
+#ifdef CONFIG_MACH_IMX51PICO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CCWMX53
+#  define machine_arch_type	MACH_TYPE_IMX51PICO
 # endif
-# define machine_is_ccwmx53()	(machine_arch_type == MACH_TYPE_CCWMX53)
+# define machine_is_imx51pico()	(machine_arch_type == MACH_TYPE_IMX51PICO)
 #else
-# define machine_is_ccwmx53()	(0)
+# define machine_is_imx51pico()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CCWMX53JS
+#ifdef CONFIG_MACH_GLINK1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CCWMX53JS
+#  define machine_arch_type	MACH_TYPE_GLINK1
 # endif
-# define machine_is_ccwmx53js()	(machine_arch_type == MACH_TYPE_CCWMX53JS)
+# define machine_is_glink1()	(machine_arch_type == MACH_TYPE_GLINK1)
 #else
-# define machine_is_ccwmx53js()	(0)
+# define machine_is_glink1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_FRISMS
+#ifdef CONFIG_MACH_DIAMOND
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_FRISMS
+#  define machine_arch_type	MACH_TYPE_DIAMOND
 # endif
-# define machine_is_frisms()	(machine_arch_type == MACH_TYPE_FRISMS)
+# define machine_is_diamond()	(machine_arch_type == MACH_TYPE_DIAMOND)
 #else
-# define machine_is_frisms()	(0)
+# define machine_is_diamond()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM7X27A_FFA
+#ifdef CONFIG_MACH_D9000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM7X27A_FFA
+#  define machine_arch_type	MACH_TYPE_D9000
 # endif
-# define machine_is_msm7x27a_ffa()	(machine_arch_type == MACH_TYPE_MSM7X27A_FFA)
+# define machine_is_d9000()	(machine_arch_type == MACH_TYPE_D9000)
 #else
-# define machine_is_msm7x27a_ffa()	(0)
+# define machine_is_d9000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM7X27A_SURF
+#ifdef CONFIG_MACH_W5300E01
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM7X27A_SURF
+#  define machine_arch_type	MACH_TYPE_W5300E01
 # endif
-# define machine_is_msm7x27a_surf()	(machine_arch_type == MACH_TYPE_MSM7X27A_SURF)
+# define machine_is_w5300e01()	(machine_arch_type == MACH_TYPE_W5300E01)
 #else
-# define machine_is_msm7x27a_surf()	(0)
+# define machine_is_w5300e01()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM7X27A_RUMI3
+#ifdef CONFIG_MACH_IM6000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM7X27A_RUMI3
+#  define machine_arch_type	MACH_TYPE_IM6000
 # endif
-# define machine_is_msm7x27a_rumi3()	(machine_arch_type == MACH_TYPE_MSM7X27A_RUMI3)
+# define machine_is_im6000()	(machine_arch_type == MACH_TYPE_IM6000)
 #else
-# define machine_is_msm7x27a_rumi3()	(0)
+# define machine_is_im6000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DIMMSAM9G20
+#ifdef CONFIG_MACH_MX51_FRED51
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DIMMSAM9G20
+#  define machine_arch_type	MACH_TYPE_MX51_FRED51
 # endif
-# define machine_is_dimmsam9g20()	(machine_arch_type == MACH_TYPE_DIMMSAM9G20)
+# define machine_is_mx51_fred51()	(machine_arch_type == MACH_TYPE_MX51_FRED51)
 #else
-# define machine_is_dimmsam9g20()	(0)
+# define machine_is_mx51_fred51()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DIMM_IMX28
+#ifdef CONFIG_MACH_STM32F2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DIMM_IMX28
+#  define machine_arch_type	MACH_TYPE_STM32F2
 # endif
-# define machine_is_dimm_imx28()	(machine_arch_type == MACH_TYPE_DIMM_IMX28)
+# define machine_is_stm32f2()	(machine_arch_type == MACH_TYPE_STM32F2)
 #else
-# define machine_is_dimm_imx28()	(0)
+# define machine_is_stm32f2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AMK_A4
+#ifdef CONFIG_MACH_VILLE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AMK_A4
+#  define machine_arch_type	MACH_TYPE_VILLE
 # endif
-# define machine_is_amk_a4()	(machine_arch_type == MACH_TYPE_AMK_A4)
+# define machine_is_ville()	(machine_arch_type == MACH_TYPE_VILLE)
 #else
-# define machine_is_amk_a4()	(0)
+# define machine_is_ville()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GNET_SGME
+#ifdef CONFIG_MACH_PTIP_MURNAU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GNET_SGME
+#  define machine_arch_type	MACH_TYPE_PTIP_MURNAU
 # endif
-# define machine_is_gnet_sgme()	(machine_arch_type == MACH_TYPE_GNET_SGME)
+# define machine_is_ptip_murnau()	(machine_arch_type == MACH_TYPE_PTIP_MURNAU)
 #else
-# define machine_is_gnet_sgme()	(0)
+# define machine_is_ptip_murnau()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SHOOTER_U
+#ifdef CONFIG_MACH_PTIP_CLASSIC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SHOOTER_U
+#  define machine_arch_type	MACH_TYPE_PTIP_CLASSIC
 # endif
-# define machine_is_shooter_u()	(machine_arch_type == MACH_TYPE_SHOOTER_U)
+# define machine_is_ptip_classic()	(machine_arch_type == MACH_TYPE_PTIP_CLASSIC)
 #else
-# define machine_is_shooter_u()	(0)
+# define machine_is_ptip_classic()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VMX53
+#ifdef CONFIG_MACH_MX53GRB
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VMX53
+#  define machine_arch_type	MACH_TYPE_MX53GRB
 # endif
-# define machine_is_vmx53()	(machine_arch_type == MACH_TYPE_VMX53)
+# define machine_is_mx53grb()	(machine_arch_type == MACH_TYPE_MX53GRB)
 #else
-# define machine_is_vmx53()	(0)
+# define machine_is_mx53grb()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RHINO
+#ifdef CONFIG_MACH_GAGARIN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RHINO
+#  define machine_arch_type	MACH_TYPE_GAGARIN
 # endif
-# define machine_is_rhino()	(machine_arch_type == MACH_TYPE_RHINO)
+# define machine_is_gagarin()	(machine_arch_type == MACH_TYPE_GAGARIN)
 #else
-# define machine_is_rhino()	(0)
+# define machine_is_gagarin()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARMLEX4210
+#ifdef CONFIG_MACH_NAS2BIG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARMLEX4210
+#  define machine_arch_type	MACH_TYPE_NAS2BIG
 # endif
-# define machine_is_armlex4210()	(machine_arch_type == MACH_TYPE_ARMLEX4210)
+# define machine_is_nas2big()	(machine_arch_type == MACH_TYPE_NAS2BIG)
 #else
-# define machine_is_armlex4210()	(0)
+# define machine_is_nas2big()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SWARCOEXTMODEM
+#ifdef CONFIG_MACH_SUPERFEMTO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SWARCOEXTMODEM
+#  define machine_arch_type	MACH_TYPE_SUPERFEMTO
 # endif
-# define machine_is_swarcoextmodem()	(machine_arch_type == MACH_TYPE_SWARCOEXTMODEM)
+# define machine_is_superfemto()	(machine_arch_type == MACH_TYPE_SUPERFEMTO)
 #else
-# define machine_is_swarcoextmodem()	(0)
+# define machine_is_superfemto()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SNOWBALL
+#ifdef CONFIG_MACH_TEUFEL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SNOWBALL
+#  define machine_arch_type	MACH_TYPE_TEUFEL
 # endif
-# define machine_is_snowball()	(machine_arch_type == MACH_TYPE_SNOWBALL)
+# define machine_is_teufel()	(machine_arch_type == MACH_TYPE_TEUFEL)
 #else
-# define machine_is_snowball()	(0)
+# define machine_is_teufel()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PCM049
+#ifdef CONFIG_MACH_DINARA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PCM049
+#  define machine_arch_type	MACH_TYPE_DINARA
 # endif
-# define machine_is_pcm049()	(machine_arch_type == MACH_TYPE_PCM049)
+# define machine_is_dinara()	(machine_arch_type == MACH_TYPE_DINARA)
 #else
-# define machine_is_pcm049()	(0)
+# define machine_is_dinara()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VIGOR
+#ifdef CONFIG_MACH_VANQUISH
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VIGOR
+#  define machine_arch_type	MACH_TYPE_VANQUISH
 # endif
-# define machine_is_vigor()	(machine_arch_type == MACH_TYPE_VIGOR)
+# define machine_is_vanquish()	(machine_arch_type == MACH_TYPE_VANQUISH)
 #else
-# define machine_is_vigor()	(0)
+# define machine_is_vanquish()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OSLO_AMUNDSEN
+#ifdef CONFIG_MACH_ZIPABOX1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OSLO_AMUNDSEN
+#  define machine_arch_type	MACH_TYPE_ZIPABOX1
 # endif
-# define machine_is_oslo_amundsen()	(machine_arch_type == MACH_TYPE_OSLO_AMUNDSEN)
+# define machine_is_zipabox1()	(machine_arch_type == MACH_TYPE_ZIPABOX1)
 #else
-# define machine_is_oslo_amundsen()	(0)
+# define machine_is_zipabox1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GSL_DIAMOND
+#ifdef CONFIG_MACH_U9540
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GSL_DIAMOND
+#  define machine_arch_type	MACH_TYPE_U9540
 # endif
-# define machine_is_gsl_diamond()	(machine_arch_type == MACH_TYPE_GSL_DIAMOND)
+# define machine_is_u9540()	(machine_arch_type == MACH_TYPE_U9540)
 #else
-# define machine_is_gsl_diamond()	(0)
+# define machine_is_u9540()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CV2201
+#ifdef CONFIG_MACH_JET
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CV2201
+#  define machine_arch_type	MACH_TYPE_JET
 # endif
-# define machine_is_cv2201()	(machine_arch_type == MACH_TYPE_CV2201)
+# define machine_is_jet()	(machine_arch_type == MACH_TYPE_JET)
 #else
-# define machine_is_cv2201()	(0)
+# define machine_is_jet()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CV2202
+#ifdef CONFIG_MACH_SMDK4412
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CV2202
+#  define machine_arch_type	MACH_TYPE_SMDK4412
 # endif
-# define machine_is_cv2202()	(machine_arch_type == MACH_TYPE_CV2202)
+# define machine_is_smdk4412()	(machine_arch_type == MACH_TYPE_SMDK4412)
 #else
-# define machine_is_cv2202()	(0)
+# define machine_is_smdk4412()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CV2203
+#ifdef CONFIG_MACH_ELITE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CV2203
+#  define machine_arch_type	MACH_TYPE_ELITE
 # endif
-# define machine_is_cv2203()	(machine_arch_type == MACH_TYPE_CV2203)
+# define machine_is_elite()	(machine_arch_type == MACH_TYPE_ELITE)
 #else
-# define machine_is_cv2203()	(0)
+# define machine_is_elite()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VIT_IBOX
+#ifdef CONFIG_MACH_SPEAR320_HMI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VIT_IBOX
+#  define machine_arch_type	MACH_TYPE_SPEAR320_HMI
 # endif
-# define machine_is_vit_ibox()	(machine_arch_type == MACH_TYPE_VIT_IBOX)
+# define machine_is_spear320_hmi()	(machine_arch_type == MACH_TYPE_SPEAR320_HMI)
 #else
-# define machine_is_vit_ibox()	(0)
+# define machine_is_spear320_hmi()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DM6441_ESP
+#ifdef CONFIG_MACH_ONTARIO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DM6441_ESP
+#  define machine_arch_type	MACH_TYPE_ONTARIO
 # endif
-# define machine_is_dm6441_esp()	(machine_arch_type == MACH_TYPE_DM6441_ESP)
+# define machine_is_ontario()	(machine_arch_type == MACH_TYPE_ONTARIO)
 #else
-# define machine_is_dm6441_esp()	(0)
+# define machine_is_ontario()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AT91SAM9X5EK
+#ifdef CONFIG_MACH_MX6Q_SABRELITE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9X5EK
+#  define machine_arch_type	MACH_TYPE_MX6Q_SABRELITE
 # endif
-# define machine_is_at91sam9x5ek()	(machine_arch_type == MACH_TYPE_AT91SAM9X5EK)
+# define machine_is_mx6q_sabrelite()	(machine_arch_type == MACH_TYPE_MX6Q_SABRELITE)
 #else
-# define machine_is_at91sam9x5ek()	(0)
+# define machine_is_mx6q_sabrelite()	(0)
 #endif
 
-#ifdef CONFIG_MACH_LIBRA
+#ifdef CONFIG_MACH_VC200
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_LIBRA
+#  define machine_arch_type	MACH_TYPE_VC200
 # endif
-# define machine_is_libra()	(machine_arch_type == MACH_TYPE_LIBRA)
+# define machine_is_vc200()	(machine_arch_type == MACH_TYPE_VC200)
 #else
-# define machine_is_libra()	(0)
+# define machine_is_vc200()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EASYCRRH
+#ifdef CONFIG_MACH_MSM7625A_FFA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EASYCRRH
+#  define machine_arch_type	MACH_TYPE_MSM7625A_FFA
 # endif
-# define machine_is_easycrrh()	(machine_arch_type == MACH_TYPE_EASYCRRH)
+# define machine_is_msm7625a_ffa()	(machine_arch_type == MACH_TYPE_MSM7625A_FFA)
 #else
-# define machine_is_easycrrh()	(0)
+# define machine_is_msm7625a_ffa()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TRIPEL
+#ifdef CONFIG_MACH_MSM7625A_SURF
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TRIPEL
+#  define machine_arch_type	MACH_TYPE_MSM7625A_SURF
 # endif
-# define machine_is_tripel()	(machine_arch_type == MACH_TYPE_TRIPEL)
+# define machine_is_msm7625a_surf()	(machine_arch_type == MACH_TYPE_MSM7625A_SURF)
 #else
-# define machine_is_tripel()	(0)
+# define machine_is_msm7625a_surf()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ENDIAN_MINI
+#ifdef CONFIG_MACH_BENTHOSSBP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ENDIAN_MINI
+#  define machine_arch_type	MACH_TYPE_BENTHOSSBP
 # endif
-# define machine_is_endian_mini()	(machine_arch_type == MACH_TYPE_ENDIAN_MINI)
+# define machine_is_benthossbp()	(machine_arch_type == MACH_TYPE_BENTHOSSBP)
 #else
-# define machine_is_endian_mini()	(0)
+# define machine_is_benthossbp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_XILINX_EP107
+#ifdef CONFIG_MACH_SMDK5210
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_XILINX_EP107
+#  define machine_arch_type	MACH_TYPE_SMDK5210
 # endif
-# define machine_is_xilinx_ep107()	(machine_arch_type == MACH_TYPE_XILINX_EP107)
+# define machine_is_smdk5210()	(machine_arch_type == MACH_TYPE_SMDK5210)
 #else
-# define machine_is_xilinx_ep107()	(0)
+# define machine_is_smdk5210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NURI
+#ifdef CONFIG_MACH_EMPQ2300
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NURI
+#  define machine_arch_type	MACH_TYPE_EMPQ2300
 # endif
-# define machine_is_nuri()	(machine_arch_type == MACH_TYPE_NURI)
+# define machine_is_empq2300()	(machine_arch_type == MACH_TYPE_EMPQ2300)
 #else
-# define machine_is_nuri()	(0)
+# define machine_is_empq2300()	(0)
 #endif
 
-#ifdef CONFIG_MACH_JANUS
+#ifdef CONFIG_MACH_MINIPOS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_JANUS
+#  define machine_arch_type	MACH_TYPE_MINIPOS
 # endif
-# define machine_is_janus()	(machine_arch_type == MACH_TYPE_JANUS)
+# define machine_is_minipos()	(machine_arch_type == MACH_TYPE_MINIPOS)
 #else
-# define machine_is_janus()	(0)
+# define machine_is_minipos()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DDNAS
+#ifdef CONFIG_MACH_OMAP5_SEVM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DDNAS
+#  define machine_arch_type	MACH_TYPE_OMAP5_SEVM
 # endif
-# define machine_is_ddnas()	(machine_arch_type == MACH_TYPE_DDNAS)
+# define machine_is_omap5_sevm()	(machine_arch_type == MACH_TYPE_OMAP5_SEVM)
 #else
-# define machine_is_ddnas()	(0)
+# define machine_is_omap5_sevm()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TAG
+#ifdef CONFIG_MACH_SHELTER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TAG
+#  define machine_arch_type	MACH_TYPE_SHELTER
 # endif
-# define machine_is_tag()	(machine_arch_type == MACH_TYPE_TAG)
+# define machine_is_shelter()	(machine_arch_type == MACH_TYPE_SHELTER)
 #else
-# define machine_is_tag()	(0)
+# define machine_is_shelter()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TAGW
+#ifdef CONFIG_MACH_OMAP3_DEVKIT8500
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TAGW
+#  define machine_arch_type	MACH_TYPE_OMAP3_DEVKIT8500
 # endif
-# define machine_is_tagw()	(machine_arch_type == MACH_TYPE_TAGW)
+# define machine_is_omap3_devkit8500()	(machine_arch_type == MACH_TYPE_OMAP3_DEVKIT8500)
 #else
-# define machine_is_tagw()	(0)
+# define machine_is_omap3_devkit8500()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NITROGEN_VM_IMX51
+#ifdef CONFIG_MACH_EDGETD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NITROGEN_VM_IMX51
+#  define machine_arch_type	MACH_TYPE_EDGETD
 # endif
-# define machine_is_nitrogen_vm_imx51()	(machine_arch_type == MACH_TYPE_NITROGEN_VM_IMX51)
+# define machine_is_edgetd()	(machine_arch_type == MACH_TYPE_EDGETD)
 #else
-# define machine_is_nitrogen_vm_imx51()	(0)
+# define machine_is_edgetd()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VIPRINET
+#ifdef CONFIG_MACH_COPPERYARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VIPRINET
+#  define machine_arch_type	MACH_TYPE_COPPERYARD
 # endif
-# define machine_is_viprinet()	(machine_arch_type == MACH_TYPE_VIPRINET)
+# define machine_is_copperyard()	(machine_arch_type == MACH_TYPE_COPPERYARD)
 #else
-# define machine_is_viprinet()	(0)
+# define machine_is_copperyard()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BOCKW
+#ifdef CONFIG_MACH_EDGE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BOCKW
+#  define machine_arch_type	MACH_TYPE_EDGE
 # endif
-# define machine_is_bockw()	(machine_arch_type == MACH_TYPE_BOCKW)
+# define machine_is_edge()	(machine_arch_type == MACH_TYPE_EDGE)
 #else
-# define machine_is_bockw()	(0)
+# define machine_is_edge()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EVA2000
+#ifdef CONFIG_MACH_EDGE_U
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EVA2000
+#  define machine_arch_type	MACH_TYPE_EDGE_U
 # endif
-# define machine_is_eva2000()	(machine_arch_type == MACH_TYPE_EVA2000)
+# define machine_is_edge_u()	(machine_arch_type == MACH_TYPE_EDGE_U)
 #else
-# define machine_is_eva2000()	(0)
+# define machine_is_edge_u()	(0)
 #endif
 
-#ifdef CONFIG_MACH_STEELYARD
+#ifdef CONFIG_MACH_EDGE_TD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_STEELYARD
+#  define machine_arch_type	MACH_TYPE_EDGE_TD
 # endif
-# define machine_is_steelyard()	(machine_arch_type == MACH_TYPE_STEELYARD)
+# define machine_is_edge_td()	(machine_arch_type == MACH_TYPE_EDGE_TD)
 #else
-# define machine_is_steelyard()	(0)
+# define machine_is_edge_td()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MACH_SDH001
+#ifdef CONFIG_MACH_WDSS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MACH_SDH001
+#  define machine_arch_type	MACH_TYPE_WDSS
 # endif
-# define machine_is_sdh001()	(machine_arch_type == MACH_TYPE_MACH_SDH001)
+# define machine_is_wdss()	(machine_arch_type == MACH_TYPE_WDSS)
 #else
-# define machine_is_sdh001()	(0)
+# define machine_is_wdss()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NSSLSBOARD
+#ifdef CONFIG_MACH_DL_PB25
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NSSLSBOARD
+#  define machine_arch_type	MACH_TYPE_DL_PB25
 # endif
-# define machine_is_nsslsboard()	(machine_arch_type == MACH_TYPE_NSSLSBOARD)
+# define machine_is_dl_pb25()	(machine_arch_type == MACH_TYPE_DL_PB25)
 #else
-# define machine_is_nsslsboard()	(0)
+# define machine_is_dl_pb25()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GENEVA_B5
+#ifdef CONFIG_MACH_DSS11
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GENEVA_B5
+#  define machine_arch_type	MACH_TYPE_DSS11
 # endif
-# define machine_is_geneva_b5()	(machine_arch_type == MACH_TYPE_GENEVA_B5)
+# define machine_is_dss11()	(machine_arch_type == MACH_TYPE_DSS11)
 #else
-# define machine_is_geneva_b5()	(0)
+# define machine_is_dss11()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SPEAR1340
+#ifdef CONFIG_MACH_CPA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SPEAR1340
+#  define machine_arch_type	MACH_TYPE_CPA
 # endif
-# define machine_is_spear1340()	(machine_arch_type == MACH_TYPE_SPEAR1340)
+# define machine_is_cpa()	(machine_arch_type == MACH_TYPE_CPA)
 #else
-# define machine_is_spear1340()	(0)
+# define machine_is_cpa()	(0)
 #endif
 
-#ifdef CONFIG_MACH_REXMAS
+#ifdef CONFIG_MACH_APTP2000
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_REXMAS
+#  define machine_arch_type	MACH_TYPE_APTP2000
 # endif
-# define machine_is_rexmas()	(machine_arch_type == MACH_TYPE_REXMAS)
+# define machine_is_aptp2000()	(machine_arch_type == MACH_TYPE_APTP2000)
 #else
-# define machine_is_rexmas()	(0)
+# define machine_is_aptp2000()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8960_CDP
+#ifdef CONFIG_MACH_MARZEN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8960_CDP
+#  define machine_arch_type	MACH_TYPE_MARZEN
 # endif
-# define machine_is_msm8960_cdp()	(machine_arch_type == MACH_TYPE_MSM8960_CDP)
+# define machine_is_marzen()	(machine_arch_type == MACH_TYPE_MARZEN)
 #else
-# define machine_is_msm8960_cdp()	(0)
+# define machine_is_marzen()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8960_MDP
+#ifdef CONFIG_MACH_ST_TURBINE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8960_MDP
+#  define machine_arch_type	MACH_TYPE_ST_TURBINE
 # endif
-# define machine_is_msm8960_mdp()	(machine_arch_type == MACH_TYPE_MSM8960_MDP)
+# define machine_is_st_turbine()	(machine_arch_type == MACH_TYPE_ST_TURBINE)
 #else
-# define machine_is_msm8960_mdp()	(0)
+# define machine_is_st_turbine()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8960_FLUID
+#ifdef CONFIG_MACH_GTL_IT3300
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8960_FLUID
+#  define machine_arch_type	MACH_TYPE_GTL_IT3300
 # endif
-# define machine_is_msm8960_fluid()	(machine_arch_type == MACH_TYPE_MSM8960_FLUID)
+# define machine_is_gtl_it3300()	(machine_arch_type == MACH_TYPE_GTL_IT3300)
 #else
-# define machine_is_msm8960_fluid()	(0)
+# define machine_is_gtl_it3300()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MSM8960_APQ
+#ifdef CONFIG_MACH_MX6_MULE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MSM8960_APQ
+#  define machine_arch_type	MACH_TYPE_MX6_MULE
 # endif
-# define machine_is_msm8960_apq()	(machine_arch_type == MACH_TYPE_MSM8960_APQ)
+# define machine_is_mx6_mule()	(machine_arch_type == MACH_TYPE_MX6_MULE)
 #else
-# define machine_is_msm8960_apq()	(0)
+# define machine_is_mx6_mule()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HELIOS_V2
+#ifdef CONFIG_MACH_V7PXA_DT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HELIOS_V2
+#  define machine_arch_type	MACH_TYPE_V7PXA_DT
 # endif
-# define machine_is_helios_v2()	(machine_arch_type == MACH_TYPE_HELIOS_V2)
+# define machine_is_v7pxa_dt()	(machine_arch_type == MACH_TYPE_V7PXA_DT)
 #else
-# define machine_is_helios_v2()	(0)
+# define machine_is_v7pxa_dt()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MIF10P
+#ifdef CONFIG_MACH_V7MMP_DT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MIF10P
+#  define machine_arch_type	MACH_TYPE_V7MMP_DT
 # endif
-# define machine_is_mif10p()	(machine_arch_type == MACH_TYPE_MIF10P)
+# define machine_is_v7mmp_dt()	(machine_arch_type == MACH_TYPE_V7MMP_DT)
 #else
-# define machine_is_mif10p()	(0)
+# define machine_is_v7mmp_dt()	(0)
 #endif
 
-#ifdef CONFIG_MACH_IAM28
+#ifdef CONFIG_MACH_DRAGON7
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_IAM28
+#  define machine_arch_type	MACH_TYPE_DRAGON7
 # endif
-# define machine_is_iam28()	(machine_arch_type == MACH_TYPE_IAM28)
+# define machine_is_dragon7()	(machine_arch_type == MACH_TYPE_DRAGON7)
 #else
-# define machine_is_iam28()	(0)
+# define machine_is_dragon7()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PICASSO
+#ifdef CONFIG_MACH_KROME
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PICASSO
+#  define machine_arch_type	MACH_TYPE_KROME
 # endif
-# define machine_is_picasso()	(machine_arch_type == MACH_TYPE_PICASSO)
+# define machine_is_krome()	(machine_arch_type == MACH_TYPE_KROME)
 #else
-# define machine_is_picasso()	(0)
+# define machine_is_krome()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MR301A
+#ifdef CONFIG_MACH_ORATISDANTE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MR301A
+#  define machine_arch_type	MACH_TYPE_ORATISDANTE
 # endif
-# define machine_is_mr301a()	(machine_arch_type == MACH_TYPE_MR301A)
+# define machine_is_oratisdante()	(machine_arch_type == MACH_TYPE_ORATISDANTE)
 #else
-# define machine_is_mr301a()	(0)
+# define machine_is_oratisdante()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NOTLE
+#ifdef CONFIG_MACH_FATHOM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NOTLE
+#  define machine_arch_type	MACH_TYPE_FATHOM
 # endif
-# define machine_is_notle()	(machine_arch_type == MACH_TYPE_NOTLE)
+# define machine_is_fathom()	(machine_arch_type == MACH_TYPE_FATHOM)
 #else
-# define machine_is_notle()	(0)
+# define machine_is_fathom()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EELX2
+#ifdef CONFIG_MACH_DNS325
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EELX2
+#  define machine_arch_type	MACH_TYPE_DNS325
 # endif
-# define machine_is_eelx2()	(machine_arch_type == MACH_TYPE_EELX2)
+# define machine_is_dns325()	(machine_arch_type == MACH_TYPE_DNS325)
 #else
-# define machine_is_eelx2()	(0)
+# define machine_is_dns325()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MOON
+#ifdef CONFIG_MACH_SARNEN
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MOON
+#  define machine_arch_type	MACH_TYPE_SARNEN
 # endif
-# define machine_is_moon()	(machine_arch_type == MACH_TYPE_MOON)
+# define machine_is_sarnen()	(machine_arch_type == MACH_TYPE_SARNEN)
 #else
-# define machine_is_moon()	(0)
+# define machine_is_sarnen()	(0)
 #endif
 
-#ifdef CONFIG_MACH_RUBY
+#ifdef CONFIG_MACH_UBISYS_G1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_RUBY
+#  define machine_arch_type	MACH_TYPE_UBISYS_G1
 # endif
-# define machine_is_ruby()	(machine_arch_type == MACH_TYPE_RUBY)
+# define machine_is_ubisys_g1()	(machine_arch_type == MACH_TYPE_UBISYS_G1)
 #else
-# define machine_is_ruby()	(0)
+# define machine_is_ubisys_g1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GOLDENGATE
+#ifdef CONFIG_MACH_MX53_PF1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GOLDENGATE
+#  define machine_arch_type	MACH_TYPE_MX53_PF1
 # endif
-# define machine_is_goldengate()	(machine_arch_type == MACH_TYPE_GOLDENGATE)
+# define machine_is_mx53_pf1()	(machine_arch_type == MACH_TYPE_MX53_PF1)
 #else
-# define machine_is_goldengate()	(0)
+# define machine_is_mx53_pf1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CTBU_GEN2
+#ifdef CONFIG_MACH_ASANTI
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CTBU_GEN2
+#  define machine_arch_type	MACH_TYPE_ASANTI
 # endif
-# define machine_is_ctbu_gen2()	(machine_arch_type == MACH_TYPE_CTBU_GEN2)
+# define machine_is_asanti()	(machine_arch_type == MACH_TYPE_ASANTI)
 #else
-# define machine_is_ctbu_gen2()	(0)
+# define machine_is_asanti()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KMP_AM17_01
+#ifdef CONFIG_MACH_VOLTA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KMP_AM17_01
+#  define machine_arch_type	MACH_TYPE_VOLTA
 # endif
-# define machine_is_kmp_am17_01()	(machine_arch_type == MACH_TYPE_KMP_AM17_01)
+# define machine_is_volta()	(machine_arch_type == MACH_TYPE_VOLTA)
 #else
-# define machine_is_kmp_am17_01()	(0)
+# define machine_is_volta()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WTPLUG
+#ifdef CONFIG_MACH_KNIGHT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WTPLUG
+#  define machine_arch_type	MACH_TYPE_KNIGHT
 # endif
-# define machine_is_wtplug()	(machine_arch_type == MACH_TYPE_WTPLUG)
+# define machine_is_knight()	(machine_arch_type == MACH_TYPE_KNIGHT)
 #else
-# define machine_is_wtplug()	(0)
+# define machine_is_knight()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX27SU2
+#ifdef CONFIG_MACH_BEAGLEBONE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX27SU2
+#  define machine_arch_type	MACH_TYPE_BEAGLEBONE
 # endif
-# define machine_is_mx27su2()	(machine_arch_type == MACH_TYPE_MX27SU2)
+# define machine_is_beaglebone()	(machine_arch_type == MACH_TYPE_BEAGLEBONE)
 #else
-# define machine_is_mx27su2()	(0)
+# define machine_is_beaglebone()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NB31
+#ifdef CONFIG_MACH_BECKER
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NB31
+#  define machine_arch_type	MACH_TYPE_BECKER
 # endif
-# define machine_is_nb31()	(machine_arch_type == MACH_TYPE_NB31)
+# define machine_is_becker()	(machine_arch_type == MACH_TYPE_BECKER)
 #else
-# define machine_is_nb31()	(0)
+# define machine_is_becker()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HJSDU
+#ifdef CONFIG_MACH_FC360
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HJSDU
+#  define machine_arch_type	MACH_TYPE_FC360
 # endif
-# define machine_is_hjsdu()	(machine_arch_type == MACH_TYPE_HJSDU)
+# define machine_is_fc360()	(machine_arch_type == MACH_TYPE_FC360)
 #else
-# define machine_is_hjsdu()	(0)
+# define machine_is_fc360()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TD3_REV1
+#ifdef CONFIG_MACH_PMI2_XLS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TD3_REV1
+#  define machine_arch_type	MACH_TYPE_PMI2_XLS
 # endif
-# define machine_is_td3_rev1()	(machine_arch_type == MACH_TYPE_TD3_REV1)
+# define machine_is_pmi2_xls()	(machine_arch_type == MACH_TYPE_PMI2_XLS)
 #else
-# define machine_is_td3_rev1()	(0)
+# define machine_is_pmi2_xls()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EAG_CI4000
+#ifdef CONFIG_MACH_TARANTO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EAG_CI4000
+#  define machine_arch_type	MACH_TYPE_TARANTO
 # endif
-# define machine_is_eag_ci4000()	(machine_arch_type == MACH_TYPE_EAG_CI4000)
+# define machine_is_taranto()	(machine_arch_type == MACH_TYPE_TARANTO)
 #else
-# define machine_is_eag_ci4000()	(0)
+# define machine_is_taranto()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NET5BIG_NAND_V2
+#ifdef CONFIG_MACH_PLUTUX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NET5BIG_NAND_V2
+#  define machine_arch_type	MACH_TYPE_PLUTUX
 # endif
-# define machine_is_net5big_nand_v2()	(machine_arch_type == MACH_TYPE_NET5BIG_NAND_V2)
+# define machine_is_plutux()	(machine_arch_type == MACH_TYPE_PLUTUX)
 #else
-# define machine_is_net5big_nand_v2()	(0)
+# define machine_is_plutux()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CPX2
+#ifdef CONFIG_MACH_IPMP_MEDCOM
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CPX2
+#  define machine_arch_type	MACH_TYPE_IPMP_MEDCOM
 # endif
-# define machine_is_cpx2()	(machine_arch_type == MACH_TYPE_CPX2)
+# define machine_is_ipmp_medcom()	(machine_arch_type == MACH_TYPE_IPMP_MEDCOM)
 #else
-# define machine_is_cpx2()	(0)
+# define machine_is_ipmp_medcom()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NET2BIG_NAND_V2
+#ifdef CONFIG_MACH_ABSOLUT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NET2BIG_NAND_V2
+#  define machine_arch_type	MACH_TYPE_ABSOLUT
 # endif
-# define machine_is_net2big_nand_v2()	(machine_arch_type == MACH_TYPE_NET2BIG_NAND_V2)
+# define machine_is_absolut()	(machine_arch_type == MACH_TYPE_ABSOLUT)
 #else
-# define machine_is_net2big_nand_v2()	(0)
+# define machine_is_absolut()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ECUV5
+#ifdef CONFIG_MACH_AWPB3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ECUV5
+#  define machine_arch_type	MACH_TYPE_AWPB3
 # endif
-# define machine_is_ecuv5()	(machine_arch_type == MACH_TYPE_ECUV5)
+# define machine_is_awpb3()	(machine_arch_type == MACH_TYPE_AWPB3)
 #else
-# define machine_is_ecuv5()	(0)
+# define machine_is_awpb3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_HSGX6D
+#ifdef CONFIG_MACH_NFP32XX_DT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_HSGX6D
+#  define machine_arch_type	MACH_TYPE_NFP32XX_DT
 # endif
-# define machine_is_hsgx6d()	(machine_arch_type == MACH_TYPE_HSGX6D)
+# define machine_is_nfp32xx_dt()	(machine_arch_type == MACH_TYPE_NFP32XX_DT)
 #else
-# define machine_is_hsgx6d()	(0)
+# define machine_is_nfp32xx_dt()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DAWAD7
+#ifdef CONFIG_MACH_DL_PB53
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DAWAD7
+#  define machine_arch_type	MACH_TYPE_DL_PB53
 # endif
-# define machine_is_dawad7()	(machine_arch_type == MACH_TYPE_DAWAD7)
+# define machine_is_dl_pb53()	(machine_arch_type == MACH_TYPE_DL_PB53)
 #else
-# define machine_is_dawad7()	(0)
+# define machine_is_dl_pb53()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SAM9REPEATER
+#ifdef CONFIG_MACH_ACU_II
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SAM9REPEATER
+#  define machine_arch_type	MACH_TYPE_ACU_II
 # endif
-# define machine_is_sam9repeater()	(machine_arch_type == MACH_TYPE_SAM9REPEATER)
+# define machine_is_acu_ii()	(machine_arch_type == MACH_TYPE_ACU_II)
 #else
-# define machine_is_sam9repeater()	(0)
+# define machine_is_acu_ii()	(0)
 #endif
 
-#ifdef CONFIG_MACH_GT_I5700
+#ifdef CONFIG_MACH_AVALON
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_GT_I5700
+#  define machine_arch_type	MACH_TYPE_AVALON
 # endif
-# define machine_is_gt_i5700()	(machine_arch_type == MACH_TYPE_GT_I5700)
+# define machine_is_avalon()	(machine_arch_type == MACH_TYPE_AVALON)
 #else
-# define machine_is_gt_i5700()	(0)
+# define machine_is_avalon()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CTERA_PLUG_C2
+#ifdef CONFIG_MACH_SPHINX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CTERA_PLUG_C2
+#  define machine_arch_type	MACH_TYPE_SPHINX
 # endif
-# define machine_is_ctera_plug_c2()	(machine_arch_type == MACH_TYPE_CTERA_PLUG_C2)
+# define machine_is_sphinx()	(machine_arch_type == MACH_TYPE_SPHINX)
 #else
-# define machine_is_ctera_plug_c2()	(0)
+# define machine_is_sphinx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MARVELCT
+#ifdef CONFIG_MACH_TITAN_T
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MARVELCT
+#  define machine_arch_type	MACH_TYPE_TITAN_T
 # endif
-# define machine_is_marvelct()	(machine_arch_type == MACH_TYPE_MARVELCT)
+# define machine_is_titan_t()	(machine_arch_type == MACH_TYPE_TITAN_T)
 #else
-# define machine_is_marvelct()	(0)
+# define machine_is_titan_t()	(0)
 #endif
 
-#ifdef CONFIG_MACH_AG11005
+#ifdef CONFIG_MACH_HARVEST_BORIS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_AG11005
+#  define machine_arch_type	MACH_TYPE_HARVEST_BORIS
 # endif
-# define machine_is_ag11005()	(machine_arch_type == MACH_TYPE_AG11005)
+# define machine_is_harvest_boris()	(machine_arch_type == MACH_TYPE_HARVEST_BORIS)
 #else
-# define machine_is_ag11005()	(0)
+# define machine_is_harvest_boris()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VANGOGH
+#ifdef CONFIG_MACH_MACH_MSM7X30_M3S
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VANGOGH
+#  define machine_arch_type	MACH_TYPE_MACH_MSM7X30_M3S
 # endif
-# define machine_is_vangogh()	(machine_arch_type == MACH_TYPE_VANGOGH)
+# define machine_is_mach_msm7x30_m3s()	(machine_arch_type == MACH_TYPE_MACH_MSM7X30_M3S)
 #else
-# define machine_is_vangogh()	(0)
+# define machine_is_mach_msm7x30_m3s()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MATRIX505
+#ifdef CONFIG_MACH_SMDK5250
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MATRIX505
+#  define machine_arch_type	MACH_TYPE_SMDK5250
 # endif
-# define machine_is_matrix505()	(machine_arch_type == MACH_TYPE_MATRIX505)
+# define machine_is_smdk5250()	(machine_arch_type == MACH_TYPE_SMDK5250)
 #else
-# define machine_is_matrix505()	(0)
+# define machine_is_smdk5250()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OCE_NIGMA
+#ifdef CONFIG_MACH_IMXT_LITE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OCE_NIGMA
+#  define machine_arch_type	MACH_TYPE_IMXT_LITE
 # endif
-# define machine_is_oce_nigma()	(machine_arch_type == MACH_TYPE_OCE_NIGMA)
+# define machine_is_imxt_lite()	(machine_arch_type == MACH_TYPE_IMXT_LITE)
 #else
-# define machine_is_oce_nigma()	(0)
+# define machine_is_imxt_lite()	(0)
 #endif
 
-#ifdef CONFIG_MACH_T55
+#ifdef CONFIG_MACH_IMXT_STD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_T55
+#  define machine_arch_type	MACH_TYPE_IMXT_STD
 # endif
-# define machine_is_t55()	(machine_arch_type == MACH_TYPE_T55)
+# define machine_is_imxt_std()	(machine_arch_type == MACH_TYPE_IMXT_STD)
 #else
-# define machine_is_t55()	(0)
+# define machine_is_imxt_std()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BIO3K
+#ifdef CONFIG_MACH_IMXT_LOG
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BIO3K
+#  define machine_arch_type	MACH_TYPE_IMXT_LOG
 # endif
-# define machine_is_bio3k()	(machine_arch_type == MACH_TYPE_BIO3K)
+# define machine_is_imxt_log()	(machine_arch_type == MACH_TYPE_IMXT_LOG)
 #else
-# define machine_is_bio3k()	(0)
+# define machine_is_imxt_log()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EXPRESSCT
+#ifdef CONFIG_MACH_IMXT_NAV
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EXPRESSCT
+#  define machine_arch_type	MACH_TYPE_IMXT_NAV
 # endif
-# define machine_is_expressct()	(machine_arch_type == MACH_TYPE_EXPRESSCT)
+# define machine_is_imxt_nav()	(machine_arch_type == MACH_TYPE_IMXT_NAV)
 #else
-# define machine_is_expressct()	(0)
+# define machine_is_imxt_nav()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CARDHU
+#ifdef CONFIG_MACH_IMXT_FULL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CARDHU
+#  define machine_arch_type	MACH_TYPE_IMXT_FULL
 # endif
-# define machine_is_cardhu()	(machine_arch_type == MACH_TYPE_CARDHU)
+# define machine_is_imxt_full()	(machine_arch_type == MACH_TYPE_IMXT_FULL)
 #else
-# define machine_is_cardhu()	(0)
+# define machine_is_imxt_full()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARUBA
+#ifdef CONFIG_MACH_AG09015
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARUBA
+#  define machine_arch_type	MACH_TYPE_AG09015
 # endif
-# define machine_is_aruba()	(machine_arch_type == MACH_TYPE_ARUBA)
+# define machine_is_ag09015()	(machine_arch_type == MACH_TYPE_AG09015)
 #else
-# define machine_is_aruba()	(0)
+# define machine_is_ag09015()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BONAIRE
+#ifdef CONFIG_MACH_AM3517_MT_VENTOUX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BONAIRE
+#  define machine_arch_type	MACH_TYPE_AM3517_MT_VENTOUX
 # endif
-# define machine_is_bonaire()	(machine_arch_type == MACH_TYPE_BONAIRE)
+# define machine_is_am3517_mt_ventoux()	(machine_arch_type == MACH_TYPE_AM3517_MT_VENTOUX)
 #else
-# define machine_is_bonaire()	(0)
+# define machine_is_am3517_mt_ventoux()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NUC700EVB
+#ifdef CONFIG_MACH_DP1ARM9
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NUC700EVB
+#  define machine_arch_type	MACH_TYPE_DP1ARM9
 # endif
-# define machine_is_nuc700evb()	(machine_arch_type == MACH_TYPE_NUC700EVB)
+# define machine_is_dp1arm9()	(machine_arch_type == MACH_TYPE_DP1ARM9)
 #else
-# define machine_is_nuc700evb()	(0)
+# define machine_is_dp1arm9()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NUC710EVB
+#ifdef CONFIG_MACH_PICASSO_M
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NUC710EVB
+#  define machine_arch_type	MACH_TYPE_PICASSO_M
 # endif
-# define machine_is_nuc710evb()	(machine_arch_type == MACH_TYPE_NUC710EVB)
+# define machine_is_picasso_m()	(machine_arch_type == MACH_TYPE_PICASSO_M)
 #else
-# define machine_is_nuc710evb()	(0)
+# define machine_is_picasso_m()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NUC740EVB
+#ifdef CONFIG_MACH_VIDEO_GADGET
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NUC740EVB
+#  define machine_arch_type	MACH_TYPE_VIDEO_GADGET
 # endif
-# define machine_is_nuc740evb()	(machine_arch_type == MACH_TYPE_NUC740EVB)
+# define machine_is_video_gadget()	(machine_arch_type == MACH_TYPE_VIDEO_GADGET)
 #else
-# define machine_is_nuc740evb()	(0)
+# define machine_is_video_gadget()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NUC745EVB
+#ifdef CONFIG_MACH_MTT_OM3X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NUC745EVB
+#  define machine_arch_type	MACH_TYPE_MTT_OM3X
 # endif
-# define machine_is_nuc745evb()	(machine_arch_type == MACH_TYPE_NUC745EVB)
+# define machine_is_mtt_om3x()	(machine_arch_type == MACH_TYPE_MTT_OM3X)
 #else
-# define machine_is_nuc745evb()	(0)
+# define machine_is_mtt_om3x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TRANSCEDE
+#ifdef CONFIG_MACH_MX6Q_ARM2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TRANSCEDE
+#  define machine_arch_type	MACH_TYPE_MX6Q_ARM2
 # endif
-# define machine_is_transcede()	(machine_arch_type == MACH_TYPE_TRANSCEDE)
+# define machine_is_mx6q_arm2()	(machine_arch_type == MACH_TYPE_MX6Q_ARM2)
 #else
-# define machine_is_transcede()	(0)
+# define machine_is_mx6q_arm2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MORA
+#ifdef CONFIG_MACH_PICOSAM9G45
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MORA
+#  define machine_arch_type	MACH_TYPE_PICOSAM9G45
 # endif
-# define machine_is_mora()	(machine_arch_type == MACH_TYPE_MORA)
+# define machine_is_picosam9g45()	(machine_arch_type == MACH_TYPE_PICOSAM9G45)
 #else
-# define machine_is_mora()	(0)
+# define machine_is_picosam9g45()	(0)
 #endif
 
-#ifdef CONFIG_MACH_NDA_EVM
+#ifdef CONFIG_MACH_VPM_DM365
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_NDA_EVM
+#  define machine_arch_type	MACH_TYPE_VPM_DM365
 # endif
-# define machine_is_nda_evm()	(machine_arch_type == MACH_TYPE_NDA_EVM)
+# define machine_is_vpm_dm365()	(machine_arch_type == MACH_TYPE_VPM_DM365)
 #else
-# define machine_is_nda_evm()	(0)
+# define machine_is_vpm_dm365()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TIMU
+#ifdef CONFIG_MACH_BONFIRE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TIMU
+#  define machine_arch_type	MACH_TYPE_BONFIRE
 # endif
-# define machine_is_timu()	(machine_arch_type == MACH_TYPE_TIMU)
+# define machine_is_bonfire()	(machine_arch_type == MACH_TYPE_BONFIRE)
 #else
-# define machine_is_timu()	(0)
+# define machine_is_bonfire()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EXPRESSH
+#ifdef CONFIG_MACH_MT2P2D
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EXPRESSH
+#  define machine_arch_type	MACH_TYPE_MT2P2D
 # endif
-# define machine_is_expressh()	(machine_arch_type == MACH_TYPE_EXPRESSH)
+# define machine_is_mt2p2d()	(machine_arch_type == MACH_TYPE_MT2P2D)
 #else
-# define machine_is_expressh()	(0)
+# define machine_is_mt2p2d()	(0)
 #endif
 
-#ifdef CONFIG_MACH_VERIDIS_A300
+#ifdef CONFIG_MACH_SIGPDA01
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_VERIDIS_A300
+#  define machine_arch_type	MACH_TYPE_SIGPDA01
 # endif
-# define machine_is_veridis_a300()	(machine_arch_type == MACH_TYPE_VERIDIS_A300)
+# define machine_is_sigpda01()	(machine_arch_type == MACH_TYPE_SIGPDA01)
 #else
-# define machine_is_veridis_a300()	(0)
+# define machine_is_sigpda01()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DM368_LEOPARD
+#ifdef CONFIG_MACH_CN27
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DM368_LEOPARD
+#  define machine_arch_type	MACH_TYPE_CN27
 # endif
-# define machine_is_dm368_leopard()	(machine_arch_type == MACH_TYPE_DM368_LEOPARD)
+# define machine_is_cn27()	(machine_arch_type == MACH_TYPE_CN27)
 #else
-# define machine_is_dm368_leopard()	(0)
+# define machine_is_cn27()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP_MCOP
+#ifdef CONFIG_MACH_MX25_CWTAP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_OMAP_MCOP
+#  define machine_arch_type	MACH_TYPE_MX25_CWTAP
 # endif
-# define machine_is_omap_mcop()	(machine_arch_type == MACH_TYPE_OMAP_MCOP)
+# define machine_is_mx25_cwtap()	(machine_arch_type == MACH_TYPE_MX25_CWTAP)
 #else
-# define machine_is_omap_mcop()	(0)
+# define machine_is_mx25_cwtap()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TRITIP
+#ifdef CONFIG_MACH_APF28
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TRITIP
+#  define machine_arch_type	MACH_TYPE_APF28
 # endif
-# define machine_is_tritip()	(machine_arch_type == MACH_TYPE_TRITIP)
+# define machine_is_apf28()	(machine_arch_type == MACH_TYPE_APF28)
 #else
-# define machine_is_tritip()	(0)
+# define machine_is_apf28()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SM1K
+#ifdef CONFIG_MACH_PELCO_MAXWELL
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SM1K
+#  define machine_arch_type	MACH_TYPE_PELCO_MAXWELL
 # endif
-# define machine_is_sm1k()	(machine_arch_type == MACH_TYPE_SM1K)
+# define machine_is_pelco_maxwell()	(machine_arch_type == MACH_TYPE_PELCO_MAXWELL)
 #else
-# define machine_is_sm1k()	(0)
+# define machine_is_pelco_maxwell()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MONCH
+#ifdef CONFIG_MACH_GE_PHOENIX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MONCH
+#  define machine_arch_type	MACH_TYPE_GE_PHOENIX
 # endif
-# define machine_is_monch()	(machine_arch_type == MACH_TYPE_MONCH)
+# define machine_is_ge_phoenix()	(machine_arch_type == MACH_TYPE_GE_PHOENIX)
 #else
-# define machine_is_monch()	(0)
+# define machine_is_ge_phoenix()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CURACAO
+#ifdef CONFIG_MACH_EMPC_A500
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CURACAO
+#  define machine_arch_type	MACH_TYPE_EMPC_A500
 # endif
-# define machine_is_curacao()	(machine_arch_type == MACH_TYPE_CURACAO)
+# define machine_is_empc_a500()	(machine_arch_type == MACH_TYPE_EMPC_A500)
 #else
-# define machine_is_curacao()	(0)
+# define machine_is_empc_a500()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ORIGEN
+#ifdef CONFIG_MACH_IMS_ARM9
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ORIGEN
+#  define machine_arch_type	MACH_TYPE_IMS_ARM9
 # endif
-# define machine_is_origen()	(machine_arch_type == MACH_TYPE_ORIGEN)
+# define machine_is_ims_arm9()	(machine_arch_type == MACH_TYPE_IMS_ARM9)
 #else
-# define machine_is_origen()	(0)
+# define machine_is_ims_arm9()	(0)
 #endif
 
-#ifdef CONFIG_MACH_EPC10
+#ifdef CONFIG_MACH_MINI2416
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_EPC10
+#  define machine_arch_type	MACH_TYPE_MINI2416
 # endif
-# define machine_is_epc10()	(machine_arch_type == MACH_TYPE_EPC10)
+# define machine_is_mini2416()	(machine_arch_type == MACH_TYPE_MINI2416)
 #else
-# define machine_is_epc10()	(0)
+# define machine_is_mini2416()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SGH_I740
+#ifdef CONFIG_MACH_MINI2450
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SGH_I740
+#  define machine_arch_type	MACH_TYPE_MINI2450
 # endif
-# define machine_is_sgh_i740()	(machine_arch_type == MACH_TYPE_SGH_I740)
+# define machine_is_mini2450()	(machine_arch_type == MACH_TYPE_MINI2450)
 #else
-# define machine_is_sgh_i740()	(0)
+# define machine_is_mini2450()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TUNA
+#ifdef CONFIG_MACH_MINI310
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TUNA
+#  define machine_arch_type	MACH_TYPE_MINI310
 # endif
-# define machine_is_tuna()	(machine_arch_type == MACH_TYPE_TUNA)
+# define machine_is_mini310()	(machine_arch_type == MACH_TYPE_MINI310)
 #else
-# define machine_is_tuna()	(0)
+# define machine_is_mini310()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX51_TULIP
+#ifdef CONFIG_MACH_SPEAR_HURRICANE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX51_TULIP
+#  define machine_arch_type	MACH_TYPE_SPEAR_HURRICANE
 # endif
-# define machine_is_mx51_tulip()	(machine_arch_type == MACH_TYPE_MX51_TULIP)
+# define machine_is_spear_hurricane()	(machine_arch_type == MACH_TYPE_SPEAR_HURRICANE)
 #else
-# define machine_is_mx51_tulip()	(0)
+# define machine_is_spear_hurricane()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX51_ASTER7
+#ifdef CONFIG_MACH_MT7208
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX51_ASTER7
+#  define machine_arch_type	MACH_TYPE_MT7208
 # endif
-# define machine_is_mx51_aster7()	(machine_arch_type == MACH_TYPE_MX51_ASTER7)
+# define machine_is_mt7208()	(machine_arch_type == MACH_TYPE_MT7208)
 #else
-# define machine_is_mx51_aster7()	(0)
+# define machine_is_mt7208()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACRO37XBRD
+#ifdef CONFIG_MACH_LPC178X
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACRO37XBRD
+#  define machine_arch_type	MACH_TYPE_LPC178X
 # endif
-# define machine_is_acro37xbrd()	(machine_arch_type == MACH_TYPE_ACRO37XBRD)
+# define machine_is_lpc178x()	(machine_arch_type == MACH_TYPE_LPC178X)
 #else
-# define machine_is_acro37xbrd()	(0)
+# define machine_is_lpc178x()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ELKE
+#ifdef CONFIG_MACH_FARLEYS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ELKE
+#  define machine_arch_type	MACH_TYPE_FARLEYS
 # endif
-# define machine_is_elke()	(machine_arch_type == MACH_TYPE_ELKE)
+# define machine_is_farleys()	(machine_arch_type == MACH_TYPE_FARLEYS)
 #else
-# define machine_is_elke()	(0)
+# define machine_is_farleys()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SBC6000X
+#ifdef CONFIG_MACH_EFM32GG_DK3750
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SBC6000X
+#  define machine_arch_type	MACH_TYPE_EFM32GG_DK3750
 # endif
-# define machine_is_sbc6000x()	(machine_arch_type == MACH_TYPE_SBC6000X)
+# define machine_is_efm32gg_dk3750()	(machine_arch_type == MACH_TYPE_EFM32GG_DK3750)
 #else
-# define machine_is_sbc6000x()	(0)
+# define machine_is_efm32gg_dk3750()	(0)
 #endif
 
-#ifdef CONFIG_MACH_R1801E
+#ifdef CONFIG_MACH_ZEUS_BOARD
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_R1801E
+#  define machine_arch_type	MACH_TYPE_ZEUS_BOARD
 # endif
-# define machine_is_r1801e()	(machine_arch_type == MACH_TYPE_R1801E)
+# define machine_is_zeus_board()	(machine_arch_type == MACH_TYPE_ZEUS_BOARD)
 #else
-# define machine_is_r1801e()	(0)
+# define machine_is_zeus_board()	(0)
 #endif
 
-#ifdef CONFIG_MACH_H1600
+#ifdef CONFIG_MACH_CC51
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_H1600
+#  define machine_arch_type	MACH_TYPE_CC51
 # endif
-# define machine_is_h1600()	(machine_arch_type == MACH_TYPE_H1600)
+# define machine_is_cc51()	(machine_arch_type == MACH_TYPE_CC51)
 #else
-# define machine_is_h1600()	(0)
+# define machine_is_cc51()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MINI210
+#ifdef CONFIG_MACH_FXI_C210
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MINI210
+#  define machine_arch_type	MACH_TYPE_FXI_C210
 # endif
-# define machine_is_mini210()	(machine_arch_type == MACH_TYPE_MINI210)
+# define machine_is_fxi_c210()	(machine_arch_type == MACH_TYPE_FXI_C210)
 #else
-# define machine_is_mini210()	(0)
+# define machine_is_fxi_c210()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MINI8168
+#ifdef CONFIG_MACH_MSM8627_CDP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MINI8168
+#  define machine_arch_type	MACH_TYPE_MSM8627_CDP
 # endif
-# define machine_is_mini8168()	(machine_arch_type == MACH_TYPE_MINI8168)
+# define machine_is_msm8627_cdp()	(machine_arch_type == MACH_TYPE_MSM8627_CDP)
 #else
-# define machine_is_mini8168()	(0)
+# define machine_is_msm8627_cdp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PC7308
+#ifdef CONFIG_MACH_MSM8627_MTP
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PC7308
+#  define machine_arch_type	MACH_TYPE_MSM8627_MTP
 # endif
-# define machine_is_pc7308()	(machine_arch_type == MACH_TYPE_PC7308)
+# define machine_is_msm8627_mtp()	(machine_arch_type == MACH_TYPE_MSM8627_MTP)
 #else
-# define machine_is_pc7308()	(0)
+# define machine_is_msm8627_mtp()	(0)
 #endif
 
-#ifdef CONFIG_MACH_KMM2M01
+#ifdef CONFIG_MACH_ARMADILLO800EVA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_KMM2M01
+#  define machine_arch_type	MACH_TYPE_ARMADILLO800EVA
 # endif
-# define machine_is_kmm2m01()	(machine_arch_type == MACH_TYPE_KMM2M01)
+# define machine_is_armadillo800eva()	(machine_arch_type == MACH_TYPE_ARMADILLO800EVA)
 #else
-# define machine_is_kmm2m01()	(0)
+# define machine_is_armadillo800eva()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX51EREBUS
+#ifdef CONFIG_MACH_PRIMOU
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX51EREBUS
+#  define machine_arch_type	MACH_TYPE_PRIMOU
 # endif
-# define machine_is_mx51erebus()	(machine_arch_type == MACH_TYPE_MX51EREBUS)
+# define machine_is_primou()	(machine_arch_type == MACH_TYPE_PRIMOU)
 #else
-# define machine_is_mx51erebus()	(0)
+# define machine_is_primou()	(0)
 #endif
 
-#ifdef CONFIG_MACH_WM8650REFBOARD
+#ifdef CONFIG_MACH_PRIMOC
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_WM8650REFBOARD
+#  define machine_arch_type	MACH_TYPE_PRIMOC
 # endif
-# define machine_is_wm8650refboard()	(machine_arch_type == MACH_TYPE_WM8650REFBOARD)
+# define machine_is_primoc()	(machine_arch_type == MACH_TYPE_PRIMOC)
 #else
-# define machine_is_wm8650refboard()	(0)
+# define machine_is_primoc()	(0)
 #endif
 
-#ifdef CONFIG_MACH_TUXRAIL
+#ifdef CONFIG_MACH_PRIMOCT
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_TUXRAIL
+#  define machine_arch_type	MACH_TYPE_PRIMOCT
 # endif
-# define machine_is_tuxrail()	(machine_arch_type == MACH_TYPE_TUXRAIL)
+# define machine_is_primoct()	(machine_arch_type == MACH_TYPE_PRIMOCT)
 #else
-# define machine_is_tuxrail()	(0)
+# define machine_is_primoct()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ARTHUR
+#ifdef CONFIG_MACH_A9500
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ARTHUR
+#  define machine_arch_type	MACH_TYPE_A9500
 # endif
-# define machine_is_arthur()	(machine_arch_type == MACH_TYPE_ARTHUR)
+# define machine_is_a9500()	(machine_arch_type == MACH_TYPE_A9500)
 #else
-# define machine_is_arthur()	(0)
+# define machine_is_a9500()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DOORBOY
+#ifdef CONFIG_MACH_PLUTO
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DOORBOY
+#  define machine_arch_type	MACH_TYPE_PLUTO
 # endif
-# define machine_is_doorboy()	(machine_arch_type == MACH_TYPE_DOORBOY)
+# define machine_is_pluto()	(machine_arch_type == MACH_TYPE_PLUTO)
 #else
-# define machine_is_doorboy()	(0)
+# define machine_is_pluto()	(0)
 #endif
 
-#ifdef CONFIG_MACH_XARINA
+#ifdef CONFIG_MACH_ACFX100
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_XARINA
+#  define machine_arch_type	MACH_TYPE_ACFX100
 # endif
-# define machine_is_xarina()	(machine_arch_type == MACH_TYPE_XARINA)
+# define machine_is_acfx100()	(machine_arch_type == MACH_TYPE_ACFX100)
 #else
-# define machine_is_xarina()	(0)
+# define machine_is_acfx100()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ROVERX7
+#ifdef CONFIG_MACH_MSM8625_RUMI3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ROVERX7
+#  define machine_arch_type	MACH_TYPE_MSM8625_RUMI3
 # endif
-# define machine_is_roverx7()	(machine_arch_type == MACH_TYPE_ROVERX7)
+# define machine_is_msm8625_rumi3()	(machine_arch_type == MACH_TYPE_MSM8625_RUMI3)
 #else
-# define machine_is_roverx7()	(0)
+# define machine_is_msm8625_rumi3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SDVR
+#ifdef CONFIG_MACH_VALENTE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SDVR
+#  define machine_arch_type	MACH_TYPE_VALENTE
 # endif
-# define machine_is_sdvr()	(machine_arch_type == MACH_TYPE_SDVR)
+# define machine_is_valente()	(machine_arch_type == MACH_TYPE_VALENTE)
 #else
-# define machine_is_sdvr()	(0)
+# define machine_is_valente()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACER_MAYA
+#ifdef CONFIG_MACH_CRFS_RFEYE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACER_MAYA
+#  define machine_arch_type	MACH_TYPE_CRFS_RFEYE
 # endif
-# define machine_is_acer_maya()	(machine_arch_type == MACH_TYPE_ACER_MAYA)
+# define machine_is_crfs_rfeye()	(machine_arch_type == MACH_TYPE_CRFS_RFEYE)
 #else
-# define machine_is_acer_maya()	(0)
+# define machine_is_crfs_rfeye()	(0)
 #endif
 
-#ifdef CONFIG_MACH_PICO
+#ifdef CONFIG_MACH_RFEYE
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_PICO
+#  define machine_arch_type	MACH_TYPE_RFEYE
 # endif
-# define machine_is_pico()	(machine_arch_type == MACH_TYPE_PICO)
+# define machine_is_rfeye()	(machine_arch_type == MACH_TYPE_RFEYE)
 #else
-# define machine_is_pico()	(0)
+# define machine_is_rfeye()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CWMX233
+#ifdef CONFIG_MACH_PHIDGET_SBC3
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CWMX233
+#  define machine_arch_type	MACH_TYPE_PHIDGET_SBC3
 # endif
-# define machine_is_cwmx233()	(machine_arch_type == MACH_TYPE_CWMX233)
+# define machine_is_phidget_sbc3()	(machine_arch_type == MACH_TYPE_PHIDGET_SBC3)
 #else
-# define machine_is_cwmx233()	(0)
+# define machine_is_phidget_sbc3()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CWAM1808
+#ifdef CONFIG_MACH_TCW_MIKA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CWAM1808
+#  define machine_arch_type	MACH_TYPE_TCW_MIKA
 # endif
-# define machine_is_cwam1808()	(machine_arch_type == MACH_TYPE_CWAM1808)
+# define machine_is_tcw_mika()	(machine_arch_type == MACH_TYPE_TCW_MIKA)
 #else
-# define machine_is_cwam1808()	(0)
+# define machine_is_tcw_mika()	(0)
 #endif
 
-#ifdef CONFIG_MACH_CWDM365
+#ifdef CONFIG_MACH_IMX28_EGF
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_CWDM365
+#  define machine_arch_type	MACH_TYPE_IMX28_EGF
 # endif
-# define machine_is_cwdm365()	(machine_arch_type == MACH_TYPE_CWDM365)
+# define machine_is_imx28_egf()	(machine_arch_type == MACH_TYPE_IMX28_EGF)
 #else
-# define machine_is_cwdm365()	(0)
+# define machine_is_imx28_egf()	(0)
 #endif
 
-#ifdef CONFIG_MACH_MX51_MORAY
+#ifdef CONFIG_MACH_VALENTE_WX
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_MX51_MORAY
+#  define machine_arch_type	MACH_TYPE_VALENTE_WX
 # endif
-# define machine_is_mx51_moray()	(machine_arch_type == MACH_TYPE_MX51_MORAY)
+# define machine_is_valente_wx()	(machine_arch_type == MACH_TYPE_VALENTE_WX)
 #else
-# define machine_is_mx51_moray()	(0)
+# define machine_is_valente_wx()	(0)
 #endif
 
-#ifdef CONFIG_MACH_THALES_CBC
+#ifdef CONFIG_MACH_HUANGSHANS
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_THALES_CBC
+#  define machine_arch_type	MACH_TYPE_HUANGSHANS
 # endif
-# define machine_is_thales_cbc()	(machine_arch_type == MACH_TYPE_THALES_CBC)
+# define machine_is_huangshans()	(machine_arch_type == MACH_TYPE_HUANGSHANS)
 #else
-# define machine_is_thales_cbc()	(0)
+# define machine_is_huangshans()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BLUEPOINT
+#ifdef CONFIG_MACH_BOSPHORUS1
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BLUEPOINT
+#  define machine_arch_type	MACH_TYPE_BOSPHORUS1
 # endif
-# define machine_is_bluepoint()	(machine_arch_type == MACH_TYPE_BLUEPOINT)
+# define machine_is_bosphorus1()	(machine_arch_type == MACH_TYPE_BOSPHORUS1)
 #else
-# define machine_is_bluepoint()	(0)
+# define machine_is_bosphorus1()	(0)
 #endif
 
-#ifdef CONFIG_MACH_DIR665
+#ifdef CONFIG_MACH_PRIMA
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_DIR665
+#  define machine_arch_type	MACH_TYPE_PRIMA
 # endif
-# define machine_is_dir665()	(machine_arch_type == MACH_TYPE_DIR665)
+# define machine_is_prima()	(machine_arch_type == MACH_TYPE_PRIMA)
 #else
-# define machine_is_dir665()	(0)
+# define machine_is_prima()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ACMEROVER1
+#ifdef CONFIG_MACH_EVITA_ULK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ACMEROVER1
+#  define machine_arch_type	MACH_TYPE_EVITA_ULK
 # endif
-# define machine_is_acmerover1()	(machine_arch_type == MACH_TYPE_ACMEROVER1)
+# define machine_is_evita_ulk()	(machine_arch_type == MACH_TYPE_EVITA_ULK)
 #else
-# define machine_is_acmerover1()	(0)
+# define machine_is_evita_ulk()	(0)
 #endif
 
-#ifdef CONFIG_MACH_SHOOTER_CT
+#ifdef CONFIG_MACH_MERISC600
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_SHOOTER_CT
+#  define machine_arch_type	MACH_TYPE_MERISC600
 # endif
-# define machine_is_shooter_ct()	(machine_arch_type == MACH_TYPE_SHOOTER_CT)
+# define machine_is_merisc600()	(machine_arch_type == MACH_TYPE_MERISC600)
 #else
-# define machine_is_shooter_ct()	(0)
+# define machine_is_merisc600()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BLISS
+#ifdef CONFIG_MACH_DOLAK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BLISS
+#  define machine_arch_type	MACH_TYPE_DOLAK
 # endif
-# define machine_is_bliss()	(machine_arch_type == MACH_TYPE_BLISS)
+# define machine_is_dolak()	(machine_arch_type == MACH_TYPE_DOLAK)
 #else
-# define machine_is_bliss()	(0)
+# define machine_is_dolak()	(0)
 #endif
 
-#ifdef CONFIG_MACH_BLISSC
+#ifdef CONFIG_MACH_SBC53
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_BLISSC
+#  define machine_arch_type	MACH_TYPE_SBC53
 # endif
-# define machine_is_blissc()	(machine_arch_type == MACH_TYPE_BLISSC)
+# define machine_is_sbc53()	(machine_arch_type == MACH_TYPE_SBC53)
 #else
-# define machine_is_blissc()	(0)
+# define machine_is_sbc53()	(0)
 #endif
 
-#ifdef CONFIG_MACH_THALES_ADC
+#ifdef CONFIG_MACH_ELITE_ULK
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_THALES_ADC
+#  define machine_arch_type	MACH_TYPE_ELITE_ULK
 # endif
-# define machine_is_thales_adc()	(machine_arch_type == MACH_TYPE_THALES_ADC)
+# define machine_is_elite_ulk()	(machine_arch_type == MACH_TYPE_ELITE_ULK)
 #else
-# define machine_is_thales_adc()	(0)
+# define machine_is_elite_ulk()	(0)
 #endif
 
-#ifdef CONFIG_MACH_UBISYS_P9D_EVP
+#ifdef CONFIG_MACH_POV2
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_UBISYS_P9D_EVP
+#  define machine_arch_type	MACH_TYPE_POV2
 # endif
-# define machine_is_ubisys_p9d_evp()	(machine_arch_type == MACH_TYPE_UBISYS_P9D_EVP)
+# define machine_is_pov2()	(machine_arch_type == MACH_TYPE_POV2)
 #else
-# define machine_is_ubisys_p9d_evp()	(0)
+# define machine_is_pov2()	(0)
 #endif
 
-#ifdef CONFIG_MACH_ATDGP318
+#ifdef CONFIG_MACH_IPOD_TOUCH_2G
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type	MACH_TYPE_ATDGP318
+#  define machine_arch_type	MACH_TYPE_IPOD_TOUCH_2G
 # endif
-# define machine_is_atdgp318()	(machine_arch_type == MACH_TYPE_ATDGP318)
+# define machine_is_ipod_touch_2g()	(machine_arch_type == MACH_TYPE_IPOD_TOUCH_2G)
 #else
-# define machine_is_atdgp318()	(0)
+# define machine_is_ipod_touch_2g()	(0)
 #endif
 
-#ifdef CONFIG_MACH_OMAP5_SEVM
+#ifdef CONFIG_MACH_DA850_PQAB
 # ifdef machine_arch_type
 #  undef machine_arch_type
-#  define machine_arch_type     __machine_arch_type
+#  define machine_arch_type	__machine_arch_type
 # else
-#  define machine_arch_type     MACH_TYPE_OMAP5_SEVM
+#  define machine_arch_type	MACH_TYPE_DA850_PQAB
 # endif
-# define machine_is_omap5_sevm()      (machine_arch_type == MACH_TYPE_OMAP5_SEVM)
+# define machine_is_da850_pqab()	(machine_arch_type == MACH_TYPE_DA850_PQAB)
 #else
-# define machine_is_omap5_sevm()      (0)
+# define machine_is_da850_pqab()	(0)
 #endif
 
 /*
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 6683b3e..c57c25a 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -30,8 +30,7 @@ 
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (8 * 1024))
 #define CONFIG_SYS_PROMPT		"U-Boot# "
 #define CONFIG_SYS_NO_FLASH
-#define MACH_TYPE_TIAM335EVM		3589	/* Until the next sync */
-#define CONFIG_MACH_TYPE		MACH_TYPE_TIAM335EVM
+#define CONFIG_MACH_TYPE		MACH_TYPE_AM335XEVM
 
 #define CONFIG_CMD_ASKENV
 #define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 6b68f10..bcf8b8f 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -28,7 +28,6 @@ 
  * Board
  */
 #define CONFIG_DRIVER_TI_EMAC
-#define MACH_TYPE_CALIMAIN	3528
 #define CONFIG_MACH_TYPE	MACH_TYPE_CALIMAIN
 
 /*
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index b7a89d3..4ab7b86 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -32,7 +32,6 @@ 
 /*
  * Machine number definition
  */
-#define MACH_TYPE_DNS325		3800
 #define CONFIG_MACH_TYPE		MACH_TYPE_DNS325
 #define CONFIG_IDENT_STRING		"\nD-Link DNS-325"
 
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 0f2f9a2..e63e818 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -29,19 +29,6 @@ 
 #define _CONFIG_DREAMPLUG_H
 
 /*
- * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
- * from Linus' kernel.org tree.  This hasn't been updated primarily due to
- * the recent arch/arm reshuffling.  So, in the meantime, we'll place it
- * here.
- */
-#include <asm/mach-types.h>
-#ifdef MACH_TYPE_DREAMPLUG
-#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this."
-#else
-#define MACH_TYPE_DREAMPLUG            3550
-#endif
-
-/*
  * Version number information
  */
 #define CONFIG_IDENT_STRING	"\nMarvell-DreamPlug"
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index b4610d9..da49ae8 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -24,6 +24,18 @@ 
 #define __CONFIG_H
 
 /*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_EA20
+#error "MACH_TYPE_EA20 has been defined properly, please remove this."
+#else
+#define MACH_TYPE_EA20		3002
+#endif
+
+
+/*
  * Board
  */
 #define CONFIG_DRIVER_TI_EMAC
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 29b0d33..8fa3185 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -53,7 +53,6 @@ 
 #define CONFIG_DA8XX_GPIO
 #define CONFIG_HOSTNAME		enbw_cmc
 
-#define MACH_TYPE_ENBW_CMC	3585
 #define CONFIG_MACH_TYPE	MACH_TYPE_ENBW_CMC
 
 /*
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 649e272..a1ac87a 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -37,11 +37,6 @@ 
 
 #define CONFIG_DISPLAY_CPUINFO
 
-/* Only in case the value is not present in mach-types.h */
-#ifndef MACH_TYPE_FLEA3
-#define MACH_TYPE_FLEA3                3668
-#endif
-
 #define CONFIG_MACH_TYPE		MACH_TYPE_FLEA3
 
 /* Set TEXT at the beginning of the NOR flash */
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 9813309..04fe1c3 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -32,16 +32,6 @@ 
 #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"
@@ -52,7 +42,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_TYPE		MACH_TYPE_SHEEVAD /* Machine type */
+#define CONFIG_MACH_TYPE		MACH_TYPE_GPLUGD /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
 #define	CONFIG_SYS_TEXT_BASE	0x00f00000
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 4d59153..b035767 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -29,11 +29,6 @@ 
 #define	CONFIG_MXS_GPIO				/* GPIO control */
 #define	CONFIG_SYS_HZ		1000		/* Ticks per second */
 
-/*
- * Define M28EVK machine type by hand until it lands in mach-types
- */
-#define	MACH_TYPE_M28EVK	3613
-
 #define	CONFIG_MACH_TYPE	MACH_TYPE_M28EVK
 
 #define	CONFIG_SYS_NO_FLASH
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 1315c3c..96a43ef 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -28,7 +28,6 @@ 
 #define CONFIG_OMAP34XX			/* which is a 34XX */
 #define CONFIG_OMAP3_MCX		/* working with mcx */
 
-#define MACH_TYPE_MCX			3656
 #define CONFIG_MACH_TYPE	MACH_TYPE_MCX
 
 #define CONFIG_SYS_CACHELINE_SIZE	64
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 2034b59..c3ecaf8 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -24,7 +24,6 @@ 
 
 #include "tam3517-common.h"
 
-#define MACH_TYPE_AM3517_MT_VENTOUX	3832
 #define CONFIG_MACH_TYPE	MACH_TYPE_AM3517_MT_VENTOUX
 
 #define CONFIG_BOOTDELAY	10
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index b819d21..79ef97b 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -32,6 +32,17 @@ 
 #define __CONFIG_H
 
 /*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_MVBLX
+#error "MACH_TYPE_MVBLX has been defined properly, please remove this."
+#else
+#define MACH_TYPE_MVBLX		3097
+#endif
+
+/*
  * High Level Configuration Options
  */
 #define CONFIG_ARMV7		1	/* This is an ARM V7 CPU core */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 261f952..8589b1d 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -45,6 +45,13 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
+/*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#define machine_is_ventana()	(0)
+
+
 /* SPI */
 #define CONFIG_TEGRA2_SPI
 #define CONFIG_SPI_FLASH
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 9659f9e..f20633c 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -51,8 +51,6 @@ 
 #define CONFIG_INITRD_TAG
 #define CONFIG_CMDLINE_EDITING
 
-/* MACH_TYPE_SMDK5250 macro will be removed once added to mach-types */
-#define MACH_TYPE_SMDK5250		3774
 #define CONFIG_MACH_TYPE		MACH_TYPE_SMDK5250
 
 /* Power Down Modes */
diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index 2c66f33..d311e50 100644
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -38,6 +38,17 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_TOP9000
+#error "MACH_TYPE_TOP9000 has been defined properly, please remove this."
+#else
+#define MACH_TYPE_TOP9000		3024
+#endif
+
 /* SoC must be defined first, before hardware.h is included */
 #define CONFIG_AT91SAM9XE
 #include <asm/hardware.h>
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index ba8847b..31df1fa 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -32,6 +32,17 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_TRICORDER
+#error "MACH_TYPE_TRICORDER has been defined properly, please remove this."
+#else
+#define MACH_TYPE_TRICORDER		3042
+#endif
+
 /* High Level Configuration Options */
 #define CONFIG_OMAP			/* in a TI OMAP core */
 #define CONFIG_OMAP34XX			/* which is a 34XX */
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 87bd8a6..0d24039 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -34,10 +34,6 @@ 
 /* NAND BOOT is the only boot method */
 #define CONFIG_NAND_U_BOOT
 
-#ifndef MACH_TYPE_TX25
-#define MACH_TYPE_TX25	2177
-#endif
-
 #define CONFIG_MACH_TYPE MACH_TYPE_TX25
 
 #ifdef CONFIG_NAND_SPL
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index b5caebb..8e8a8e3 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -25,6 +25,21 @@ 
 #define __CONFIG_H
 
 #define CONFIG_MACH_VENTANA
+/*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_VENTANA
+#error "MACH_TYPE_VENTANA has been defined properly, please remove this."
+#else
+#define MACH_TYPE_VENTANA		2927
+#ifdef CONFIG_MACH_VENTANA
+# define machine_is_ventana()	(MACH_TYPE_VENTANA == MACH_TYPE_VENTANA)
+#else
+# define machine_is_ventana()	(0)
+#endif
+#endif
 
 #include <asm/sizes.h>
 #include "tegra2-common.h"
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 599d5bb..071c582 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -26,6 +26,17 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * FIXME: This belongs in mach-types.h.  However, we only pull mach-types
+ * from Linus' kernel.org tree.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_ZMX25
+#error "MACH_TYPE_ZMX25 has been defined properly, please remove this."
+#else
+#define MACH_TYPE_ZMX25		3113
+#endif
+
 #define CONFIG_ARM926EJS			/* arm926ejs CPU core */
 #define CONFIG_MX25
 #define CONFIG_MX25_CLK32		32768	/* OSC32K frequency */