summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2009-08-05 12:15:46 +0000
committerPatrick Georgi <patrick@georgi-clan.de>2009-08-05 12:15:46 +0000
commit8e35a76858c20edefd7432fec177bca50e781371 (patch)
treeffc7d205e7eb5090c3fc637e1a9b2fd9b5793b2a
parenta540ae536ed6af5d4d500a3efa49c2921c31c063 (diff)
downloadcoreboot-8e35a76858c20edefd7432fec177bca50e781371.tar.gz
coreboot-8e35a76858c20edefd7432fec177bca50e781371.tar.bz2
coreboot-8e35a76858c20edefd7432fec177bca50e781371.zip
Prepare for kconfig: Rename COREBOOT_V2 to CONFIG_COREBOOT_V2
and adapt its user (x86emu) to match. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: svn://coreboot.org/repository/coreboot-v3@1175 f3766cd6-281f-0410-b1cd-43a5c92072e9
Diffstat
-rw-r--r--util/x86emu/biosemu.c2
-rw-r--r--util/x86emu/pcbios/pcibios.c4
-rw-r--r--util/x86emu/x86.c2
-rw-r--r--util/x86emu/x86_interrupts.c4
-rw-r--r--util/x86emu/x86emu/sys.c2
-rw-r--r--util/x86emu/yabel/biosemu.c6
-rw-r--r--util/x86emu/yabel/compat/functions.c2
-rw-r--r--util/x86emu/yabel/debug.c2
-rw-r--r--util/x86emu/yabel/debug.h2
-rw-r--r--util/x86emu/yabel/device.c4
-rw-r--r--util/x86emu/yabel/device.h2
-rw-r--r--util/x86emu/yabel/interrupt.c6
-rw-r--r--util/x86emu/yabel/io.c2
-rw-r--r--util/x86emu/yabel/mem.c4
-rw-r--r--util/x86emu/yabel/pmm.c2
-rw-r--r--util/x86emu/yabel/vbe.c4
16 files changed, 25 insertions, 25 deletions
diff --git a/util/x86emu/biosemu.c b/util/x86emu/biosemu.c
index 360af645047f..e91343603f01 100644
--- a/util/x86emu/biosemu.c
+++ b/util/x86emu/biosemu.c
@@ -36,7 +36,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include <arch/io.h>
#include <console/console.h>
#else
diff --git a/util/x86emu/pcbios/pcibios.c b/util/x86emu/pcbios/pcibios.c
index 4bbe565e8b63..506aad078665 100644
--- a/util/x86emu/pcbios/pcibios.c
+++ b/util/x86emu/pcbios/pcibios.c
@@ -35,7 +35,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include <console/console.h>
#else
#include <console.h>
@@ -65,7 +65,7 @@ int pcibios_handler(void)
break;
case FIND_PCI_DEVICE:
/* FixME: support SI != 0 */
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
dev = dev_find_device(X86_DX, X86_CX, dev);
#else
dev = dev_find_pci_device(X86_DX, X86_CX, dev);
diff --git a/util/x86emu/x86.c b/util/x86emu/x86.c
index 3b7afd03ef0f..8509df311149 100644
--- a/util/x86emu/x86.c
+++ b/util/x86emu/x86.c
@@ -20,7 +20,7 @@
#include <device/pci.h>
#include <string.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include <arch/io.h>
#include <console/console.h>
#define printk(x...) do_printk(x)
diff --git a/util/x86emu/x86_interrupts.c b/util/x86emu/x86_interrupts.c
index c1f1ccecb1b0..c20c01725c1f 100644
--- a/util/x86emu/x86_interrupts.c
+++ b/util/x86emu/x86_interrupts.c
@@ -23,7 +23,7 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <string.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include <console/console.h>
#include <arch/io.h>
#define printk(x...) do_printk(x)
@@ -87,7 +87,7 @@ int int1a_handler(struct eregs *regs)
vendorid = regs->edx;
devindex = regs->esi;
dev = 0;
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
while ((dev = dev_find_device(vendorid, devid, dev))) {
#else
while ((dev = dev_find_pci_device(vendorid, devid, dev))) {
diff --git a/util/x86emu/x86emu/sys.c b/util/x86emu/x86emu/sys.c
index 76344a10654f..31f8a28047a7 100644
--- a/util/x86emu/x86emu/sys.c
+++ b/util/x86emu/x86emu/sys.c
@@ -46,7 +46,7 @@
#include "debug.h"
#include "prim_ops.h"
#if 1 /* Coreboot needs to map prinkf to printk. */
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "arch/io.h"
#else
#include "io.h"
diff --git a/util/x86emu/yabel/biosemu.c b/util/x86emu/yabel/biosemu.c
index 05c360c3ceaf..74772e86429b 100644
--- a/util/x86emu/yabel/biosemu.c
+++ b/util/x86emu/yabel/biosemu.c
@@ -14,7 +14,7 @@
#include <string.h>
#include <types.h>
-#ifndef COREBOOT_V2
+#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
@@ -22,7 +22,7 @@
#include <x86emu/x86emu.h>
#include <x86emu/regs.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word
@@ -35,7 +35,7 @@
#include "device.h"
#include "pmm.h"
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h"
#else
#include <rtas.h>
diff --git a/util/x86emu/yabel/compat/functions.c b/util/x86emu/yabel/compat/functions.c
index 28f838bce3bf..3b3d223b71e3 100644
--- a/util/x86emu/yabel/compat/functions.c
+++ b/util/x86emu/yabel/compat/functions.c
@@ -14,7 +14,7 @@
*/
#include <types.h>
-#ifndef COREBOOT_V2
+#ifndef CONFIG_COREBOOT_V2
#include <config.h>
#endif
#include <device/device.h>
diff --git a/util/x86emu/yabel/debug.c b/util/x86emu/yabel/debug.c
index 77d469214913..fdac469d7ff3 100644
--- a/util/x86emu/yabel/debug.c
+++ b/util/x86emu/yabel/debug.c
@@ -11,7 +11,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-#ifndef COREBOOT_V2
+#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
diff --git a/util/x86emu/yabel/debug.h b/util/x86emu/yabel/debug.h
index 1ffd42433c2a..8126262ed9ab 100644
--- a/util/x86emu/yabel/debug.h
+++ b/util/x86emu/yabel/debug.h
@@ -20,7 +20,7 @@ extern u32 debug_flags;
extern void x86emu_dump_xregs(void);
/* printf is not available in coreboot... use printk */
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include <console/console.h>
#else
#include <console.h>
diff --git a/util/x86emu/yabel/device.c b/util/x86emu/yabel/device.c
index e070a3a5732f..d5c114ccb698 100644
--- a/util/x86emu/yabel/device.c
+++ b/util/x86emu/yabel/device.c
@@ -13,7 +13,7 @@
#include "device.h"
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h"
#else
#include "rtas.h"
@@ -397,7 +397,7 @@ biosemu_dev_init(struct device * device)
{
u8 rval = 0;
//init bios_device struct
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
DEBUG_PRINTF("%s\n", __func__);
#else
DEBUG_PRINTF("%s(%s)\n", __func__, device->dtsname);
diff --git a/util/x86emu/yabel/device.h b/util/x86emu/yabel/device.h
index 801eb164907f..b35034194706 100644
--- a/util/x86emu/yabel/device.h
+++ b/util/x86emu/yabel/device.h
@@ -15,7 +15,7 @@
#define DEVICE_LIB_H
#include <types.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include <arch/byteorder.h>
#include "compat/of.h"
#else
diff --git a/util/x86emu/yabel/interrupt.c b/util/x86emu/yabel/interrupt.c
index 9cb0f13d5d7a..5542588571a9 100644
--- a/util/x86emu/yabel/interrupt.c
+++ b/util/x86emu/yabel/interrupt.c
@@ -11,7 +11,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h"
#else
#include <rtas.h>
@@ -24,7 +24,7 @@
#include "pmm.h"
#include <x86emu/x86emu.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h>
@@ -350,7 +350,7 @@ handleInt1a(void)
__func__, M.x86.R_AX);
/* FixME: support SI != 0 */
#if defined(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES) && CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES==1
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
dev = dev_find_device(M.x86.R_DX, M.x86.R_CX, 0);
#else
dev = dev_find_pci_device(M.x86.R_DX, M.x86.R_CX, 0);
diff --git a/util/x86emu/yabel/io.c b/util/x86emu/yabel/io.c
index 6380ec3bc3d2..16a8b58331e6 100644
--- a/util/x86emu/yabel/io.c
+++ b/util/x86emu/yabel/io.c
@@ -12,7 +12,7 @@
*****************************************************************************/
#include <types.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h"
#include "compat/time.h"
#else
diff --git a/util/x86emu/yabel/mem.c b/util/x86emu/yabel/mem.c
index 86c920b94448..91dc3da3f9b5 100644
--- a/util/x86emu/yabel/mem.c
+++ b/util/x86emu/yabel/mem.c
@@ -12,14 +12,14 @@
*****************************************************************************/
#include <types.h>
-#ifndef COREBOOT_V2
+#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
#include "debug.h"
#include "device.h"
#include "x86emu/x86emu.h"
#include "biosemu.h"
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "compat/time.h"
#else
#include <time.h>
diff --git a/util/x86emu/yabel/pmm.c b/util/x86emu/yabel/pmm.c
index 7e12155cc1d8..0b78ca533018 100644
--- a/util/x86emu/yabel/pmm.c
+++ b/util/x86emu/yabel/pmm.c
@@ -10,7 +10,7 @@
****************************************************************************/
#include <x86emu/x86emu.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h>
diff --git a/util/x86emu/yabel/vbe.c b/util/x86emu/yabel/vbe.c
index 90ab0f991a50..a2c9f8265584 100644
--- a/util/x86emu/yabel/vbe.c
+++ b/util/x86emu/yabel/vbe.c
@@ -13,7 +13,7 @@
#include <string.h>
#include <types.h>
-#ifndef COREBOOT_V2
+#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
@@ -21,7 +21,7 @@
#include <x86emu/x86emu.h>
#include <x86emu/regs.h>
-#ifdef COREBOOT_V2
+#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 14:10:08 +0000