summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:30 +1100
committerGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:30 +1100
commitc53fd2bb6dc63c10fd2817f3041de24fd277255b (patch)
treeb2d5f5e26312fbad0a4a1e389c4c3920c15e636f
parentca56a4ceec47ca4358d99b17d7314042f8411544 (diff)
downloadbootable_bootloader_goldelico_gta04-c53fd2bb6dc63c10fd2817f3041de24fd277255b.zip
bootable_bootloader_goldelico_gta04-c53fd2bb6dc63c10fd2817f3041de24fd277255b.tar.gz
bootable_bootloader_goldelico_gta04-c53fd2bb6dc63c10fd2817f3041de24fd277255b.tar.bz2
x86: Move Global Descriptor Table defines to processor.h
-rw-r--r--arch/i386/cpu/cpu.c8
-rw-r--r--arch/i386/include/asm/processor.h9
2 files changed, 7 insertions, 10 deletions
diff --git a/arch/i386/cpu/cpu.c b/arch/i386/cpu/cpu.c
index ae40384..1dcbb98 100644
--- a/arch/i386/cpu/cpu.c
+++ b/arch/i386/cpu/cpu.c
@@ -35,6 +35,7 @@
#include <common.h>
#include <command.h>
+#include <asm/processor.h>
#include <asm/interrupt.h>
/* Constructor for a conventional segment GDT (or LDT) entry */
@@ -46,13 +47,6 @@
(((base) & 0x00ffffffULL) << 16) | \
(((limit) & 0x0000ffffULL)))
-/* Simple and small GDT entries for booting only */
-
-#define GDT_ENTRY_32BIT_CS 2
-#define GDT_ENTRY_32BIT_DS (GDT_ENTRY_32BIT_CS + 1)
-#define GDT_ENTRY_16BIT_CS (GDT_ENTRY_32BIT_DS + 1)
-#define GDT_ENTRY_16BIT_DS (GDT_ENTRY_16BIT_CS + 1)
-
/*
* Set up the GDT
*/
diff --git a/arch/i386/include/asm/processor.h b/arch/i386/include/asm/processor.h
index 5dedba8..22a1298 100644
--- a/arch/i386/include/asm/processor.h
+++ b/arch/i386/include/asm/processor.h
@@ -23,7 +23,10 @@
#ifndef __ASM_PROCESSOR_H_
#define __ASM_PROCESSOR_H_ 1
-/* Currently this header is unused in the i386 port
- * but some generic files #include <asm/processor.h>
- * so this file is a placeholder. */
+
+#define GDT_ENTRY_32BIT_CS 2
+#define GDT_ENTRY_32BIT_DS (GDT_ENTRY_32BIT_CS + 1)
+#define GDT_ENTRY_16BIT_CS (GDT_ENTRY_32BIT_DS + 1)
+#define GDT_ENTRY_16BIT_DS (GDT_ENTRY_16BIT_CS + 1)
+
#endif