From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Jin Date: Fri, 13 Jul 2007 12:15:01 +0800 Subject: [U-Boot-Users] [PATCH 7/7] Made MAI board to use BIOS emulator in drivers directory In-Reply-To: <11843001023893-git-send-email-Jason.jin@freescale.com> References: <11843001012380-git-send-email-Jason.jin@freescale.com> <11843001022297-git-send-email-Jason.jin@freescale.com> <11843001023893-git-send-email-Jason.jin@freescale.com> Message-ID: <11843001034179-git-send-email-Jason.jin@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The BIOS emulator in the MAI board was removed, this patch made the MAI board use the BIOS emulator in the drivers directory. Signed-off-by: Jason Jin --- board/MAI/AmigaOneG3SE/articiaS_pci.c | 17 ++++------------- include/configs/AmigaOneG3SE.h | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/board/MAI/AmigaOneG3SE/articiaS_pci.c b/board/MAI/AmigaOneG3SE/articiaS_pci.c index 45b8195..8333e6e 100644 --- a/board/MAI/AmigaOneG3SE/articiaS_pci.c +++ b/board/MAI/AmigaOneG3SE/articiaS_pci.c @@ -489,7 +489,7 @@ static short classes[] = ~0 }; -extern int execute_bios(pci_dev_t gr_dev, void *); +/*extern int execute_bios(pci_dev_t gr_dev, void *);*/ pci_dev_t video_dev; @@ -555,20 +555,11 @@ int articiaS_init_vga (void) /* * Now try to run the bios */ +#if defined(CONFIG_BIOSEMU) PRINTF("Trying to run bios now\n"); - if (execute_bios(dev, gd->relocaddr)) - { - printf("OK\n"); - video_dev = dev; - } - else - { - printf("ERROR\n"); - } - + BootVideoCardBIOS(dev, NULL, 0); PRINTF("Done scanning.\n"); - - shutdown_bios(); +#endif if (dev == PCI_ANY_ID) return -1; else return 0; diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h index 9c89915..ed66fa4 100644 --- a/include/configs/AmigaOneG3SE.h +++ b/include/configs/AmigaOneG3SE.h @@ -90,6 +90,25 @@ #define atoi(x) simple_strtoul(x,NULL,10) +#ifdef CONFIG_PCI +#define _IO_BASE 0 +#define ARTICIAS_PCI_PHYS 0x8000000 +/*PCIE video card used*/ +#define VIDEO_IO_OFFSET ARTICIAS_PCI_PHYS + +/* video */ +#define CONFIG_VIDEO + +#if defined(CONFIG_VIDEO) +#define CONFIG_BIOSEMU +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_VIDEO_LOGO +/*#define CONFIG_CONSOLE_CURSOR*/ +#endif +#endif + /* * Miscellaneous configurable options */ -- 1.5.1