From 09fe5ae4b17843da1c51fae36435f2bca8274c7e Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Thu, 5 Apr 2007 23:13:51 +0000
Subject: [PATCH] Drop the include/console/loglevel.h file.

Move the loglevel definitions directly into include/console/console.h
and drop the rest of loglevel.h which is unused and obsolete anyway.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@273 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 arch/x86/cachemain.c       |  1 -
 console/console.c          |  1 -
 include/console/console.h  | 11 ++++++++-
 include/console/loglevel.h | 48 --------------------------------------
 lib/lar.c                  |  1 -
 lib/stage2.c               |  1 -
 6 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 include/console/loglevel.h

diff --git a/arch/x86/cachemain.c b/arch/x86/cachemain.c
index 2b2adca142..99e56732dc 100644
--- a/arch/x86/cachemain.c
+++ b/arch/x86/cachemain.c
@@ -20,7 +20,6 @@
 #include <arch/types.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <console/loglevel.h>
 #include <lar.h>
 #include <linuxbios_tables.h>
 
diff --git a/console/console.c b/console/console.c
index f276c80be7..ae6b373152 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1,7 +1,6 @@
 #include <arch/types.h>
 #include <arch/hlt.h>
 #include <console/console.h>
-#include <console/loglevel.h>
 #include <uart8250.h>
 
 // FIXME: we need this for varargs
diff --git a/include/console/console.h b/include/console/console.h
index 308148c102..6780987fcf 100644
--- a/include/console/console.h
+++ b/include/console/console.h
@@ -18,7 +18,16 @@
 #define CONSOLE_CONSOLE_H_
 
 #include <arch/types.h>
-#include <console/loglevel.h>
+
+#define BIOS_EMERG      0   /* system is unusable                   */
+#define BIOS_ALERT      1   /* action must be taken immediately     */
+#define BIOS_CRIT       2   /* critical conditions                  */
+#define BIOS_ERR        3   /* error conditions                     */
+#define BIOS_WARNING    4   /* warning conditions                   */
+#define BIOS_NOTICE     5   /* normal but significant condition     */
+#define BIOS_INFO       6   /* informational                        */
+#define BIOS_DEBUG      7   /* debug-level messages                 */
+#define BIOS_SPEW       8   /* Way too many details                 */
 
 void console_init(void);
 void console_tx_byte(unsigned char byte, void *arg);
diff --git a/include/console/loglevel.h b/include/console/loglevel.h
deleted file mode 100644
index f90b3ef13b..0000000000
--- a/include/console/loglevel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * 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
- */
-
-#ifndef LOGLEVEL_H
-#define LOGLEVEL_H
-
-/* Safe for inclusion in assembly */
-
-#ifndef MAXIMUM_CONSOLE_LOGLEVEL
-#define MAXIMUM_CONSOLE_LOGLEVEL 10
-#endif
-
-#ifndef DEFAULT_CONSOLE_LOGLEVEL
-#define DEFAULT_CONSOLE_LOGLEVEL 10 /* anything MORE serious than BIOS_SPEW */
-#endif
-
-#ifndef ASM_CONSOLE_LOGLEVEL
-#if (DEFAULT_CONSOLE_LOGLEVEL <= MAXIMUM_CONSOLE_LOGLEVEL)
-#define ASM_CONSOLE_LOGLEVEL DEFAULT_CONSOLE_LOGLEVEL
-#else
-#define ASM_CONSOLE_LOGLEVEL MAXIMUM_CONSOLE_LOGLEVEL
-#endif
-#endif
-
-#define BIOS_EMERG      0   /* system is unusable                   */
-#define BIOS_ALERT      1   /* action must be taken immediately     */
-#define BIOS_CRIT       2   /* critical conditions                  */
-#define BIOS_ERR        3   /* error conditions                     */
-#define BIOS_WARNING    4   /* warning conditions                   */
-#define BIOS_NOTICE     5   /* normal but significant condition     */
-#define BIOS_INFO       6   /* informational                        */
-#define BIOS_DEBUG      7   /* debug-level messages                 */
-#define BIOS_SPEW       8   /* Way too many details                 */
-
-#endif /* LOGLEVEL_H */
diff --git a/lib/lar.c b/lib/lar.c
index 6c0d204115..c265cd1998 100644
--- a/lib/lar.c
+++ b/lib/lar.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <lar.h>
 #include <console/console.h>
-#include <console/loglevel.h>
 
 #ifndef CONFIG_BIG_ENDIAN
 #define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
diff --git a/lib/stage2.c b/lib/stage2.c
index cf5ea4df97..63f26372c5 100644
--- a/lib/stage2.c
+++ b/lib/stage2.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <lar.h>
 #include <console/console.h>
-#include <console/loglevel.h>
 #include <device/device.h>
 #include <tables.h>