diff mbox

[U-Boot] sf: Updated Makefile to group generic files

Message ID 36b31351-4667-4b14-9ab6-ef47e8e4ebc6@VA3EHSMHS045.ehs.local
State Rejected
Delegated to: Tom Rini
Headers show

Commit Message

Jagannadha Sutradharudu Teki Dec. 19, 2013, 3:57 p.m. UTC
Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 drivers/mtd/spi/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Tom Rini Dec. 19, 2013, 4:36 p.m. UTC | #1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/19/2013 10:57 AM, Jagannadha Sutradharudu Teki wrote:
> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
>  drivers/mtd/spi/Makefile | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
> index 26483a2..fd8f8a4 100644
> --- a/drivers/mtd/spi/Makefile
> +++ b/drivers/mtd/spi/Makefile
> @@ -10,8 +10,15 @@ obj-$(CONFIG_SPL_SPI_LOAD)	+= spi_spl_load.o
>  obj-$(CONFIG_SPL_SPI_BOOT)	+= fsl_espi_spl.o
>  endif
>  
> -obj-$(CONFIG_CMD_SF)        += sf.o
> -obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o
> +ifdef CONFIG_CMD_SF
> +obj-y += sf.o
> +endif
> +
> +ifdef CONFIG_SPI_FLASH
> +obj-y += sf_probe.o
> +obj-y += sf_ops.o
> +endif
> +
>  obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
>  obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
>  obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o

OK, wait, what?  What's being solved here?  Thanks!

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSsyB2AAoJENk4IS6UOR1WxwwP/07hFRvhx7lhWVnpxM4mPHt3
TgqAv7lV/uQGKJ2PowedoelnFNQkvXeHCKv2B8c90MsKc4sEybp6RCxN+jcZyCNj
selbPo9NIo2mLKEGBAxzGXGZGe33ij9iCr7txl1kVOJHcpajQLBZdWYxc0nHfFjg
iJs+nypmwQuJ2+Vcgvqa9TmHxnZTQfg4wcpSy/nTxJmc/kiyjBiXWcStjOxz9LKV
uNZcwmdQm4/1btY45mGgllDWCFODg58XlaAvCY0G2QDs016USUPt9a2aQuO8weF8
X04a21Z0FndVHWlhY+B9rtXx20Tg+3O3q38rdaxDXNeqOUpmsvvnm4vyWKYCMc64
hO0gfiNDCjpVLA6QmuH1uUQ/ZHRwHIqM+zz20zAm87McoznGmEV0lA+aQB82Zs7x
sQ7kGCAgpSJ0Z/LhOcktsMpWYdHm+sEEvrBI4DIgt/jbqwWhGdXYoDNnUmXAnf5w
q1GWrO16DTNIW3//74T8IRyME9yjw5ALLvxrPhadTIoHGBzi1TLXGFTQnQo7zMMK
oEiMnm5IWC3YJiNgTB6KSDlrz8Hk+WD46pnG9LXn6lSehzaiImZWT2k6YDPlYbhP
INuuPT/sonQBvFBP0nKoKqnT49+eEWEylcZhIsXC5yCM5jC0YRh0ItH82cn5IOhZ
IQsLTtLjGmaDorjWu5Pe
=81su
-----END PGP SIGNATURE-----
Jagan Teki Dec. 19, 2013, 5:26 p.m. UTC | #2
On Thu, Dec 19, 2013 at 10:06 PM, Tom Rini <trini@ti.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 12/19/2013 10:57 AM, Jagannadha Sutradharudu Teki wrote:
>> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
>> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
>> ---
>>  drivers/mtd/spi/Makefile | 11 +++++++++--
>>  1 file changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
>> index 26483a2..fd8f8a4 100644
>> --- a/drivers/mtd/spi/Makefile
>> +++ b/drivers/mtd/spi/Makefile
>> @@ -10,8 +10,15 @@ obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o
>>  obj-$(CONFIG_SPL_SPI_BOOT)   += fsl_espi_spl.o
>>  endif
>>
>> -obj-$(CONFIG_CMD_SF)        += sf.o
>> -obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o
>> +ifdef CONFIG_CMD_SF
>> +obj-y += sf.o
>> +endif
>> +
>> +ifdef CONFIG_SPI_FLASH
>> +obj-y += sf_probe.o
>> +obj-y += sf_ops.o
>> +endif
>> +
>>  obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
>>  obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
>>  obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o
>
> OK, wait, what?  What's being solved here?  Thanks!

