On Sat, Jul 22, 2006 at 09:05:07PM +0200, Wolfgang Denk wrote:
In message 20050915084918.GB8576@orphique you wrote:
- VoiceBlue update: use new MTD flash partitioning methods, use more reasonable TEXT_BASE, update default environment and enable keyed autoboot.
Sorry, this does not apply cleanly (any more). Can you please check and re-submit those parts that are still needed? Thanks.
Hi Wolfgang,
most of this patch went already in. Only minor part (done here also for NetStar board) is missing, which could be found in following patch, which also does minor whitespace cleanup.
Signed-off-by: Ladislav Michl ladis@linux-mips.org
CHANGELOG * Use MACH_TYPE_NETSTAR and MACH_TYPE_VOICEBLUE defines instead of numbers in code.
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;