Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Jayachandran C. <jchandra@broadcom.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: <linux-mips@linux-mips.org>, <ganesanr@broadcom.com>
Subject: Re: [PATCH 0/2] MIPS: Netlogic: modular build fixes
Date: Thu, 25 Sep 2014 06:55:15 +0530	[thread overview]
Message-ID: <20140925012514.GA3703@jayachandranc.netlogicmicro.com> (raw)
In-Reply-To: <1411581311-6458-1-git-send-email-f.fainelli@gmail.com>

On Wed, Sep 24, 2014 at 10:55:09AM -0700, Florian Fainelli wrote:
> Hello Ralf, Jayachandran, Ganesan
> 
> Here are two small fixes for modular USB and AHCI builds that I encountered
> while playing with a FVP board.
> 
> These are based off upstream-sfr/mips-for-linux-next

We have a slightly different fix for this in our internal repository, I
was planning to submit it soon:


index be358a8..5c876d3 100644
--- a/arch/mips/netlogic/xlp/Makefile
+++ b/arch/mips/netlogic/xlp/Makefile
@@ -1,6 +1,6 @@
 obj-y				+= setup.o nlm_hal.o cop2-ex.o dt.o
 obj-$(CONFIG_SMP)		+= wakeup.o
-obj-$(CONFIG_USB)		+= usb-init.o
-obj-$(CONFIG_USB)		+= usb-init-xlp2.o
-obj-$(CONFIG_SATA_AHCI)		+= ahci-init.o
-obj-$(CONFIG_SATA_AHCI)		+= ahci-init-xlp2.o
+obj-$(subst m,y,$(CONFIG_USB))	+= usb-init.o
+obj-$(subst m,y,$(CONFIG_USB))	+= usb-init-xlp2.o
+obj-$(subst m,y,$(CONFIG_SATA_AHCI))	+= ahci-init.o
+obj-$(subst m,y,$(CONFIG_SATA_AHCI))	+= ahci-init-xlp2.o

This will add the init code when USB or SATA is enabled as module or
is built-in, so I think this is be a better solution.

JC.

WARNING: multiple messages have this Message-ID (diff)
From: Jayachandran C. <jchandra@broadcom.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-mips@linux-mips.org, ganesanr@broadcom.com
Subject: Re: [PATCH 0/2] MIPS: Netlogic: modular build fixes
Date: Thu, 25 Sep 2014 06:55:15 +0530	[thread overview]
Message-ID: <20140925012514.GA3703@jayachandranc.netlogicmicro.com> (raw)
Message-ID: <20140925012515.Jm6LiFkMK6Co1qb1o6oUMC1dBY_gexuhkdIp9H5LekA@z> (raw)
In-Reply-To: <1411581311-6458-1-git-send-email-f.fainelli@gmail.com>

On Wed, Sep 24, 2014 at 10:55:09AM -0700, Florian Fainelli wrote:
> Hello Ralf, Jayachandran, Ganesan
> 
> Here are two small fixes for modular USB and AHCI builds that I encountered
> while playing with a FVP board.
> 
> These are based off upstream-sfr/mips-for-linux-next

We have a slightly different fix for this in our internal repository, I
was planning to submit it soon:


index be358a8..5c876d3 100644
--- a/arch/mips/netlogic/xlp/Makefile
+++ b/arch/mips/netlogic/xlp/Makefile
@@ -1,6 +1,6 @@
 obj-y				+= setup.o nlm_hal.o cop2-ex.o dt.o
 obj-$(CONFIG_SMP)		+= wakeup.o
-obj-$(CONFIG_USB)		+= usb-init.o
-obj-$(CONFIG_USB)		+= usb-init-xlp2.o
-obj-$(CONFIG_SATA_AHCI)		+= ahci-init.o
-obj-$(CONFIG_SATA_AHCI)		+= ahci-init-xlp2.o
+obj-$(subst m,y,$(CONFIG_USB))	+= usb-init.o
+obj-$(subst m,y,$(CONFIG_USB))	+= usb-init-xlp2.o
+obj-$(subst m,y,$(CONFIG_SATA_AHCI))	+= ahci-init.o
+obj-$(subst m,y,$(CONFIG_SATA_AHCI))	+= ahci-init-xlp2.o

This will add the init code when USB or SATA is enabled as module or
is built-in, so I think this is be a better solution.

JC.

  parent reply	other threads:[~2014-09-25  1:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-24 17:55 [PATCH 0/2] MIPS: Netlogic: modular build fixes Florian Fainelli
2014-09-24 17:55 ` [PATCH 1/2] MIPS: Netlogic: handle modular USB case Florian Fainelli
2014-09-24 17:55 ` [PATCH 2/2] MIPS: Netlogic: handle modular AHCI builds Florian Fainelli
2014-09-25  1:25 ` Jayachandran C. [this message]
2014-09-25  1:25   ` [PATCH 0/2] MIPS: Netlogic: modular build fixes Jayachandran C.
2014-09-25  1:36   ` Florian Fainelli

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=20140925012514.GA3703@jayachandranc.netlogicmicro.com \
    --to=jchandra@broadcom.com \
    --cc=f.fainelli@gmail.com \
    --cc=ganesanr@broadcom.com \
    --cc=linux-mips@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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