diff mbox

[U-Boot,PATCHv2,9/9] arm: socfpga: remove building scan manager

Message ID 1448988519-21669-10-git-send-email-dinguyen@opensource.altera.com
State Superseded
Delegated to: Marek Vasut
Headers show

Commit Message

Dinh Nguyen Dec. 1, 2015, 4:48 p.m. UTC
From: Dinh Nguyen <dinguyen@opensource.altera.com>

The scan manager is not needed for the Arria10. Edit the makefile to
build the scan manager for arria5 and cyclone5 only.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
 arch/arm/mach-socfpga/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Marek Vasut Dec. 1, 2015, 7:05 p.m. UTC | #1
On Tuesday, December 01, 2015 at 05:48:39 PM, dinguyen@opensource.altera.com 
wrote:
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
> 
> The scan manager is not needed for the Arria10. Edit the makefile to
> build the scan manager for arria5 and cyclone5 only.
> 
> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
> ---
>  arch/arm/mach-socfpga/Makefile | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-socfpga/Makefile
> b/arch/arm/mach-socfpga/Makefile index 316b326..d4c5a42 100644
> --- a/arch/arm/mach-socfpga/Makefile
> +++ b/arch/arm/mach-socfpga/Makefile
> @@ -8,11 +8,14 @@
>  #
> 
>  obj-y	+= misc.o timer.o reset_manager.o system_manager.o 
clock_manager.o \
> -	   fpga_manager.o scan_manager.o
> +	   fpga_manager.o
> +
>  obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o
> 
> +ifneq ($(CONFIG_TARGET_SOCFPGA_ARRIA10),y)
>  # QTS-generated config file wrappers
> -obj-y	+= wrap_pll_config.o
> +obj-y	+= scan_manager.o wrap_pll_config.o
> +endif
>  obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o	\
>  			   wrap_sdram_config.o
>  CFLAGS_wrap_iocsr_config.o	+= -I$(srctree)/board/$(BOARDDIR)

I'd suggest to use this construct here:

obj-$(CONFIG_TARGET_SOCFPGA_CYCLONE5) += foo.o
obj-$(CONFIG_TARGET_SOCFPGA_ARRIA5) += foo.o

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index 316b326..d4c5a42 100644
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -8,11 +8,14 @@ 
 #
 
 obj-y	+= misc.o timer.o reset_manager.o system_manager.o clock_manager.o \
-	   fpga_manager.o scan_manager.o
+	   fpga_manager.o
+
 obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o
 
+ifneq ($(CONFIG_TARGET_SOCFPGA_ARRIA10),y)
 # QTS-generated config file wrappers
-obj-y	+= wrap_pll_config.o
+obj-y	+= scan_manager.o wrap_pll_config.o
+endif
 obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o	\
 			   wrap_sdram_config.o
 CFLAGS_wrap_iocsr_config.o	+= -I$(srctree)/board/$(BOARDDIR)