gplugd: use CONFIG_MACH_TYPE instead of MACH_TYPE_SHEEVAD

PATCH New Troy Kisky 5 participants 14 messages Mar 1, 2012 – Mar 3, 2012 1 message not in the archive Arm (32-bit)

lore

Share & tools

lore

Troy Kisky

author

2012-03-01 21:13 UTC #0 lore raw

PATCH 1/3 gplugd: use CONFIG_MACH_TYPE instead of MACH_TYPE_SHEEVAD

mach-type update will rename MACH_TYPE_SHEEVAD to
MACH_TYPE_GPLUGD

Signed-off-by Troy Kisky <[email protected]>

---
 board/Marvell/gplugd/gplugd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

board/Marvell/gplugd/gplugd.c +1 -1

index a697c19..8d9916a 100644
@@ -92,7 +92,7 @@ int board_init(void)
 		(struct armd1apb2_registers *)ARMD1_APBC2_BASE;
 
 	/* arch number of Board */
-	gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD;
+	gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100;
 	/* Assert PHY_RST# */

Signature · 1 line

1.7.5.4

Troy Kisky

author

2012-03-01 21:13 UTC #1 lore raw

PATCH 2/3 ventana: define CONFIG_MACH_VENTANA

ventana uses board/nvidia/seaboard/seaboard.c
which uses machine_is_ventana.

Signed-off-by Troy Kisky <[email protected]>

---
 include/configs/ventana.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

include/configs/ventana.h +2 -0

index acc9b43..b5caebb 100644
@@ -24,6 +24,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_MACH_VENTANA
+
 #include <asm/sizes.h>
 #include "tegra2-common.h"

Signature · 1 line

1.7.5.4

Stephen Warren

2012-03-01 21:30 UTC #2 lore raw

PATCH 2/3 ventana: define CONFIG_MACH_VENTANA

include/configs/ventana.h line 27

Quoted 6 lines · Troy Kisky

ventana uses board/nvidia/seaboard/seaboard.c
which uses machine_is_ventana.
include/configs/ventana.h +1 -0
 
+#define CONFIG_MACH_VENTANA

It'd be nice not to have to do this; that header already does:

#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA

Can't the code key off that? Otherwise, any use of machine_is_xxx() will be very error-prone, since CONFIG_MACH_XXX has to be manually defined, and people will forget.

Signature · 1 line

nvpublic

A message that is not in the archive (sent off-list or not yet received): [email protected]

Stephen Warren

2012-03-02 01:44 UTC #4 lore raw

PATCH 2/3 ventana: define CONFIG_MACH_VENTANA

Quoted 29 lines · Troy Kisky

Quoted 7 lines · Stephen Warren
include/configs/ventana.h line 27
Quoted 4 lines · Troy Kisky
ventana uses board/nvidia/seaboard/seaboard.c
which uses machine_is_ventana.
include/configs/ventana.h +1 -0
+#define CONFIG_MACH_VENTANA
It'd be nice not to have to do this; that header already does:
Quoted 6 lines
#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA
Can't the code key off that? Otherwise, any use of machine_is_xxx() will be very error-prone, since CONFIG_MACH_XXX has to be manually defined, and people will forget.
Before patch 3/3 mach-types.h has
#ifdef CONFIG_MACH_VENTANA
# ifdef machine_arch_type
#  undef machine_arch_type
#  define machine_arch_type    __machine_arch_type
# else
#  define machine_arch_type    MACH_TYPE_VENTANA
# endif
# define machine_is_ventana()  (machine_arch_type == MACH_TYPE_VENTANA)
#else
# define machine_is_ventana()  (0)
#endif

Quoted 1 line

So, it wants CONFIG_MACH_VENTANA defined.

Yes, there's certainly a pre-existing bug that needs to be fixed.

My point is that every board already needs to set CONFIG_MACH_TYPE to the relevant type. It's quite unexpected that boards will /also/ need to set e.g. CONFIG_MACH_VENTANA on top of that if they need to call machine_is_xxx(). That is exactly why this bug exists for Ventana and needs to be fixed.

So, rather than forcing this unusual requirement on boards, isn't it possible to fix mach-types.h to use CONFIG_MACH_TYPE rather than CONFIG_MACH_${machine_name}? It's probably not too hard to run some kind of script over mach-types.h when importing it from the kernel, or instead of importing the generated mach-types.h, import the source data file and write a U-Boot-specific script that generates mach-types.h in a format more suitable for U-Boot.

