diff options
| author | wdenk <wdenk> | 2004-07-11 22:19:26 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-07-11 22:19:26 +0000 |
| commit | a1f4a3dd0592ef982017a50a7cfe749823114203 (patch) | |
| tree | 5cb47632f587600559b20ad5ca644e1867fc9f2c /board | |
| parent | b9283e2dbedae4492ec0efdf683d51a00566a477 (diff) | |
| download | u-boot-imx-a1f4a3dd0592ef982017a50a7cfe749823114203.zip u-boot-imx-a1f4a3dd0592ef982017a50a7cfe749823114203.tar.gz u-boot-imx-a1f4a3dd0592ef982017a50a7cfe749823114203.tar.bz2 | |
* Patch by George G. Davis, 06 Jul 2004:
- update mach-types.h to latest arm.linux.org.uk master list
- Set correct OMAP1610 bi_arch_number for build target
* Patch by Curt Brune, 06 Jul 2004:
evb4510: add support for timer interrupt; cleanup
Diffstat (limited to 'board')
| -rw-r--r-- | board/evb4510/evb4510.c | 29 | ||||
| -rw-r--r-- | board/omap1610inn/omap1610innovator.c | 10 |
2 files changed, 11 insertions, 28 deletions
diff --git a/board/evb4510/evb4510.c b/board/evb4510/evb4510.c index 72d1f4e..0008e5a 100644 --- a/board/evb4510/evb4510.c +++ b/board/evb4510/evb4510.c @@ -25,13 +25,9 @@ #include <asm/hardware.h> #include <command.h> -/* ------------------------------------------------------------------------- */ - +#ifdef CONFIG_EVB4510 -#define PUT_LED(val) (PUT_REG(REG_IOPDATA, (~val)&0xFF)) -#define GET_LED() ((~GET_REG( REG_IOPDATA)) & 0xFF) -#define SET_LED(val) { u32 led = GET_LED(); led |= 1 << (val); PUT_LED( led); } -#define CLR_LED(val) { u32 led = GET_LED(); led &= ~(1 << (val)); PUT_LED( led); } +/* ------------------------------------------------------------------------- */ /* * Miscelaneous platform dependent initialisations @@ -51,25 +47,6 @@ int board_init (void) PUT_REG( REG_IOPMODE, 0xFFFF); PUT_REG( REG_IOPDATA, 0xFF); - /* enable LED 7 to show we're alive */ - SET_LED( 7); - - /* configure free running timer 1 */ - /* Stop timer 1 */ - CLR_REG( REG_TMOD, TM1_RUN); - - /* Configure for toggle mode */ - SET_REG( REG_TMOD, TM1_TOGGLE); - - /* Load Timer data register with count down value */ - PUT_REG( REG_TDATA1, 0xFFFFFFFF); - - /* Clear timer counter register */ - PUT_REG( REG_TCNT1, 0x0); - - /* Start timer -- count down timer */ - SET_REG( REG_TMOD, TM1_RUN); - return 0; } @@ -84,3 +61,5 @@ int dram_init (void) #endif return 0; } + +#endif diff --git a/board/omap1610inn/omap1610innovator.c b/board/omap1610inn/omap1610innovator.c index 2072dce..57f1e89 100644 --- a/board/omap1610inn/omap1610innovator.c +++ b/board/omap1610inn/omap1610innovator.c @@ -32,6 +32,7 @@ */ #include <common.h> +#include <asm/mach-types.h> #if defined(CONFIG_OMAP1610) #include <./configs/omap1510.h> #endif @@ -62,9 +63,12 @@ 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; |