diff options
| -rw-r--r-- | CHANGELOG | 9 | ||||
| -rw-r--r-- | board/hmi1001/hmi1001.c | 7 | ||||
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 6 | ||||
| -rw-r--r-- | drivers/smiLynxEM.c | 13 | ||||
| -rw-r--r-- | include/configs/hmi1001.h | 7 |
5 files changed, 28 insertions, 14 deletions
@@ -3,10 +3,15 @@ Changes for U-Boot 1.1.4: ====================================================================== * Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT). - Removed CFG_CMD_DISPLAY from default commands. - Fixed compiler warning in net.c. Patch by Stefan Roese, 31 Aug 2005 +* Fix default command set (don't include CFG_CMD_DISPLAY command) + Patch by Pantelis Antoniou, 02 Sep 2005 + +* Cleanup + +* Enable SM712 driver support for HMI1001 board. + * Fix problems with ld version 2.16 (dot outside sections problem) Pointed out by Gerhard Jaeger, 31 Aug 2005; cf. http://sourceware.org/ml/binutils/2005-08/msg00412.html diff --git a/board/hmi1001/hmi1001.c b/board/hmi1001/hmi1001.c index 6b1fbfd..237e863 100644 --- a/board/hmi1001/hmi1001.c +++ b/board/hmi1001/hmi1001.c @@ -30,6 +30,7 @@ #include <common.h> #include <mpc5xxx.h> #include <pci.h> +#include <malloc.h> #ifndef CFG_RAMBOOT static void sdram_start (int hi_addr) @@ -178,7 +179,7 @@ struct kbd_data_t* get_keys (struct kbd_data_t *kbd_data) return kbd_data; } -static int compare_magic (struct kbd_data_t *kbd_data, uchar *str) +static int compare_magic (const struct kbd_data_t *kbd_data, uchar *str) { char s1 = str[0]; char s2; @@ -261,10 +262,6 @@ static uchar *key_match (const struct kbd_data_t *kbd_data) #endif /* CONFIG_PREBOOT */ -int misc_init_f (void) -{ -} - int misc_init_r (void) { #ifdef CONFIG_PREBOOT diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 2be4ca7..c3d30a0 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -291,7 +291,8 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) /* * Set Rx FIFO alarm and granularity value */ - fec->eth->rfifo_cntrl = 0x0c000000; + fec->eth->rfifo_cntrl = 0x0c000000 + | (fec->eth->rfifo_cntrl & ~0x0f000000); fec->eth->rfifo_alarm = 0x0000030c; #if (DEBUG & 0x22) if (fec->eth->rfifo_status & 0x00700000 ) { @@ -302,7 +303,8 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) /* * Set Tx FIFO granularity value */ - fec->eth->tfifo_cntrl = 0x0c000000; + fec->eth->tfifo_cntrl = 0x0c000000 + | (fec->eth->tfifo_cntrl & ~0x0f000000); #if (DEBUG & 0x2) printf("tfifo_status: 0x%08x\n", fec->eth->tfifo_status); printf("tfifo_alarm: 0x%08x\n", fec->eth->tfifo_alarm); diff --git a/drivers/smiLynxEM.c b/drivers/smiLynxEM.c index 94092a3..a87aaf3 100644 --- a/drivers/smiLynxEM.c +++ b/drivers/smiLynxEM.c @@ -129,7 +129,7 @@ static char SMI_SCR[] = { }; static char SMI_EXT_CRT[] = { 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, - 0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00 + 0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00, }; static char SMI_ATTR [] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, @@ -139,21 +139,24 @@ static char SMI_ATTR [] = { }; static char SMI_GCR[18] = { 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x40, - 0x06, 0x05, 0x07, 0x0f, 0x08, 0xff + 0x06, 0x05, 0x07, 0x0f, 0x08, 0xff, }; static char SMI_SEQR[] = { - 0x00, 0x00, 0x01, 0x01, 0x02, 0x0f, 0x03, 0x03, 0x04, 0x0e, 0x00, 0x03 + 0x00, 0x00, 0x01, 0x01, 0x02, 0x0f, 0x03, 0x03, 0x04, 0x0e, 0x00, 0x03, }; static char SMI_PCR [] = { - 0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00 + 0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, }; static char SMI_MCR[] = { 0x60, 0x01, 0x61, 0x00, +#ifdef CONFIG_HMI1001 + 0x62, 0x74, /* Memory type is not configured by pins on HMI1001 */ +#endif }; static char SMI_HCR[] = { 0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, - 0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 + 0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00, }; diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 22b8766..a69a304 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -314,6 +314,11 @@ #define CONFIG_ATAPI 1 +#define CONFIG_VIDEO_SMI_LYNXEM +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_VIDEO_LOGO + /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory @@ -331,6 +336,8 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0x01000000 +#define CFG_ISA_IO CONFIG_PCI_IO_BUS + /*---------------------------------------------------------------------*/ /* Display addresses */ /*---------------------------------------------------------------------*/ |