summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2013-04-05 00:57:53 +0200
committerRichard Braun <rbraun@sceen.net>2013-04-05 00:57:53 +0200
commit1229592da62bd1e48ca460b5843444dc203708da (patch)
tree49b27d6c1ecff8f2bc1c34c4e03d9ce7f7634cda
parentbb50f617e62c2eb28c6843b0e95f6332ef0a2b9a (diff)
x86/boot: minor naming change
Rename some macros so that they're consistent with the naming rules of the project.
-rw-r--r--arch/x86/machine/boot.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index 63141886..9f6f4b05 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -71,9 +71,9 @@
/*
* Macros used by the very early panic function.
*/
-#define INIT_CGAMEM ((uint16_t *)0xb8000)
-#define INIT_CGACHARS (80 * 25)
-#define INIT_CGACOLOR 0x7
+#define BOOT_CGAMEM ((uint16_t *)0xb8000)
+#define BOOT_CGACHARS (80 * 25)
+#define BOOT_CGACOLOR 0x7
char boot_stacks[MAX_CPUS][BOOT_STACK_SIZE] __aligned(DATA_ALIGN) __initdata;
unsigned int boot_ap_id __bootdata;
@@ -96,21 +96,21 @@ boot_panic(const char *msg)
uint16_t *ptr, *end;
const char *s;
- ptr = INIT_CGAMEM;
- end = ptr + INIT_CGACHARS;
+ ptr = BOOT_CGAMEM;
+ end = ptr + BOOT_CGACHARS;
s = (void *)BOOT_VTOP((unsigned long)"panic: ");
while ((ptr < end) && (*s != '\0'))
- *ptr++ = (INIT_CGACOLOR << 8) | *s++;
+ *ptr++ = (BOOT_CGACOLOR << 8) | *s++;
s = BOOT_VTOP(msg);
while ((ptr < end) && (*s != '\0'))
- *ptr++ = (INIT_CGACOLOR << 8) | *s++;
+ *ptr++ = (BOOT_CGACOLOR << 8) | *s++;
while (ptr < end)
- *ptr++ = (INIT_CGACOLOR << 8) | ' ';
+ *ptr++ = (BOOT_CGACOLOR << 8) | ' ';
cpu_halt();