[U-Boot] [PATCH 08/17] armv8: fsl: move ccn504 code into FSL Makefile

[André Przywara]

On 08/03/17 21:01, Simon Glass wrote:
> Hi Andre,
> 
> On 28 February 2017 at 19:25, Andre Przywara <andre.przywara at arm.com> wrote:
>> The generic ARMv8 assembly code contains routines for setting up
>> a CCN interconnect, though the Freescale SoCs are the only user.
>> Link this code only for Freescale targets, this saves some precious
>> bytes in the chronically tight SPL.
>>
>> Signed-off-by: Andre Przywara <andre.przywara at arm.com>
>> ---
>>  arch/arm/cpu/armv8/fsl-layerscape/Makefile | 1 +
>>  arch/arm/lib/Makefile                      | 1 -
>>  2 files changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile
>> index c9ab93e..ca09973 100644
>> --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile
>> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile
>> @@ -7,6 +7,7 @@
>>  obj-y += cpu.o
>>  obj-y += lowlevel.o
>>  obj-y += soc.o
>> +obj-y += ccn504.o
> 
> Don't you need to move the file into the same directory?

Mmmh, good point, somehow this slipped through.
So I'd rather guard this with CONFIG_FSL_LAYERSCAPE in the original
Makefile and hope for some consolidation should a second user appear.

Cheers,
Andre.

> 
>>  obj-$(CONFIG_MP) += mp.o
>>  obj-$(CONFIG_OF_LIBFDT) += fdt.o
>>  obj-$(CONFIG_SPL) += spl.o
>> diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
>> index 71de1ca..60ffb4a 100644
>> --- a/arch/arm/lib/Makefile
>> +++ b/arch/arm/lib/Makefile
>> @@ -43,7 +43,6 @@ obj-y += stack.o
>>  ifdef CONFIG_CPU_V7M
>>  obj-y  += interrupts_m.o
>>  else ifdef CONFIG_ARM64
>> -obj-y  += ccn504.o
>>  ifneq ($(CONFIG_GICV2)$(CONFIG_GICV3),)
>>  obj-y  += gic_64.o
>>  endif
>> --
>> 2.8.2
>>
> 
> Regards,
> Simon
>