Signed-off-by: Ben Collins <[email protected]>
---
arch/i386/Kconfig.debug | 6 ++++++
arch/i386/boot/compressed/misc.c | 8 +++++---
arch/x86_64/Kconfig.debug | 6 ++++++
arch/x86_64/boot/compressed/misc.c | 8 +++++---
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index b31c080..eb26441 100644
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -19,6 +19,12 @@ config EARLY_PRINTK
with klogd/syslogd or the X server. You should normally N here,
unless you want to debug such a crash.
+config WRAPPER_PRINT
+ bool "Boot wrapper print" if EMBEDDED
+ default y
+ help
+ Enable informational output from the bootwrapper (bzImage and zImage).
+
config DEBUG_STACKOVERFLOW
bool "Check for stack overflows"
depends on DEBUG_KERNEL
diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c
index b28505c..cc630d5 100644
--- a/arch/i386/boot/compressed/misc.c
+++ b/arch/i386/boot/compressed/misc.c
@@ -184,8 +184,6 @@ static void free(void *where);
static void *memset(void *s, int c, unsigned n);
static void *memcpy(void *dest, const void *src, unsigned n);
-static void putstr(const char *);
-
static unsigned long free_mem_ptr;
static unsigned long free_mem_end_ptr;
@@ -232,7 +230,8 @@ static void gzip_release(void **ptr)
{
free_mem_ptr = (unsigned long) *ptr;
}
-
+
+#ifdef CONFIG_WRAPPER_PRINT
static void scroll(void)
{
int i;
@@ -278,6 +277,9 @@ static void putstr(const char *s)
outb_p(15, vidport);
outb_p(0xff & (pos >> 1), vidport+1);
}
+#else
+#define putstr(__x) do{}while(0)
+#endif /* CONFIG_WRAPPER_PRINT */
static void* memset(void* s, int c, unsigned n)
{
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug
index 775d211..a1b87b8 100644
--- a/arch/x86_64/Kconfig.debug
+++ b/arch/x86_64/Kconfig.debug
@@ -6,6 +6,12 @@ config TRACE_IRQFLAGS_SUPPORT
source "lib/Kconfig.debug"
+config WRAPPER_PRINT
+ bool "Boot wrapper print" if EMBEDDED
+ default y
+ help
+ Enable informational output from the bootwrapper (bzImage and zImage).
+
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
depends on DEBUG_KERNEL
diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86_64/boot/compressed/misc.c
index f932b0e..43bb44c 100644
--- a/arch/x86_64/boot/compressed/misc.c
+++ b/arch/x86_64/boot/compressed/misc.c
@@ -184,8 +184,6 @@ static void free(void *where);
static void *memset(void *s, int c, unsigned n);
static void *memcpy(void *dest, const void *src, unsigned n);
-static void putstr(const char *);
-
static long free_mem_ptr;
static long free_mem_end_ptr;
@@ -228,7 +226,8 @@ static void gzip_release(void **ptr)
{
free_mem_ptr = (long) *ptr;
}
-
+
+#ifdef CONFIG_WRAPPER_PRINT
static void scroll(void)
{
int i;
@@ -274,6 +273,9 @@ static void putstr(const char *s)
outb_p(15, vidport);
outb_p(0xff & (pos >> 1), vidport+1);
}
+#else
+#define putstr(__x) do{}while(0)
+#endif /* CONFIG_WRAPPER_PRINT */
static void* memset(void* s, int c, unsigned n)
{
--
1.5.1.4
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
