X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fgalileo%2Fcore.h;h=c277509298a65c4209de470b9f281034987fafcf;hb=6f681b734942036d538a61fdcc9989328515cfa2;hp=0735d075b3c05edcd38a9845852392d03ca02279;hpb=8bde7f776c77b343aca29b8c7b58464d915ac245;p=u-boot

diff --git a/include/galileo/core.h b/include/galileo/core.h
index 0735d075b3..c277509298 100644
--- a/include/galileo/core.h
+++ b/include/galileo/core.h
@@ -23,13 +23,13 @@ extern unsigned int INTERNAL_REG_BASE_ADDR;
 #define GT_64260	0  /* includes both 64260A and 64260B */
 #define GT_64261	1
 
-#if (CFG_GT_6426x == GT_64260)
+#if (CONFIG_SYS_GT_6426x == GT_64260)
 #ifdef CONFIG_ETHER_PORT_MII
 #define GAL_ETH_DEVS 2
 #else
 #define GAL_ETH_DEVS 3
 #endif
-#elif (CFG_GT_6426x == GT_64261)
+#elif (CONFIG_SYS_GT_6426x == GT_64261)
 #define GAL_ETH_DEVS 2
 #else
 #define GAL_ETH_DEVS 3	/* default to a 64260 */
@@ -110,7 +110,10 @@ extern unsigned int INTERNAL_REG_BASE_ADDR;
 #define _1G             0x40000000
 #define _2G             0x80000000
 
+#ifndef	BOOL_WAS_DEFINED
+#define BOOL_WAS_DEFINED
 typedef enum _bool{false,true} bool;
+#endif
 
 /* Little to Big endian conversion macros */