diff options
| author | Patrick Georgi <patrick.georgi@secunet.com> | 2012-11-22 10:39:16 +0100 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-24 20:05:00 +0100 |
| commit | 3e77eb6d1e0a3ff9c0a32504a5221dc57b10506c (patch) | |
| tree | 00252b38808ea5d6dbb16548e4c5509e5dffb647 /src/devices/oprom | |
| parent | 6b11c8be4572f9b96804509e5bd9170a8cec162d (diff) | |
| download | coreboot-3e77eb6d1e0a3ff9c0a32504a5221dc57b10506c.tar.xz | |
x86emu: Move realmode handler into own directory
It's really a feature in parallel to YABEL/x86emu. Reflect this in
the directory structure.
Change-Id: Ie88e4fa6bfef13d23c55b2db3faacbd90f8cc30b
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Reviewed-on: http://review.coreboot.org/1889
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/devices/oprom')
| -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 |
6 files changed, 26 insertions, 5 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 |