diff options
| author | Yinghai Lu <yinghailu@gmail.com> | 2004-04-28 05:37:36 +0000 |
|---|---|---|
| committer | Yinghai Lu <yinghailu@gmail.com> | 2004-04-28 05:37:36 +0000 |
| commit | 97c4947ec9af1664e81ee797834a32d3ca2f74fe (patch) | |
| tree | 33f41aaaf4c61c0b41ae4751081d2c369ee371b0 /src/drivers/ati/ragexl/atyfb.h | |
| parent | 48d11d557f725ecf89678a1b9df440417b8da225 (diff) | |
Changes for btext and etherboot and filo merge support
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1540 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/drivers/ati/ragexl/atyfb.h')
| -rw-r--r-- | src/drivers/ati/ragexl/atyfb.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/drivers/ati/ragexl/atyfb.h b/src/drivers/ati/ragexl/atyfb.h index 31092e2e16..16eb15295d 100644 --- a/src/drivers/ati/ragexl/atyfb.h +++ b/src/drivers/ati/ragexl/atyfb.h @@ -20,6 +20,8 @@ #define max(x,y) (x>=y)?x:y + +#if CONFIG_CONSOLE_BTEXT==1 /* * Elements of the hardware specific atyfb_par structure */ @@ -38,6 +40,7 @@ struct crtc { u32 dp_pix_width; /* acceleration */ u32 dp_chain_mask; /* acceleration */ }; +#endif /* CONFIG_CONSOLE_BTEXT */ #if 0 struct pll_514 { u8 m; @@ -83,7 +86,9 @@ union aty_pll { * The hardware parameters for each card */ struct atyfb_par { +#if CONFIG_CONSOLE_BTEXT==1 struct crtc crtc; +#endif union aty_pll pll; u32 accel_flags; }; @@ -105,7 +110,11 @@ struct aty_cursor { }; #endif struct fb_info_aty { +#if CONFIG_CONSOLE_BTEXT==1 +#if PLL_CRTC_DECODE==1 struct fb_info fb_info; +#endif +#endif #if 0 struct fb_info_aty *next; unsigned long ati_regbase_phys; @@ -125,7 +134,7 @@ struct fb_info_aty { struct { u8 red, green, blue, pad; } palette[256]; #endif struct atyfb_par default_par; -#if 0 +#if PLL_CRTC_DECODE==1 struct atyfb_par current_par; #endif |