diff options
| author |   Greg Ungerer <gerg@linux-m68k.org> | 2023-09-13 22:41:51 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2023-10-23 08:22:22 +1000 |
| commit | 7bc3db03e3dd344c3dc93c1dfe684d53d2a5ffbf (patch) | |
| tree | 62f78cb16e77d20e7e61d80d59564d1d4ce89d1b /arch/m68k | |
| parent | m68knommu: improve config ROM setting defaults (diff) | |
| download | wireguard-linux-7bc3db03e3dd344c3dc93c1dfe684d53d2a5ffbf.tar.xz wireguard-linux-7bc3db03e3dd344c3dc93c1dfe684d53d2a5ffbf.zip | |
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 <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/nettel.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h index 45716ead7b9d..3bd4b7a4613f 100644 --- a/arch/m68k/include/asm/nettel.h +++ b/arch/m68k/include/asm/nettel.h @@ -14,9 +14,8 @@ #define nettel_h /****************************************************************************/ - /****************************************************************************/ -#ifdef CONFIG_NETtel +#if defined(CONFIG_NETtel) || defined(CONFIG_CLEOPATRA) /****************************************************************************/ #ifdef CONFIG_COLDFIRE @@ -26,7 +25,7 @@ #endif /*---------------------------------------------------------------------------*/ -#if defined(CONFIG_M5307) +#if defined(CONFIG_M5307) || defined(CONFIG_M5407) /* * NETtel/5307 based hardware first. DTR/DCD lines are wired to * GPIO lines. Most of the LED's are driver through a latch |