diff --git a/board/netstar/netstar.c b/board/netstar/netstar.c
index d6b620c8ce455eeaf10bcd5519ff6db9258cb576..f52afe50c7e3add8bc3ea0c6f68df56e9df8e481 100644
--- a/board/netstar/netstar.c
+++ b/board/netstar/netstar.c
@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int board_init(void)
 {
 	/* arch number of NetStar board */
-	gd->bd->bi_arch_number = 692;
+	gd->bd->bi_arch_number = MACH_TYPE_NETSTAR;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x10000100;
diff --git a/board/voiceblue/voiceblue.c b/board/voiceblue/voiceblue.c
index 04093d172c6bf83f3294e1245fd6cdc95bdfa1e7..c8dde3651e62db79f99469a97748ac866920a5f8 100644
--- a/board/voiceblue/voiceblue.c
+++ b/board/voiceblue/voiceblue.c
@@ -28,8 +28,7 @@ int board_init(void)
 	*((volatile unsigned char *) VOICEBLUE_LED_REG) = 0xaa;
 
 	/* arch number of VoiceBlue board */
-	/* TODO: use define from asm/mach-types.h */
-	gd->bd->bi_arch_number = 218;
+	gd->bd->bi_arch_number = MACH_TYPE_VOICEBLUE;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x10000100;
@@ -41,8 +40,8 @@ int dram_init(void)
 {
 	*((volatile unsigned short *) VOICEBLUE_LED_REG) = 0xff;
 
- 	/* Take the Ethernet controller out of reset and wait
- 	 * for the EEPROM load to complete. */
+	/* Take the Ethernet controller out of reset and wait
+	 * for the EEPROM load to complete. */
 	*((volatile unsigned short *) GPIO_DATA_OUTPUT_REG) |= 0x80;
 	udelay(10);	/* doesn't work before interrupt_init call */
 	*((volatile unsigned short *) GPIO_DATA_OUTPUT_REG) &= ~0x80;