Nothing solved- just group generic files one after another.
Any mistake?
Tom Rini Dec. 19, 2013, 5:39 p.m. UTC | #3
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/19/2013 12:26 PM, Jagan Teki wrote:
> On Thu, Dec 19, 2013 at 10:06 PM, Tom Rini <trini@ti.com> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 12/19/2013 10:57 AM, Jagannadha Sutradharudu Teki wrote:
>>> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
>>> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
>>> ---
>>>  drivers/mtd/spi/Makefile | 11 +++++++++--
>>>  1 file changed, 9 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
>>> index 26483a2..fd8f8a4 100644
>>> --- a/drivers/mtd/spi/Makefile
>>> +++ b/drivers/mtd/spi/Makefile
>>> @@ -10,8 +10,15 @@ obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o
>>>  obj-$(CONFIG_SPL_SPI_BOOT)   += fsl_espi_spl.o
>>>  endif
>>>
>>> -obj-$(CONFIG_CMD_SF)        += sf.o
>>> -obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o
>>> +ifdef CONFIG_CMD_SF
>>> +obj-y += sf.o
>>> +endif
>>> +
>>> +ifdef CONFIG_SPI_FLASH
>>> +obj-y += sf_probe.o
>>> +obj-y += sf_ops.o
>>> +endif
>>> +
>>>  obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
>>>  obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
>>>  obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o
>>
>> OK, wait, what?  What's being solved here?  Thanks!
> 
> Nothing solved- just group generic files one after another.
> Any mistake?

Well, it feels like a step backwards.

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSsy9fAAoJENk4IS6UOR1W9T4P/0bI/DJg65JuaRQx8vb7qpqQ
yfEeVFjKfDmdNYrq1OU4Zetcm8+ok/cVETjvqb3x7Ec+qJFMA9xEjvkGo5wowAWp
C2dreILANjDvSujvy2mvOXuo5rkO65vez7i2uEvbypKEAt48OB/M9nJ/lsP6Pfw2
F1khZ8DZOD40J1aLL8eucqtzQWiieRdxZdnMzuw9DhnPDubP+iR4NS3q8P2A9axP
ZnwTbjhSjFVcohZnjHYypnInhu6qQFiVbdZGs/s1DK6IKgo0VKJDulHR6FTHPZr7
BrKpNnoRYjcE/17xSQYQkGk6FnQYohM3LtSGqCEZ6t2EqTqMDv29kEd/gU0kV3Mx
iEXLEYR5jkh+WL4+o4ZB2nC41mPatljKaaW5cnCPSskhE/s1+3B1dfEVYIof3lFk
quWVbrjMDBo7r2lw5dWfFOZTyyJIq0rwBehidy1abxisWkYYUs9KLY6wnDZ52uV0
/RSBoxAtexOdady6K5HgXRkfX0kBJTmyua4+1VMoemmEfPmQttO8+sE18do4aHJs
TdUT1CBSidmGbyH+xHNVoIB/v58qBro6OOjUWJ4MI6+OlBa58FTu5odkLoDIPZGP
GUTlhmyBQIbo7Cguo5mVNBfiQOdFJ1UB2SilFgXAn1dy/+IjUDe09ZKml3MGRr2M
aI53I9FX9+xYkRR+tpF+
=alrI
-----END PGP SIGNATURE-----
Jagan Teki Dec. 19, 2013, 5:48 p.m. UTC | #4
On Thu, Dec 19, 2013 at 11:09 PM, Tom Rini <trini@ti.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 12/19/2013 12:26 PM, Jagan Teki wrote:
>> On Thu, Dec 19, 2013 at 10:06 PM, Tom Rini <trini@ti.com> wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> On 12/19/2013 10:57 AM, Jagannadha Sutradharudu Teki wrote:
>>>> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
>>>> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
>>>> ---
>>>>  drivers/mtd/spi/Makefile | 11 +++++++++--
>>>>  1 file changed, 9 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
>>>> index 26483a2..fd8f8a4 100644
>>>> --- a/drivers/mtd/spi/Makefile
>>>> +++ b/drivers/mtd/spi/Makefile
>>>> @@ -10,8 +10,15 @@ obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o
>>>>  obj-$(CONFIG_SPL_SPI_BOOT)   += fsl_espi_spl.o
>>>>  endif
>>>>
>>>> -obj-$(CONFIG_CMD_SF)        += sf.o
>>>> -obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o
>>>> +ifdef CONFIG_CMD_SF
>>>> +obj-y += sf.o
>>>> +endif
>>>> +
>>>> +ifdef CONFIG_SPI_FLASH
>>>> +obj-y += sf_probe.o
>>>> +obj-y += sf_ops.o
>>>> +endif
>>>> +
>>>>  obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
>>>>  obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
>>>>  obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o
>>>
>>> OK, wait, what?  What's being solved here?  Thanks!
>>
>> Nothing solved- just group generic files one after another.
>> Any mistake?
>
> Well, it feels like a step backwards.

I saw the generic files are grouped same in drivers/mtd/nand/Makefile.
Tried the same -may be this can also will fix - OK please ignore this.
diff mbox

Patch

diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
index 26483a2..fd8f8a4 100644
--- a/drivers/mtd/spi/Makefile
+++ b/drivers/mtd/spi/Makefile
@@ -10,8 +10,15 @@  obj-$(CONFIG_SPL_SPI_LOAD)	+= spi_spl_load.o
 obj-$(CONFIG_SPL_SPI_BOOT)	+= fsl_espi_spl.o
 endif
 
-obj-$(CONFIG_CMD_SF)        += sf.o
-obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o
+ifdef CONFIG_CMD_SF
+obj-y += sf.o
+endif
+
+ifdef CONFIG_SPI_FLASH
+obj-y += sf_probe.o
+obj-y += sf_ops.o
+endif
+
 obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
 obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
 obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o