* [PATCH 3/12] Add an option to disable debug UART.
@ 2007-06-09 17:22 Vivien Chappelier
2007-06-12 13:21 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Vivien Chappelier @ 2007-06-09 17:22 UTC (permalink / raw)
To: Linux OMAP
This patch adds an option to boot without any debug UART.
Signed-off-by: Vivien Chappelier <vivien.chappelier@free.fr>
---
arch/arm/plat-omap/Kconfig | 3 +++
include/asm-arm/arch-omap/debug-macro.S | 10 +++++++++-
include/asm-arm/arch-omap/uncompress.h | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 6facd96..a02e954 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -178,6 +178,9 @@ choice
depends on ARCH_OMAP
default OMAP_LL_DEBUG_UART1
+config OMAP_LL_DEBUG_NONE
+ bool "NONE"
+
config OMAP_LL_DEBUG_UART1
bool "UART1"
diff --git a/include/asm-arm/arch-omap/debug-macro.S
b/include/asm-arm/arch-omap/debug-macro.S
index ca4f577..4051420 100644
--- a/include/asm-arm/arch-omap/debug-macro.S
+++ b/include/asm-arm/arch-omap/debug-macro.S
@@ -38,6 +38,13 @@
#endif
.endm
+#ifdef CONFIG_OMAP_LL_DEBUG_NONE
+ .macro senduart,rd,rx
+ .endm
+
+ .macro busyuart,rd,rx
+ .endm
+#else
.macro senduart,rd,rx
strb \rd, [\rx]
.endm
@@ -53,6 +60,7 @@
bne 1001b
1002:
.endm
-
+#endif
+
.macro waituart,rd,rx
.endm
diff --git a/include/asm-arm/arch-omap/uncompress.h
b/include/asm-arm/arch-omap/uncompress.h
index aca0adf..409af7e 100644
--- a/include/asm-arm/arch-omap/uncompress.h
+++ b/include/asm-arm/arch-omap/uncompress.h
@@ -34,7 +34,7 @@ static void putc(int c)
volatile u8 * uart = 0;
int shift = 2;
-#ifdef CONFIG_MACH_OMAP_PALMTE
+#if defined(CONFIG_MACH_OMAP_PALMTE) || defined(CONFIG_MACH_TYPHOON)
return;
#endif
--
1.5.1.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/12] Add an option to disable debug UART.
@ 2007-06-09 18:39 Vivien Chappelier
0 siblings, 0 replies; 5+ messages in thread
From: Vivien Chappelier @ 2007-06-09 18:39 UTC (permalink / raw)
To: linux-omap-open-source
This patch adds an option to boot without any debug UART.
Signed-off-by: Vivien Chappelier <vivien.chappelier@free.fr>
---
arch/arm/plat-omap/Kconfig | 3 +++
include/asm-arm/arch-omap/debug-macro.S | 10 +++++++++-
include/asm-arm/arch-omap/uncompress.h | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 6facd96..a02e954 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -178,6 +178,9 @@ choice
depends on ARCH_OMAP
default OMAP_LL_DEBUG_UART1
+config OMAP_LL_DEBUG_NONE
+ bool "NONE"
+
config OMAP_LL_DEBUG_UART1
bool "UART1"
diff --git a/include/asm-arm/arch-omap/debug-macro.S b/include/asm-arm/arch-omap/debug-macro.S
index ca4f577..4051420 100644
--- a/include/asm-arm/arch-omap/debug-macro.S
+++ b/include/asm-arm/arch-omap/debug-macro.S
@@ -38,6 +38,13 @@
#endif
.endm
+#ifdef CONFIG_OMAP_LL_DEBUG_NONE
+ .macro senduart,rd,rx
+ .endm
+
+ .macro busyuart,rd,rx
+ .endm
+#else
.macro senduart,rd,rx
strb \rd, [\rx]
.endm
@@ -53,6 +60,7 @@
bne 1001b
1002:
.endm
-
+#endif
+
.macro waituart,rd,rx
.endm
diff --git a/include/asm-arm/arch-omap/uncompress.h b/include/asm-arm/arch-omap/uncompress.h
index aca0adf..409af7e 100644
--- a/include/asm-arm/arch-omap/uncompress.h
+++ b/include/asm-arm/arch-omap/uncompress.h
@@ -34,7 +34,7 @@ static void putc(int c)
volatile u8 * uart = 0;
int shift = 2;
-#ifdef CONFIG_MACH_OMAP_PALMTE
+#if defined(CONFIG_MACH_OMAP_PALMTE) || defined(CONFIG_MACH_TYPHOON)
return;
#endif
--
1.5.1.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/12] Add an option to disable debug UART.
2007-06-09 17:22 [PATCH 3/12] Add an option to disable debug UART Vivien Chappelier
@ 2007-06-12 13:21 ` Tony Lindgren
2007-06-12 13:36 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2007-06-12 13:21 UTC (permalink / raw)
To: Vivien Chappelier; +Cc: Linux OMAP
* Vivien Chappelier <vivien.chappelier@free.fr> [070609 10:23]:
> This patch adds an option to boot without any debug UART.
>
> Signed-off-by: Vivien Chappelier <vivien.chappelier@free.fr>
>
> ---
> arch/arm/plat-omap/Kconfig | 3 +++
> include/asm-arm/arch-omap/debug-macro.S | 10 +++++++++-
> include/asm-arm/arch-omap/uncompress.h | 2 +-
> 3 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> index 6facd96..a02e954 100644
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -178,6 +178,9 @@ choice
> depends on ARCH_OMAP
> default OMAP_LL_DEBUG_UART1
> +config OMAP_LL_DEBUG_NONE
> + bool "NONE"
> +
> config OMAP_LL_DEBUG_UART1
> bool "UART1"
> diff --git a/include/asm-arm/arch-omap/debug-macro.S
> b/include/asm-arm/arch-omap/debug-macro.S
> index ca4f577..4051420 100644
> --- a/include/asm-arm/arch-omap/debug-macro.S
> +++ b/include/asm-arm/arch-omap/debug-macro.S
> @@ -38,6 +38,13 @@
> #endif
> .endm
> +#ifdef CONFIG_OMAP_LL_DEBUG_NONE
> + .macro senduart,rd,rx
> + .endm
> + + .macro busyuart,rd,rx
> + .endm
> +#else
> .macro senduart,rd,rx
> strb \rd, [\rx]
> .endm
Hmm, is the extra + before busyuart above intentional?
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/12] Add an option to disable debug UART.
2007-06-12 13:21 ` Tony Lindgren
@ 2007-06-12 13:36 ` Tony Lindgren
2007-06-12 21:42 ` Vivien Chappelier
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2007-06-12 13:36 UTC (permalink / raw)
To: Vivien Chappelier; +Cc: Linux OMAP
t* Tony Lindgren <tony@atomide.com> [070612 06:22]:
> * Vivien Chappelier <vivien.chappelier@free.fr> [070609 10:23]:
> > This patch adds an option to boot without any debug UART.
> >
> > Signed-off-by: Vivien Chappelier <vivien.chappelier@free.fr>
> >
> > ---
> > arch/arm/plat-omap/Kconfig | 3 +++
> > include/asm-arm/arch-omap/debug-macro.S | 10 +++++++++-
> > include/asm-arm/arch-omap/uncompress.h | 2 +-
> > 3 files changed, 13 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> > index 6facd96..a02e954 100644
> > --- a/arch/arm/plat-omap/Kconfig
> > +++ b/arch/arm/plat-omap/Kconfig
> > @@ -178,6 +178,9 @@ choice
> > depends on ARCH_OMAP
> > default OMAP_LL_DEBUG_UART1
> > +config OMAP_LL_DEBUG_NONE
> > + bool "NONE"
> > +
> > config OMAP_LL_DEBUG_UART1
> > bool "UART1"
> > diff --git a/include/asm-arm/arch-omap/debug-macro.S
> > b/include/asm-arm/arch-omap/debug-macro.S
> > index ca4f577..4051420 100644
> > --- a/include/asm-arm/arch-omap/debug-macro.S
> > +++ b/include/asm-arm/arch-omap/debug-macro.S
> > @@ -38,6 +38,13 @@
> > #endif
> > .endm
> > +#ifdef CONFIG_OMAP_LL_DEBUG_NONE
> > + .macro senduart,rd,rx
> > + .endm
> > + + .macro busyuart,rd,rx
> > + .endm
> > +#else
> > .macro senduart,rd,rx
> > strb \rd, [\rx]
> > .endm
>
> Hmm, is the extra + before busyuart above intentional?
I guess I should be looking at the updated patch set instead...
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/12] Add an option to disable debug UART.
2007-06-12 13:36 ` Tony Lindgren
@ 2007-06-12 21:42 ` Vivien Chappelier
0 siblings, 0 replies; 5+ messages in thread
From: Vivien Chappelier @ 2007-06-12 21:42 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Linux OMAP
Hi,
Tony Lindgren wrote:
>> Hmm, is the extra + before busyuart above intentional?
>>
>
> I guess I should be looking at the updated patch set instead...
>
Yes, sorry for the mess...
Most of the syntactic mistakes still apply though, so I'll update my
patches to take them into account.
I've just noticed I've forgotten to use 'struct kp_key' for a few boards in
'[PATCH 11/12] Add support for keys setting multiple bits in the scan',
so I'll fix that as well.
Concerning patches which add new config options such as in
'[PATCH 3/12] Add an option to disable debug UART.', should I also
provide a patch to update all defconfigs or is it ok not to do so?
Thanks for your time,
Vivien.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-06-12 21:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-09 17:22 [PATCH 3/12] Add an option to disable debug UART Vivien Chappelier
2007-06-12 13:21 ` Tony Lindgren
2007-06-12 13:36 ` Tony Lindgren
2007-06-12 21:42 ` Vivien Chappelier
-- strict thread matches above, loose matches on Subject: below --
2007-06-09 18:39 Vivien Chappelier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox