Changes for btext and etherboot and filo merge support

[coreboot.git] / src / drivers / ati / ragexl / mach64_ct.c

diff --git a/src/drivers/ati/ragexl/mach64_ct.c b/src/drivers/ati/ragexl/mach64_ct.c
index bc1af5ff3a6f79fa5bdd5e2110774a5787997ce2..74ef0cc5e230a2547d68317648539c8d2afb4d4e 100644 (file)
--- a/src/drivers/ati/ragexl/mach64_ct.c
+++ b/src/drivers/ati/ragexl/mach64_ct.c
@@ -1,7 +1,11 @@
 #define DEBUG_PLL 0
 
 /* FIXME: remove the FAIL definition */
-#define FAIL(x) do { printk_spew(x); return -EINVAL; } while (0)
+#if 0
+#define FAIL(x) do { printk_debug(x); return -EINVAL; } while (0)
+#else
+#define FAIL(x) 
+#endif
 
 static int aty_valid_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
                            struct pll_ct *pll);
@@ -9,7 +13,7 @@ static int aty_dsp_gt(const struct fb_info_aty *info, u32 bpp,
                      struct pll_ct *pll);
 static int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
                             u8 bpp, union aty_pll *pll);
-#if 0
+#if PLL_CRTC_DECODE==1
 static u32 aty_pll_ct_to_var(const struct fb_info_aty *info,
                             const union aty_pll *pll);
 #endif
@@ -281,7 +285,8 @@ int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
     aty_calc_pll_ct(info, &pll->ct);
     return 0;
 }
-#if 0
+#if CONFIG_CONSOLE_BTEXT==1
+#if PLL_CRTC_DECODE==1
 u32 aty_pll_ct_to_var(const struct fb_info_aty *info,
                             const union aty_pll *pll)
 {
@@ -362,3 +367,5 @@ static struct aty_pll_ops aty_pll_ct = {
 #endif
 };
 #endif
+
+#endif /* CONFIG_CONSOLE_BTEXT */