diff options
| -rw-r--r-- | src/devices/oprom/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/devices/oprom/realmode/Makefile.inc | 23 | ||||
| -rw-r--r-- | src/devices/oprom/realmode/x86.c (renamed from src/devices/oprom/x86.c) | 2 | ||||
| -rw-r--r-- | src/devices/oprom/realmode/x86.h (renamed from src/devices/oprom/x86.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/realmode/x86_asm.S (renamed from src/devices/oprom/x86_asm.S) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/realmode/x86_interrupts.c (renamed from src/devices/oprom/x86_interrupts.c) | 0 | ||||
| -rw-r--r-- | src/northbridge/via/cx700/vga.c | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vt8623/vga.c | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vx800/vga.c | 2 |
9 files changed, 29 insertions, 8 deletions
diff --git a/src/devices/oprom/Makefile.inc b/src/devices/oprom/Makefile.inc index 62fdc3182a..aa4a74d4d8 100644 --- a/src/devices/oprom/Makefile.inc +++ b/src/devices/oprom/Makefile.inc @@ -17,9 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.c -ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.S -ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.c - subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += x86emu subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += yabel +subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += realmode + diff --git a/src/devices/oprom/realmode/Makefile.inc b/src/devices/oprom/realmode/Makefile.inc new file mode 100644 index 0000000000..fafeb2c573 --- /dev/null +++ b/src/devices/oprom/realmode/Makefile.inc @@ -0,0 +1,23 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2012 secunet Security Networks AG +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; version 2 of the License. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.c +ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.S +ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.c + diff --git a/src/devices/oprom/x86.c b/src/devices/oprom/realmode/x86.c index 1791a87f14..32d24ec1c3 100644 --- a/src/devices/oprom/x86.c +++ b/src/devices/oprom/realmode/x86.c @@ -30,7 +30,7 @@ #include <pc80/i8259.h> #include "x86.h" #include "vbe.h" -#include "../../src/lib/jpeg.h" +#include <lib/jpeg.h> void (*realmode_call)(u32 addr, u32 eax, u32 ebx, u32 ecx, u32 edx, u32 esi, u32 edi) __attribute__((regparm(0))) = diff --git a/src/devices/oprom/x86.h b/src/devices/oprom/realmode/x86.h index 40c5778de5..40c5778de5 100644 --- a/src/devices/oprom/x86.h +++ b/src/devices/oprom/realmode/x86.h diff --git a/src/devices/oprom/x86_asm.S b/src/devices/oprom/realmode/x86_asm.S index 56ebb3a885..56ebb3a885 100644 --- a/src/devices/oprom/x86_asm.S +++ b/src/devices/oprom/realmode/x86_asm.S diff --git a/src/devices/oprom/x86_interrupts.c b/src/devices/oprom/realmode/x86_interrupts.c index 2ea05d44ba..2ea05d44ba 100644 --- a/src/devices/oprom/x86_interrupts.c +++ b/src/devices/oprom/realmode/x86_interrupts.c diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c index c6bf72ea8f..4acad7e852 100644 --- a/src/northbridge/via/cx700/vga.c +++ b/src/northbridge/via/cx700/vga.c @@ -32,7 +32,7 @@ #include <arch/interrupt.h> #include "registers.h" #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -#include <devices/oprom/x86.h> +#include <devices/oprom/realmode/x86.h> #endif /* PCI Domain 1 Device 0 Function 0 */ diff --git a/src/northbridge/via/vt8623/vga.c b/src/northbridge/via/vt8623/vga.c index dffe7cb1ff..fea691ebc2 100644 --- a/src/northbridge/via/vt8623/vga.c +++ b/src/northbridge/via/vt8623/vga.c @@ -31,7 +31,7 @@ #include <cpu/x86/msr.h> #include <arch/interrupt.h> #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -#include <devices/oprom/x86.h> +#include <devices/oprom/realmode/x86.h> #endif static int via_vt8623_int15_handler(struct eregs *regs) diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c index c3ae224898..d91ad9fea3 100644 --- a/src/northbridge/via/vx800/vga.c +++ b/src/northbridge/via/vx800/vga.c @@ -34,7 +34,7 @@ #include <cpu/x86/msr.h> #include <arch/interrupt.h> #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -#include <devices/oprom/x86.h> +#include <devices/oprom/realmode/x86.h> #endif /* PCI Domain 1 Device 0 Function 0 */ |