1 << ATMEL_ID_PIOC,
                &pmc->pcer);
 
-       /* arch number of PM9261-Board */
-       gd->bd->bi_arch_number = MACH_TYPE_PM9261;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 
                (1 << ATMEL_ID_PIOB),
                &pmc->pcer);
 
-       /* arch number of AT91SAM9263EK-Board */
-       gd->bd->bi_arch_number = MACH_TYPE_PM9263;
-
        /* adress of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 
                (1 << ATMEL_ID_PIOC) |
                (1 << ATMEL_ID_PIODE), &pmc->pcer);
 
-       /* arch number of AT91SAM9M10G45EK-Board */
-       gd->bd->bi_arch_number = MACH_TYPE_PM9G45;
        /* adress of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
 #define CONFIG_SYS_TEXT_BASE   0
 
+#define MACH_TYPE_PM9261       1187
+#define CONFIG_MACH_TYPE       MACH_TYPE_PM9261
+
 /* clocks */
 /* CKGR_MOR - enable main osc. */
 #define CONFIG_SYS_MOR_VAL                                             \
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
 #define CONFIG_SYS_TEXT_BASE   0
 
+#define MACH_TYPE_PM9263       1475
+#define CONFIG_MACH_TYPE       MACH_TYPE_PM9263
+
 /* clocks */
 #define CONFIG_SYS_MOR_VAL                                             \
                (AT91_PMC_MOR_MOSCEN |                                  \
 
 #define CONFIG_PM9G45          1       /* It's an Ronetix PM9G45 */
 #define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9G45"
 
+#define MACH_TYPE_PM9G45       2672
+#define CONFIG_MACH_TYPE       MACH_TYPE_PM9G45
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_MAIN_CLOCK     12000000 /* from 12 MHz crystal */
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */