* [PATCH -queue 1/2] MIPS: Cleanup the Makefile of compressed kernel support
@ 2010-01-26 9:04 Wu Zhangjin
2010-01-26 9:04 ` [PATCH -queue 2/2] MIPS: Cleanup the debugging " Wu Zhangjin
2010-01-26 10:56 ` [PATCH -queue 1/2] MIPS: Cleanup the Makefile " Ralf Baechle
0 siblings, 2 replies; 5+ messages in thread
From: Wu Zhangjin @ 2010-01-26 9:04 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, Wu Zhangjin
This patch removes a useless "\" (line break) and tunes the format of a
long line.
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
arch/mips/boot/compressed/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 46a4537..91a57a6 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -24,11 +24,11 @@ BOOT_HEAP_SIZE := 0x400000
KBUILD_CFLAGS := $(shell echo $(KBUILD_CFLAGS) | sed -e "s/-pg//")
KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \
- -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" \
+ -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull"
KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
- -DKERNEL_ENTRY=0x$(shell $(NM) $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | grep " kernel_entry" | cut -f1 -d \ ) \
- -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE)
+ -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
+ -DKERNEL_ENTRY=0x$(shell $(NM) $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | grep " kernel_entry" | cut -f1 -d \ )
obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o
--
1.6.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH -queue 2/2] MIPS: Cleanup the debugging of compressed kernel support
2010-01-26 9:04 [PATCH -queue 1/2] MIPS: Cleanup the Makefile of compressed kernel support Wu Zhangjin
@ 2010-01-26 9:04 ` Wu Zhangjin
2010-01-26 10:51 ` Ralf Baechle
2010-01-26 10:56 ` [PATCH -queue 1/2] MIPS: Cleanup the Makefile " Ralf Baechle
1 sibling, 1 reply; 5+ messages in thread
From: Wu Zhangjin @ 2010-01-26 9:04 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, Wu Zhangjin
This patch adds a new DEBUG_ZBOOT option to allow the developers to
debug the compressed kernel support for a new board.
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
arch/mips/Kconfig.debug | 18 ++++++++++++++++++
arch/mips/boot/compressed/Makefile | 2 ++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index d2b88a0..b3e20f4 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -102,4 +102,22 @@ config RUNTIME_DEBUG
arch/mips/include/asm/debug.h for debugging macros.
If unsure, say N.
+config DEBUG_ZBOOT
+ bool "Enable compressed kernel support debugging"
+ depends on SYS_SUPPORTS_ZBOOT_UART16550
+ help
+ If you want to add compressed kernel support to a new board, and the
+ board supports uart16550 compatible serial port, please select
+ SYS_SUPPORTS_ZBOOT_UART16550 for your board and enable this option to
+ debug it.
+
+ If your board doesn't support uart16550 compatible serial port, you
+ can try to select SYS_SUPPORTS_ZBOOT and use the other methods to
+ debug it. for example, add a new serial port support just as
+ arch/mips/boot/compressed/uart-16550.c does.
+
+ After the compressed kernel support works, please disable this option
+ to reduce the kernel image size and speed up the booting procedure a
+ little.
+
endmenu
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 91a57a6..68e5db8 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -32,7 +32,9 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o
+ifdef CONFIG_DEBUG_ZBOOT
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
+endif
OBJCOPYFLAGS_vmlinux.bin := $(OBJCOPYFLAGS) -O binary -R .comment -S
$(obj)/vmlinux.bin: $(KBUILD_IMAGE)
--
1.6.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH -queue 2/2] MIPS: Cleanup the debugging of compressed kernel support
2010-01-26 9:04 ` [PATCH -queue 2/2] MIPS: Cleanup the debugging " Wu Zhangjin
@ 2010-01-26 10:51 ` Ralf Baechle
2010-01-26 13:46 ` Wu Zhangjin
0 siblings, 1 reply; 5+ messages in thread
From: Ralf Baechle @ 2010-01-26 10:51 UTC (permalink / raw)
To: Wu Zhangjin; +Cc: linux-mips
On Tue, Jan 26, 2010 at 05:04:03PM +0800, Wu Zhangjin wrote:
> This patch adds a new DEBUG_ZBOOT option to allow the developers to
> debug the compressed kernel support for a new board.
>
> Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
> ---
> arch/mips/Kconfig.debug | 18 ++++++++++++++++++
> arch/mips/boot/compressed/Makefile | 2 ++
> 2 files changed, 20 insertions(+), 0 deletions(-)
>
> diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
> index d2b88a0..b3e20f4 100644
> --- a/arch/mips/Kconfig.debug
> +++ b/arch/mips/Kconfig.debug
> @@ -102,4 +102,22 @@ config RUNTIME_DEBUG
> arch/mips/include/asm/debug.h for debugging macros.
> If unsure, say N.
>
> +config DEBUG_ZBOOT
> + bool "Enable compressed kernel support debugging"
> + depends on SYS_SUPPORTS_ZBOOT_UART16550
This should probably depend on DEBUG_KERNEL also.
> + help
> + If you want to add compressed kernel support to a new board, and the
> + board supports uart16550 compatible serial port, please select
> + SYS_SUPPORTS_ZBOOT_UART16550 for your board and enable this option to
> + debug it.
> +
> + If your board doesn't support uart16550 compatible serial port, you
> + can try to select SYS_SUPPORTS_ZBOOT and use the other methods to
> + debug it. for example, add a new serial port support just as
> + arch/mips/boot/compressed/uart-16550.c does.
> +
> + After the compressed kernel support works, please disable this option
> + to reduce the kernel image size and speed up the booting procedure a
> + little.
> +
> endmenu
> diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
> index 91a57a6..68e5db8 100644
> --- a/arch/mips/boot/compressed/Makefile
> +++ b/arch/mips/boot/compressed/Makefile
> @@ -32,7 +32,9 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
>
> obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o
>
> +ifdef CONFIG_DEBUG_ZBOOT
> obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> +endif
DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so this can be
simplified into just obj-$(CONFIG_DEBUG_ZBOOT) and no ifdef.
Ralf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -queue 2/2] MIPS: Cleanup the debugging of compressed kernel support
2010-01-26 10:51 ` Ralf Baechle
@ 2010-01-26 13:46 ` Wu Zhangjin
0 siblings, 0 replies; 5+ messages in thread
From: Wu Zhangjin @ 2010-01-26 13:46 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips
On Tue, 2010-01-26 at 11:51 +0100, Ralf Baechle wrote:
[...]
> >
> > +config DEBUG_ZBOOT
> > + bool "Enable compressed kernel support debugging"
> > + depends on SYS_SUPPORTS_ZBOOT_UART16550
>
> This should probably depend on DEBUG_KERNEL also.
>
ok, will add it.
[...]
> > diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
> > index 91a57a6..68e5db8 100644
> > --- a/arch/mips/boot/compressed/Makefile
> > +++ b/arch/mips/boot/compressed/Makefile
> > @@ -32,7 +32,9 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
> >
> > obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o
> >
> > +ifdef CONFIG_DEBUG_ZBOOT
> > obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> > +endif
>
> DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so this can be
> simplified into just obj-$(CONFIG_DEBUG_ZBOOT) and no ifdef.
>
Yes, currently, we can simplify it, but the ifdef can make people be
easier to add new debugging supports, for example:
ifdef CONFIG_DEBUG_ZBOOT
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
+obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UARTXXXX) += $(obj)/uart-xxxx.o
+obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_VGA) += $(obj)/vga.o
endif
otherwise, we need:
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT) += $(obj)/uart-16550.o \
$(obj)/uart-xxxx.o \
$(obj)/vga.o
and then wrap the $(obj)/uart-16550.c, $(obj)/uart-xxxx.c, $(obj)/vga.c
internally with related ifdefs.
So, which method we choose?
Best Regards,
Wu Zhangjin
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -queue 1/2] MIPS: Cleanup the Makefile of compressed kernel support
2010-01-26 9:04 [PATCH -queue 1/2] MIPS: Cleanup the Makefile of compressed kernel support Wu Zhangjin
2010-01-26 9:04 ` [PATCH -queue 2/2] MIPS: Cleanup the debugging " Wu Zhangjin
@ 2010-01-26 10:56 ` Ralf Baechle
1 sibling, 0 replies; 5+ messages in thread
From: Ralf Baechle @ 2010-01-26 10:56 UTC (permalink / raw)
To: Wu Zhangjin; +Cc: linux-mips
On Tue, Jan 26, 2010 at 05:04:02PM +0800, Wu Zhangjin wrote:
> This patch removes a useless "\" (line break) and tunes the format of a
> long line.
>
> Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Thanks, queued for 2.6.34.
Ralf
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-01-26 13:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-26 9:04 [PATCH -queue 1/2] MIPS: Cleanup the Makefile of compressed kernel support Wu Zhangjin
2010-01-26 9:04 ` [PATCH -queue 2/2] MIPS: Cleanup the debugging " Wu Zhangjin
2010-01-26 10:51 ` Ralf Baechle
2010-01-26 13:46 ` Wu Zhangjin
2010-01-26 10:56 ` [PATCH -queue 1/2] MIPS: Cleanup the Makefile " Ralf Baechle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.