From: Sylvain Munaut <tnt@246tNt•com>
To: Andrew Morton <akpm@osdl•org>
Cc: Tom Rini <trini@kernel•crashing.org>,
Sylvain Munaut <tnt@246tNt•com>,
Linux PPC Embedded <linuxppc-embedded@ozlabs•org>
Subject: [PATCH 9/9] ppc32: Allows compilation of a MPC52xx kernel without PCI
Date: Tue, 20 Dec 2005 21:44:34 +0100 (CET) [thread overview]
Message-ID: <9.20051220_213752_1ebc_tnt@patchsend.246tNt.com> (raw)
In-Reply-To: <0.20051220_213752_1ebc_tnt@patchsend.246tNt.com>
ppc32: Allows compilation of a MPC52xx kernel without PCI
Some custom cards might not need PCI, without this patch,
compilation fails.
Signed-off-by: Roger Blofeld <blofeldus@yahoo•com>
Signed-off-by: Sylvain Munaut <tnt@246tNt•com>
---
commit 181a39c878aab09ba95bfd9396e8c7d7004f4c4e
tree 42106141a8a50c521a8d169bb6b364d78401e15d
parent ebf0598ce7564d4c1db16d995e609923bbb2eba8
author Sylvain Munaut <tnt@246tNt•com> Sun, 18 Dec 2005 21:27:54 +0100
committer Sylvain Munaut <tnt@246tNt•com> Sun, 18 Dec 2005 21:27:54 +0100
arch/ppc/platforms/lite5200.c | 2 ++
include/asm-ppc/io.h | 2 ++
include/asm-ppc/mpc52xx.h | 11 +++++++++++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/ppc/platforms/lite5200.c b/arch/ppc/platforms/lite5200.c
index d44cc99..7ed52dc 100644
--- a/arch/ppc/platforms/lite5200.c
+++ b/arch/ppc/platforms/lite5200.c
@@ -196,8 +196,10 @@ platform_init(unsigned long r3, unsigned
mpc52xx_set_bat();
/* No ISA bus by default */
+#ifdef CONFIG_PCI
isa_io_base = 0;
isa_mem_base = 0;
+#endif
/* Powersave */
/* This is provided as an example on how to do it. But you
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 84ac6e2..df9cf6e 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -27,6 +27,8 @@
#if defined(CONFIG_4xx)
#include <asm/ibm4xx.h>
+#elif defined(CONFIG_PPC_MPC52xx)
+#include <asm/mpc52xx.h>
#elif defined(CONFIG_8xx)
#include <asm/mpc8xx.h>
#elif defined(CONFIG_8260)
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
index 04d5630..a055e07 100644
--- a/include/asm-ppc/mpc52xx.h
+++ b/include/asm-ppc/mpc52xx.h
@@ -29,6 +29,17 @@ struct pt_regs;
#endif /* __ASSEMBLY__ */
+#ifdef CONFIG_PCI
+#define _IO_BASE isa_io_base
+#define _ISA_MEM_BASE isa_mem_base
+#define PCI_DRAM_OFFSET pci_dram_offset
+#else
+#define _IO_BASE 0
+#define _ISA_MEM_BASE 0
+#define PCI_DRAM_OFFSET 0
+#endif
+
+
/* ======================================================================== */
/* PPC Sys devices definition */
/* ======================================================================== */
next prev parent reply other threads:[~2005-12-20 20:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-20 20:40 [PATCH 0/9] Some Freescale MPC52xx related updates Sylvain Munaut
2005-12-20 20:40 ` [PATCH 1/9] ppc32: Remove useless file arch/ppc/platforms/mpc5200.c Sylvain Munaut
2005-12-20 20:41 ` [PATCH 2/9] ppc32/serial: Fix compiler errors with GCC 4.x in mpc52xx_uart.c Sylvain Munaut
2005-12-20 20:41 ` [PATCH 3/9] ppc32/serial: Change mpc52xx_uart.c to use the Low Density Serial port major Sylvain Munaut
2005-12-20 20:42 ` [PATCH 4/9] ppc32: Fix static IO mapping for Freescale MPC52xx Sylvain Munaut
2005-12-20 20:42 ` [PATCH 5/9] ppc32: Modify Freescale MPC52xx IRQ mapping to _not_ use irq 0 Sylvain Munaut
2005-12-20 20:43 ` [PATCH 6/9] ppc32: Remove __init qualifier from mpc52xx pci resources fixups Sylvain Munaut
2005-12-20 20:43 ` [PATCH 7/9] ppc32: Fix MPC52xx configuration space access Sylvain Munaut
2005-12-20 20:44 ` [PATCH 8/9] ppc32: Fix MPC52xx PCI init in cas the bootloader didn't do it Sylvain Munaut
2005-12-20 20:44 ` Sylvain Munaut [this message]
2005-12-20 20:54 ` [PATCH 0/9] Some Freescale MPC52xx related updates Kumar Gala
2005-12-20 21:36 ` Sylvain Munaut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9.20051220_213752_1ebc_tnt@patchsend.246tNt.com \
--to=tnt@246tnt$(echo .)com \
--cc=akpm@osdl$(echo .)org \
--cc=linuxppc-embedded@ozlabs$(echo .)org \
--cc=trini@kernel$(echo .)crashing.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox