[U-Boot] EBC_NUM_BANKS for Virtex5 PPC440?

[Lucas]

I'm working on a custom board that is similar to the ml507 (with a virtex 5
powerpc 440), and I ran across this error compiling u-boot:

fdt.c: In function '__ft_board_setup':
fdt.c:43: error: 'EBC_NUM_BANKS' undeclared (first use in this function)
fdt.c:43: error: (Each undeclared identifier is reported only once
fdt.c:43: error: for each function it appears in.)
fdt.c:43: warning: unused variable 'ranges'

I looked in ppc4xx-ebc.h and EBC_NUM_BANKS is only defined for 405xx and
440xx variants.  I tried setting it to zero and it works so far (see the
following diff), but is there a more proper way of disabling EBC?

diff --git a/include/asm-ppc/ppc4xx-ebc.h b/include/asm-ppc/ppc4xx-ebc.h
index 9680f70..61beb8d 100644
--- a/include/asm-ppc/ppc4xx-ebc.h
+++ b/include/asm-ppc/ppc4xx-ebc.h
@@ -41,26 +41,33 @@
 #if defined(CONFIG_405CR) || defined(CONFIG_405GP) || \
     defined(CONFIG_405EZ) || \
     defined(CONFIG_440GP) || defined(CONFIG_440GX)
+
 #define EBC_NUM_BANKS  8
-#endif

-#if defined(CONFIG_405EP)
+#elif defined(CONFIG_405EP)
+
 #define EBC_NUM_BANKS  5
-#endif

-#if defined(CONFIG_405EX) || \
+#elif defined(CONFIG_405EX) || \
     defined(CONFIG_460SX)
+
 #define EBC_NUM_BANKS  4
-#endif

-#if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
+#elif defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
     defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
     defined(CONFIG_460EX) || defined(CONFIG_460GT)
+
 #define EBC_NUM_BANKS  6
-#endif

-#if defined(CONFIG_440SP) || defined(CONFIG_440SPE)
+#elif defined(CONFIG_440SP) || defined(CONFIG_440SPE)
+
 #define EBC_NUM_BANKS  3
+
+#else
+
+/* TBD, what if CONFIG_440 but none of those others? */
+#define EBC_NUM_BANKS  0
+
 #endif

 /* Bank Configuration Register */


Thank you,

Lucas