[PATCH 7/10] Add use of mpc86xx.h include files in legacy header files.

[PATCH 7/10] Add use of mpc86xx.h include files in legacy header files.

[Jon Loeliger]

Signed-off-by: Xianghua Xiao <x.xiao@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>

---

 include/asm-ppc/io.h      |    2 ++
 include/asm-ppc/ppc_sys.h |    2 ++
 include/asm-ppc/serial.h  |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index b919d8f..0802be9 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -37,6 +37,8 @@ #elif defined(CONFIG_83xx)
 #include <asm/mpc83xx.h>
 #elif defined(CONFIG_85xx)
 #include <asm/mpc85xx.h>
+#elif defined(CONFIG_PPC_86xx)
+#include <asm/mpc86xx.h>
 #elif defined(CONFIG_APUS)
 #define _IO_BASE	0
 #define _ISA_MEM_BASE	0
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
index 40f197a..4eaf80d 100644
--- a/include/asm-ppc/ppc_sys.h
+++ b/include/asm-ppc/ppc_sys.h
@@ -27,6 +27,8 @@ #elif defined(CONFIG_83xx)
 #include <asm/mpc83xx.h>
 #elif defined(CONFIG_85xx)
 #include <asm/mpc85xx.h>
+#elif defined(CONFIG_PPC_86xx)
+#include <asm/mpc86xx.h>
 #elif defined(CONFIG_8xx)
 #include <asm/mpc8xx.h>
 #elif defined(CONFIG_PPC_MPC52xx)
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h
index b74af54..e819250 100644
--- a/include/asm-ppc/serial.h
+++ b/include/asm-ppc/serial.h
@@ -36,6 +36,8 @@ #elif defined(CONFIG_83xx)
 #include <asm/mpc83xx.h>
 #elif defined(CONFIG_85xx)
 #include <asm/mpc85xx.h>
+#elif defined(CONFIG_PPC_86xx)
+#include <asm/mpc86xx.h>
 #elif defined(CONFIG_RADSTONE_PPC7D)
 #include <platforms/radstone_ppc7d.h>
 #else

Re: [PATCH 7/10] Add use of mpc86xx.h include files in legacy header files.

[Kumar Gala]

On Jun 7, 2006, at 5:42 PM, Jon Loeliger wrote:

>
> Signed-off-by: Xianghua Xiao <x.xiao@freescale.com>
> Signed-off-by: Jon Loeliger <jdl@freescale.com>
>
> ---
>
>  include/asm-ppc/io.h      |    2 ++
>  include/asm-ppc/ppc_sys.h |    2 ++
>  include/asm-ppc/serial.h  |    2 ++
>  3 files changed, 6 insertions(+), 0 deletions(-)

Are the io.h & serial.h really needed for ARCH=powerpc?  What does  
serial.h get from asm/mpc86xx.h?  I can see the possibility of io.h  
needing some stuff from asm/mpc86xx.h

- k

>
> diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
> index b919d8f..0802be9 100644
> --- a/include/asm-ppc/io.h
> +++ b/include/asm-ppc/io.h
> @@ -37,6 +37,8 @@ #elif defined(CONFIG_83xx)
>  #include <asm/mpc83xx.h>
>  #elif defined(CONFIG_85xx)
>  #include <asm/mpc85xx.h>
> +#elif defined(CONFIG_PPC_86xx)
> +#include <asm/mpc86xx.h>
>  #elif defined(CONFIG_APUS)
>  #define _IO_BASE	0
>  #define _ISA_MEM_BASE	0
> diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
> index 40f197a..4eaf80d 100644
> --- a/include/asm-ppc/ppc_sys.h
> +++ b/include/asm-ppc/ppc_sys.h
> @@ -27,6 +27,8 @@ #elif defined(CONFIG_83xx)
>  #include <asm/mpc83xx.h>
>  #elif defined(CONFIG_85xx)
>  #include <asm/mpc85xx.h>
> +#elif defined(CONFIG_PPC_86xx)
> +#include <asm/mpc86xx.h>

this should go since I can't imagine your using ppc_sys.

>  #elif defined(CONFIG_8xx)
>  #include <asm/mpc8xx.h>
>  #elif defined(CONFIG_PPC_MPC52xx)
> diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h
> index b74af54..e819250 100644
> --- a/include/asm-ppc/serial.h
> +++ b/include/asm-ppc/serial.h
> @@ -36,6 +36,8 @@ #elif defined(CONFIG_83xx)
>  #include <asm/mpc83xx.h>
>  #elif defined(CONFIG_85xx)
>  #include <asm/mpc85xx.h>
> +#elif defined(CONFIG_PPC_86xx)
> +#include <asm/mpc86xx.h>
>  #elif defined(CONFIG_RADSTONE_PPC7D)
>  #include <platforms/radstone_ppc7d.h>
>  #else
>
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 7/10] Add use of mpc86xx.h include files in legacy header files.

[Jon Loeliger]

On Wed, 2006-06-07 at 23:49, Kumar Gala wrote:
> On Jun 7, 2006, at 5:42 PM, Jon Loeliger wrote:
> 
> >
> > Signed-off-by: Xianghua Xiao <x.xiao@freescale.com>
> > Signed-off-by: Jon Loeliger <jdl@freescale.com>
> >
> > ---
> >
> >  include/asm-ppc/io.h      |    2 ++
> >  include/asm-ppc/ppc_sys.h |    2 ++
> >  include/asm-ppc/serial.h  |    2 ++
> >  3 files changed, 6 insertions(+), 0 deletions(-)
> 
> Are the io.h & serial.h really needed for ARCH=powerpc?  What does  
> serial.h get from asm/mpc86xx.h?  I can see the possibility of io.h  
> needing some stuff from asm/mpc86xx.h

I'll check and do a round of include scrubbing.
There was some silliness going on there earlier,
but it could have been cleaned up along the way too.


> > index 40f197a..4eaf80d 100644
> > --- a/include/asm-ppc/ppc_sys.h
> > +++ b/include/asm-ppc/ppc_sys.h
> > @@ -27,6 +27,8 @@ #elif defined(CONFIG_83xx)
> >  #include <asm/mpc83xx.h>
> >  #elif defined(CONFIG_85xx)
> >  #include <asm/mpc85xx.h>
> > +#elif defined(CONFIG_PPC_86xx)
> > +#include <asm/mpc86xx.h>
> 
> this should go since I can't imagine your using ppc_sys.

Right.  Leftover cleaning tidbits.  It's gone.

Thanks,
jdl