Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group

[u-boot] / board / omap1610inn / omap1610innovator.c

diff --git a/board/omap1610inn/omap1610innovator.c b/board/omap1610inn/omap1610innovator.c
index 2072dce56b64698cd1266234157b5cd98cd2c655..8dbe686a8913214bfc0d7b9fa8602d0f51b72b6e 100644 (file)
--- a/board/omap1610inn/omap1610innovator.c
+++ b/board/omap1610inn/omap1610innovator.c
@@ -36,6 +36,8 @@
 #include <./configs/omap1510.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CONFIG_CS_AUTOBOOT
 unsigned long omap_flash_base;
 #endif
@@ -60,11 +62,12 @@ static inline void delay (unsigned long loops)
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       /* arch number of OMAP 1510-Board */
-       /* to be changed for OMAP 1610 Board */
-       gd->bd->bi_arch_number = 234;
+       if (machine_is_omap_h2())
+               gd->bd->bi_arch_number = MACH_TYPE_OMAP_H2;
+       else if (machine_is_omap_innovator())
+               gd->bd->bi_arch_number = MACH_TYPE_OMAP_INNOVATOR;
+       else
+               gd->bd->bi_arch_number = MACH_TYPE_OMAP_GENERIC;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x10000100;
@@ -150,8 +153,6 @@ void ether__init (void)
 ******************************/
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;