In the recent dropping of !NET_MULTI code (commit e2a53458a7ab37523304), I misread the logic in include/net.h. Some of it was used by NET_MULTI code. So restore it to fix failing boards, and do so in the powerpc asm config header (which is a better place anyways).
Signed-off-by: Mike Frysinger vapier@gentoo.org --- note: haven't finished MAKEALL, but this should fix things I think
arch/powerpc/include/asm/config.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index d138636..f572e06 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -36,6 +36,25 @@ # endif #endif
+#if defined(CONFIG_CPM2) && defined(CONFIG_ETHER_ON_FCC) +# if defined(CONFIG_ETHER_ON_SCC) +# error "Ethernet not correctly defined" +# endif /* CONFIG_ETHER_ON_SCC */ +# if (CONFIG_ETHER_INDEX == 1) +# define CONFIG_ETHER_ON_FCC1 +# define CONFIG_SYS_CMXFCR_MASK1 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE1 CONFIG_SYS_CMXFCR_VALUE +# elif (CONFIG_ETHER_INDEX == 2) +# define CONFIG_ETHER_ON_FCC2 +# define CONFIG_SYS_CMXFCR_MASK2 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE2 CONFIG_SYS_CMXFCR_VALUE +# elif (CONFIG_ETHER_INDEX == 3) +# define CONFIG_ETHER_ON_FCC3 +# define CONFIG_SYS_CMXFCR_MASK3 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE3 CONFIG_SYS_CMXFCR_VALUE +# endif /* CONFIG_ETHER_INDEX */ +#endif /* CONFIG_8260 && CONFIG_ETHER_ON_FCC */ + #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_SYS_BOOT_GET_CMDLINE