diff options
-rw-r--r-- | drivers/smiLynxEM.c | 13 | ||||
-rw-r--r-- | include/configs/hmi1001.h | 7 |
2 files changed, 15 insertions, 5 deletions
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 */ /*---------------------------------------------------------------------*/ |