[U-Boot] [PATCH 2/3] arm: omap: innovator: Prepare for mach-types.h changes

Igor Grinberg
2011-05-01T10:10:31Z

This board used machine_is_* macros for identifying the arch number.
Use compile time defines instead.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Nishant Kamat <nskamat@ti.com>
Cc: Kshitij Gupta <kshitij@ti.com>
---
This has been compile tested after the 1/3 patch is applied.

board/ti/omap1610inn/omap1610innovator.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/board/ti/omap1610inn/omap1610innovator.c b/board/ti/omap1610inn/omap1610innovator.c
index 44818bb..01b9f53 100644
--- a/board/ti/omap1610inn/omap1610innovator.c
+++ b/board/ti/omap1610inn/omap1610innovator.c
@@ -63,12 +63,13 @@ static inline void delay (unsigned long loops)

int board_init (void)
{
- 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;
+#if defined(CONFIG_MACH_OMAP_H2)
+ gd->bd->bi_arch_number = MACH_TYPE_OMAP_H2;
+#elif defined(CONFIG_MACH_OMAP_INNOVATOR)
+ gd->bd->bi_arch_number = MACH_TYPE_OMAP_INNOVATOR;
+#else
+ gd->bd->bi_arch_number = MACH_TYPE_OMAP_GENERIC;
+#endif

/* adress of boot parameters */
gd->bd->bi_boot_params = 0x10000100;
--
1.7.3.4