-
-#if defined(CONFIG_SA1100_GRAPHICSCLIENT) && !defined(CONFIG_ANGELBOOT)
- mov r7, #MACH_TYPE_GRAPHICSCLIENT
- mov r8, #0
-#endif
-#if defined(CONFIG_SA1100_GRAPHICSMASTER) && !defined(CONFIG_ANGELBOOT)
- mov r7, #MACH_TYPE_GRAPHICSMASTER
- mov r8, #0
-#endif
-#if defined(CONFIG_SA1100_ADSBITSY) && !defined(CONFIG_ANGELBOOT)
- mov r7, #MACH_TYPE_ADSBITSY
- mov r8, #0
-#endif
-
-#ifdef CONFIG_SA1100_PFS168
- @ REVISIT_PFS168: Temporary until firmware updated to use assigned machine number
- mov r7, #MACH_TYPE_PFS168
+#ifdef CONFIG_SA1100_COLLIE
+ mov r7, #MACH_TYPE_COLLIE