Re: [PATCH 0/2] MIPS: Netlogic: modular build fixes
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2014-09-25 01:37:01
On 09/24/2014 06:25 PM, Jayachandran C. wrote:
quoted hunk ↗ jump to hunk
On Wed, Sep 24, 2014 at 10:55:09AM -0700, Florian Fainelli wrote:quoted
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-nextWe 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.oThis 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.
Not sure which one is "better" than the other since they both solve the same problem, but whatever works for you also works for me! The tree seems to have a mix of both approaches. Thanks! -- Florian