diff options
| author | Wolfgang Denk <wd@denx.de> | 2006-10-29 01:12:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-10-29 01:12:53 +0200 |
| commit | d9831893ab2efd3dd36f948da898c83f33c4992c (patch) | |
| tree | 9456126b6bf9d0664bc3f55057e603615cab728e /board | |
| parent | 1954be6e9c9421b45d0a9d05b10356acc7563150 (diff) | |
| parent | fae684e89844856383bdf101440889557df3e6b1 (diff) | |
| download | u-boot-imx-d9831893ab2efd3dd36f948da898c83f33c4992c.zip u-boot-imx-d9831893ab2efd3dd36f948da898c83f33c4992c.tar.gz u-boot-imx-d9831893ab2efd3dd36f948da898c83f33c4992c.tar.bz2 | |
Merge with /home/sr/git/u-boot/nand-ladis
Diffstat (limited to 'board')
| -rw-r--r-- | board/netstar/netstar.c | 2 | ||||
| -rw-r--r-- | board/voiceblue/voiceblue.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/board/netstar/netstar.c b/board/netstar/netstar.c index d6b620c..f52afe5 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 04093d1..c8dde36 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; |