Signature · 1 line

nvpublic

Troy Kisky

author

2012-03-01 21:13 UTC #5 lore raw

PATCH 3/3 ARM: Update mach-types

In reply to Troy Kisky

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 <[email protected]>

---
 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(-)

arch/arm/include/asm/mach-types.h +3609 ~~-2881~~

index 2d5c3bc..a7db956 100644
@@ -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
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

include/configs/am335x_evm.h +1 -2

index 6683b3e..c57c25a 100644

Lines of this file are not shown. View the raw message.

include/configs/calimain.h +0 -1

index 6b68f10..bcf8b8f 100644

Lines of this file are not shown. View the raw message.

include/configs/dns325.h +0 -1

index b7a89d3..4ab7b86 100644

Lines of this file are not shown. View the raw message.

include/configs/dreamplug.h +0 ~~-13~~

index 0f2f9a2..e63e818 100644

Lines of this file are not shown. View the raw message.

include/configs/ea20.h +12 -0

index b4610d9..da49ae8 100644

Lines of this file are not shown. View the raw message.

include/configs/enbw_cmc.h +0 -1

index 29b0d33..8fa3185 100644

Lines of this file are not shown. View the raw message.

include/configs/flea3.h +0 -5

index 649e272..a1ac87a 100644

Lines of this file are not shown. View the raw message.

include/configs/gplugd.h +1 ~~-11~~

index 9813309..04fe1c3 100644

Lines of this file are not shown. View the raw message.

include/configs/m28evk.h +0 -5

index 4d59153..b035767 100644

Lines of this file are not shown. View the raw message.

include/configs/mcx.h +0 -1

index 1315c3c..96a43ef 100644

Lines of this file are not shown. View the raw message.

include/configs/mt_ventoux.h +0 -1

index 2034b59..c3ecaf8 100644

Lines of this file are not shown. View the raw message.

include/configs/omap3_mvblx.h +11 -0

index b819d21..79ef97b 100644

Lines of this file are not shown. View the raw message.

include/configs/seaboard.h +7 -0

index 261f952..8589b1d 100644

Lines of this file are not shown. View the raw message.

include/configs/smdk5250.h +0 -2

index 9659f9e..f20633c 100644

Lines of this file are not shown. View the raw message.

include/configs/top9000.h +11 -0

index 2c66f33..d311e50 100644

Lines of this file are not shown. View the raw message.

include/configs/tricorder.h +11 -0

index ba8847b..31df1fa 100644

Lines of this file are not shown. View the raw message.

include/configs/tx25.h +0 -4

index 87bd8a6..0d24039 100644

Lines of this file are not shown. View the raw message.

include/configs/ventana.h +15 -0

index b5caebb..8e8a8e3 100644

Lines of this file are not shown. View the raw message.

include/configs/zmx25.h +11 -0

index 599d5bb..071c582 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.7.5.4

Part of the diff is not shown here. View the raw message.

Stephen Warren

2012-03-01 21:32 UTC #6 lore raw

PATCH 3/3 ARM: Update mach-types

Quoted 11 lines · Troy Kisky

This updates u-boot to the same as the Dec 6, 2011 mach-types upate to Linux.
include/configs/ventana.h +5 -0
 
 #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>

include/configs/ventana.h line 42

Quoted 10 lines

include/configs/ventana.h +10 -0

+#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.

Signature · 1 line

nvpublic

Albert ARIBAUD

2012-03-01 21:54 UTC #7 lore raw

PATCH 3/3 ARM: Update mach-types

In reply to Troy Kisky

Hi Troy,

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

Quoted 10 lines

include/configs/ea20.h +2 -0

index b4610d9..da49ae8 100644
@@ -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/configs/ea20.h line 38

Quoted 10 lines

include/configs/ea20.h +10 -0

+ */
+#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.

include/configs/seaboard.h line 52

Quoted 13 lines

include/configs/seaboard.h +5 -0

index 261f952..8589b1d 100644
@@ -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,

Signature · 1 line

Albert.

Troy Kisky

author

2012-03-01 22:50 UTC #8 lore raw

PATCH 3/3 ARM: Update mach-types

Quoted 20 lines · Albert ARIBAUD

