Commit 63a24cf8 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Greg Ungerer
Browse files

m68k: coldfire/device.c: only build FEC when HW macros are defined 



When CONFIG_FEC is set (due to COMPILE_TEST) along with
CONFIG_M54xx, coldfire/device.c has compile errors due to
missing MCFEC_* and MCF_IRQ_FEC_* symbols.

Make the whole FEC blocks dependent on having the HW macros
defined, rather than on CONFIG_FEC itself.

This fix is very similar to commit e6e1e7b1 ("m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined")

Fixes: b7ce7f0d ("m68knommu: merge common ColdFire FEC platform setup code")
To: Greg Ungerer <gerg@linux-m68k.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAntonio Quartulli <antonio@mandelbit.com>
Signed-off-by: default avatarGreg Ungerer <gerg@kernel.org>
parent f2121409

arch/m68k/coldfire/device.c

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static struct platform_device mcf_uart = { 
	.dev.platform_data	= mcf_uart_platform_data,

};



#if IS_ENABLED(CONFIG_FEC)

#ifdef MCFFEC_BASE0



#ifdef CONFIG_M5441x

#define FEC_NAME	"enet-fec"
@@ -145,6 +145,7 @@ static struct platform_device mcf_fec0 = { 
		.platform_data		= FEC_PDATA,

	}

};

#endif /* MCFFEC_BASE0 */



#ifdef MCFFEC_BASE1

static struct resource mcf_fec1_resources[] = {
@@ -182,7 +183,6 @@ static struct platform_device mcf_fec1 = { 
	}

};

#endif /* MCFFEC_BASE1 */

#endif /* CONFIG_FEC */



#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

/*
@@ -624,12 +624,12 @@ static struct platform_device mcf_flexcan0 = { 


static struct platform_device *mcf_devices[] __initdata = {

	&mcf_uart,

#if IS_ENABLED(CONFIG_FEC)

#ifdef MCFFEC_BASE0

	&mcf_fec0,

#endif

#ifdef MCFFEC_BASE1

	&mcf_fec1,

#endif

#endif

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	&mcf_qspi,

#endif