[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [microblaze-uclinux] current CVS is broken for suzaku
At Wed, 03 Nov 2004 08:05:10 +1000,
John Williams wrote:
[...]
> > Suzaku doesn't have second uart but auto-config.in defines it. that
> > cause network chip not to able to acquire irq; which is taken by
> > unpresent second uart.
>
> hmm - autoconfig.in should not be used for the old-style platforms...
> Or do you mean asm-include/autoconfig.h?
right. i ment include/asm-microblaze/autoconfig.h.
well, thing is that suzaku's config is already broken from start. we
have illegally been using mbvanilla's xparamters.h for suzaku. that
just surfaced by the restructure.
> > John, do you want me to define platform for suzaku so that I can just
> > put whatever suzaku need to arch/microblaze/platform/suzaku/, or wait
> > till restructure is done?
>
> Well I would certainly encourage you to move towards the /platform/xxx
> approach, but I really tried to maintain backwards compatability..
>
> Short term fix will be an #ifdef conditional on Suzaku in
> include/asm-microblaze/autoconfig.h - but a better solution will be
> create your own /platform/suzaku subdir. Just use platform/uclinux-auto
> as a template.
Ok, I'll leave it for homework for now ;P
attached patch _hide_ the bug. this is not the proper fix, but for
now it works (tm). John, can you apply attached patch for me?
anyway, let me ask a few q's.
- if I want to create new platform, I'll do in Board.mk
ifdef CONFIG_SUZAKU
PLATFORM := suzaku
endif
and I should _not_ define CONFIG_UCLINUX_AUTO, no?
- since we are moving away from xparameters.h, I should not use
include/asm-microblaze/xparameters.h in anyway. is this right?
- if so, top of include/asm-microblaze/xparameters.h's ifdef doesn't
prevent accidental inclusion
#ifdef CONFIG_MICROBLAZE_AUTO_CONFIG
#error Autoconfig-targets must not include xparameters.h
#endif
this should be changed to
#ifdef PLATFORM
#error New platform must not include xparameters.h
#endif
no?
and this is also true for include/asm-microblaze/autoconfig.h since we
don't need to map new style to old
> Sorry for the breakage :(
that's ok. I just need to know the semantics behind it. we'll do a
few minor tweek on the way. :)
best,
--
yashi
---
this patch ifdef out second uart and emac for suzaku. this is not the
proper fix. True fix is to create suzaku platform and away from
xparameters.h -- yashi
autoconfig.h | 3 +++
1 files changed, 3 insertions(+)
Index: linux-2.4.x/include/asm-microblaze/autoconfig.h
===================================================================
--- linux-2.4.x.orig/include/asm-microblaze/autoconfig.h 2004-11-04 00:56:34.643533807 +0900
+++ linux-2.4.x/include/asm-microblaze/autoconfig.h 2004-11-04 01:33:04.130507427 +0900
@@ -77,6 +77,8 @@
#define CONFIG_XILINX_UARTLITE_0_IRQ 1
#endif
+#ifndef CONFIG_SUZAKU
+
#ifdef XPAR_DEBUG_UART_BASEADDR
#define CONFIG_XILINX_UARTLITE_1_INSTANCE "debug_uart"
#define CONFIG_XILINX_UARTLITE_1_BASEADDR XPAR_DEBUG_UART_BASEADDR
@@ -90,6 +92,7 @@
#define CONFIG_XILINX_ETHERNET_0_IRQ 3
#define CONFIG_XILINX_ETHERNET_NUM_INSTANCES XPAR_XEMAC_NUM_INSTANCES
+#endif /* !CONFIG_SUZAKU */
#endif
___________________________
microblaze-uclinux mailing list
microblaze-uclinux@itee.uq.edu.au
Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/