Hi Troy,
Le 01/03/2012 22:13, Troy Kisky a ?crit :
Quoted 16 lines
include/configs/ea20.h +1 -0
index b4610d9..da49ae8 100644
@@ -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/configs/ea20.h +4 -0
+#include<asm/mach-types.h>
+#ifdef MACH_TYPE_EA20
+#error "MACH_TYPE_EA20 has been defined properly, please remove this."
+#else

Quoted 8 lines

include/configs/ea20.h line 38
Quoted 5 lines
include/configs/ea20.h +5 -0
+#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."

Quoted 19 lines

Quoted 11 lines
include/configs/seaboard.h +2 -0
index 261f952..8589b1d 100644
@@ -45,6 +45,13 @@
 
  #define CONFIG_BOARD_EARLY_INIT_F
 
+/*
+ * FIXME: This belongs in mach-types.h.  However, we only pull 
Quoted 4 lines
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?

Quoted 1 line

Amicalement,

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

Thanks
Troy

Wolfgang Denk

2012-03-02 07:00 UTC #9 lore raw

PATCH 3/3 ARM: Update mach-types

Dear Troy Kisky,

Quoted 9 lines · In message <[email protected]> you wrote:

Quoted 5 lines
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

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Heavier than air flying machines are impossible.
                    -- Lord Kelvin, President, Royal Society, c. 1895

Stephen Warren

2012-03-02 17:45 UTC #10 lore raw

PATCH 3/3 ARM: Update mach-types

Quoted 7 lines · Wolfgang Denk

Dear Troy Kisky,
Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 4 lines
Not sure I understand why we have a "machine_ix_xxx()" here. Could you > explain?

Quoted 7 lines

Quoted 5 lines
Quoted 1 line
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.

Signature · 1 line

nvpublic

Troy Kisky

author

2012-03-02 19:37 UTC #11 lore raw

PATCH 3/3 ARM: Update mach-types

Quoted 20 lines · Stephen Warren

Quoted 11 lines · Wolfgang Denk
Dear Troy Kisky,
Quoted 7 lines · In message<[email protected]> you wrote:
Quoted 4 lines
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:

Quoted 8 lines

#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

2012-03-02 20:08 UTC #12 lore raw

PATCH 3/3 ARM: Update mach-types

Quoted 32 lines · Troy Kisky

Quoted 20 lines · Stephen Warren
Quoted 11 lines · Wolfgang Denk
Dear Troy Kisky,
Quoted 7 lines · In message<[email protected]> you wrote:
Quoted 4 lines
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:
Quoted 8 lines
#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

Quoted 7 lines

#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.

Signature · 1 line

nvpublic

Troy Kisky

author

2012-03-02 21:07 UTC #13 lore raw

PATCH 3/3 ARM: Update mach-types

In reply to Troy Kisky

Quoted 30 lines · Troy Kisky

Quoted 20 lines · Albert ARIBAUD
Hi Troy,
Le 01/03/2012 22:13, Troy Kisky a ?crit :
Quoted 16 lines
include/configs/ea20.h +1 -0
index b4610d9..da49ae8 100644
@@ -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/configs/ea20.h +4 -0
+#include<asm/mach-types.h>
+#ifdef MACH_TYPE_EA20
+#error "MACH_TYPE_EA20 has been defined properly, please remove this."
+#else
Quoted 8 lines
include/configs/ea20.h line 38
Quoted 5 lines
include/configs/ea20.h +5 -0
+#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.

Quoted 2 lines

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

Stefano Babic

2012-03-03 10:15 UTC #14 lore raw

PATCH 1/3 gplugd: use CONFIG_MACH_TYPE instead of MACH_TYPE_SHEEVAD

In reply to Troy Kisky

Quoted 13 lines · Troy Kisky

mach-type update will rename MACH_TYPE_SHEEVAD to
MACH_TYPE_GPLUGD
Signed-off-by Troy Kisky <[email protected]>
---
 board/Marvell/gplugd/gplugd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/Marvell/gplugd/gplugd.c +0 -0
index a697c19..8d9916a 100644

board/Marvell/gplugd/gplugd.c int board_init(void) · line 95

Quoted 5 lines

board/Marvell/gplugd/gplugd.c +1 -1

@@ -92,7 +92,7 @@ int board_init(void)
 		(struct armd1apb2_registers *)ARMD1_APBC2_BASE;
 
 	/* arch number of Board */
-	gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD;
+	gd->bd->bi_arch_number = CONFIG_MACH_TYPE;

You do not need it to add this line. This is already done in common code when CONFIG_MACH_TYPE is set.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================