Skip to content

Commit 7bc3db0

Browse files
author
Greg Ungerer
committed
m68knommu: fix compilation for ColdFire/Cleopatra boards
The ColdFire based Cleopatra family of boards use mostly the same external pin arrangements as the NETtel board family. The build uses the NETtel specific code as needed, but not all the conditional defines allow for this. If you have the CONFIG_NETtel config option set everything compiles as expected, but if you only select the CONFIG_CLEOPATRA board type then you will get compile failures: arch/m68k/coldfire/nettel.c: In function ‘nettel_smc91x_init’: arch/m68k/coldfire/nettel.c:126:2: error: implicit declaration of function ‘mcf_setppdata’; did you mean ‘xas_set_update’? [-Werror=implicit-function-declaration] mcf_setppdata(0, 0x0080); ^~~~~~~~~~~~~ xas_set_update Fix the nettel.h include conditional checks to cover all board types. This also means some code paths need to check for the 5407 SoC - since one of the Cleopatra board types is based on that. It is very similar to the 5307 specific code, and it can use that "as-is". Signed-off-by: Greg Ungerer <[email protected]>
1 parent 0100f67 commit 7bc3db0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/m68k/include/asm/nettel.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
#define nettel_h
1515
/****************************************************************************/
1616

17-
1817
/****************************************************************************/
19-
#ifdef CONFIG_NETtel
18+
#if defined(CONFIG_NETtel) || defined(CONFIG_CLEOPATRA)
2019
/****************************************************************************/
2120

2221
#ifdef CONFIG_COLDFIRE
@@ -26,7 +25,7 @@
2625
#endif
2726

2827
/*---------------------------------------------------------------------------*/
29-
#if defined(CONFIG_M5307)
28+
#if defined(CONFIG_M5307) || defined(CONFIG_M5407)
3029
/*
3130
* NETtel/5307 based hardware first. DTR/DCD lines are wired to
3231
* GPIO lines. Most of the LED's are driver through a latch

0 commit comments

Comments
 (0)