public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Andrei Konovalov <akonovalov@ru•mvista.com>
To: Stephen Williams <612dlag102@sneakemail•com>
Cc: linuxppc-embedded@lists•linuxppc.org
Subject: Re: Configure tweaks for SystemACE without CONFIG_XILINX_OCP
Date: Fri, 11 Jun 2004 21:21:53 +0400	[thread overview]
Message-ID: <40C9EA31.2070408@ru.mvista.com> (raw)
In-Reply-To: <19720-17858@sneakemail.com>


The patch is OK for me.

Thanks,
Andrei

Stephen Williams wrote:
>
> Stephen Williams 612dlag102-at-sneakemail.com |PPC Linux Embedded| wrote:
>
>> In order to get CONFIG_XILINX_SYSACE to define, the unmodified
>> source requries that CONFIG_XILINX_OCP is defined. I created this
>> patch to alloc SYSACE on by board:
>
>
> I've made a patch that demonstrates what I have in mind, and
> should work in general. With this patch, a configuration can
> enable CONFIG_XILINX_OCP and enable CONFIG_XILINX_SYSACE and
> not have ppc405gpr pci setup or PIC setup messed with.
>
> Patch is relative the ppc.bkbits.net linuxppc-2.4 tree. I'm
> guessing Andrei is the authority for this aspect.
>
> --
> Steve Williams                "The woods are lovely, dark and deep.
> steve at XXXXXXXXXX           But I have promises to keep,
> http://www.XXXXXXXXXX         and lines to code before I sleep,
> http://www.picturel.com       And lines to code before I sleep."
>
>
> ------------------------------------------------------------------------
>
> # This is a BitKeeper generated diff -Nru style patch.
> #
> # ChangeSet
> #   2004/06/10 18:45:08-07:00 steve@wing•XXXXXXXXXX
> #   Condition Xilinx on-chip processor config with
> #   CONFIG_VIRTEX_II_PRO
> #
> # arch/ppc/kernel/ppc405_pci.c
> #   2004/06/10 18:45:06-07:00 steve@wing•XXXXXXXXXX +1 -1
> #   Condition Xilinx on-chip processor support with
> #   CONFIG_VIRTEX_II_PRO
> #
> # arch/ppc/kernel/Makefile
> #   2004/06/10 18:45:06-07:00 steve@wing•XXXXXXXXXX +1 -1
> #   Condition Xilinx on-chip processor support with
> #   CONFIG_VIRTEX_II_PRO
> #
> # BitKeeper/etc/ignore
> #   2004/06/10 18:45:06-07:00 steve@wing•XXXXXXXXXX +4 -0
> #   Added arch/ppc/boot/images/uImage arch/ppc/boot/images/vmlinux.UBoot arch/ppc/boot/images/vmlinux.gz arch/ppc/kernel/ppc_defs.h to the ignore list
> #
> diff -Nru a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
> --- a/arch/ppc/kernel/Makefile	2004-06-10 19:57:40 -07:00
> +++ b/arch/ppc/kernel/Makefile	2004-06-10 19:57:40 -07:00
> @@ -61,7 +61,7 @@
>  obj-$(CONFIG_PPC_OCP)		+= ocp.o
>  obj-$(CONFIG_40x)		+= ppc4xx_setup.o
>  obj-$(CONFIG_4xx)		+= todc_time.o idle_4xx.o
> -ifeq ($(CONFIG_XILINX_OCP),y)
> +ifeq ($(CONFIG_XILINX_OCP)$(CONFIG_VIRTEX_II_PRO),yy)
>  obj-$(CONFIG_40x)		+= xilinx_pic.o
>  else
>  obj-$(CONFIG_40x)		+= ppc4xx_pic.o
> diff -Nru a/arch/ppc/kernel/ppc405_pci.c b/arch/ppc/kernel/ppc405_pci.c
> --- a/arch/ppc/kernel/ppc405_pci.c	2004-06-10 19:57:40 -07:00
> +++ b/arch/ppc/kernel/ppc405_pci.c	2004-06-10 19:57:40 -07:00
> @@ -132,7 +132,7 @@
>  	setup_indirect_pci(hose_a, PPC405_PCI_CONFIG_ADDR,
>  			   PPC405_PCI_CONFIG_DATA);
>
> -#ifdef CONFIG_XILINX_OCP
> +#if defined(CONFIG_XILINX_OCP) && defined(CONFIG_VIRTEX_II_PRO)
>  	/* Eliminate "unused variable" warning for pcip.  Optimizer removes. */
>  	pcip = NULL;
>  	new_pmm_min = PPC405_PCI_LOWER_MEM;


** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

  reply	other threads:[~2004-06-11 17:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-06-10 21:18 Configure tweaks for SystemACE without CONFIG_XILINX_OCP Stephen Williams
2004-06-11  3:05 ` Stephen Williams
2004-06-11 17:21   ` Andrei Konovalov [this message]
     [not found] ` <1087388724.17025.4.camel@pavement.sandburst.com>
2004-06-16 14:46   ` Stephen Williams

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=40C9EA31.2070408@ru.mvista.com \
    --to=akonovalov@ru$(echo .)mvista.com \
    --cc=612dlag102@sneakemail$(echo .)com \
    --cc=linuxppc-embedded@lists$(echo .)linuxppc.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