summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-09-23 02:50:50 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-09-30 22:01:05 +0200
commit9ba24f17b290d1a20475125f5e04b0d9ba74a1a1 (patch)
tree28a76ba657e477d60a37fdca02686f4e8e42a745
parent5a9361c267b47ac3d38378bb9d77afaf6ae1981e (diff)
downloadblackbird-obmc-uboot-9ba24f17b290d1a20475125f5e04b0d9ba74a1a1.tar.gz
blackbird-obmc-uboot-9ba24f17b290d1a20475125f5e04b0d9ba74a1a1.zip
zmx25: Place machine ID into board config
Let common code set the machine ID. Cc: Matthias Weisser <weisserm@arcor.de> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
-rw-r--r--board/syteco/zmx25/zmx25.c2
-rw-r--r--include/configs/zmx25.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index a49d8314eb..a89ee1a086 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -117,8 +117,6 @@ int board_init()
writel(input_select1, &inputselect->i2c3_ipp_sda_in); /* I2C3 SDA */
writel(input_select2, &inputselect->i2c3_ipp_scl_in); /* I2C3 SCL */
- /* board id for linux */
- gd->bd->bi_arch_number = MACH_TYPE_ZMX25;
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
return 0;
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 374c88a0f4..ab7f30f1e8 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -32,6 +32,7 @@
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_TEXT_BASE 0xA0000000
+#define CONFIG_MACH_TYPE MACH_TYPE_ZMX25
/*
* Environment settings
*/
OpenPOWER on IntegriCloud