forked from Minki/linux
e88f157de5
The build is broken with CONFIG_PPC32=y, CONFIG_FB_VGA16=y and
CONFIG_VGA_CONSOLE=n.
The problem is that vgacon_remap_base is not defined. It's used in:
#define VGA_MAP_MEM(x,s) (x + vgacon_remap_base)
Which is used in the vga16fb.c code.
Digging down it seems vgacon_remap_base is never initialised. It used to
be, back in arch/ppc (pplus.c and prep_setup.c), but none of that code
ever made it to arch/powerpc.
So given it's been unused for >6 years, remove it.
Whether vga16fb.c works on 32-bit is another question, but this patch
shouldn't affect it.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
52 lines
1.0 KiB
C
52 lines
1.0 KiB
C
#ifndef _ASM_POWERPC_VGA_H_
|
|
#define _ASM_POWERPC_VGA_H_
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
* Access to VGA videoram
|
|
*
|
|
* (c) 1998 Martin Mares <mj@ucw.cz>
|
|
*/
|
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
|
|
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE)
|
|
|
|
#define VT_BUF_HAVE_RW
|
|
/*
|
|
* These are only needed for supporting VGA or MDA text mode, which use little
|
|
* endian byte ordering.
|
|
* In other cases, we can optimize by using native byte ordering and
|
|
* <linux/vt_buffer.h> has already done the right job for us.
|
|
*/
|
|
|
|
static inline void scr_writew(u16 val, volatile u16 *addr)
|
|
{
|
|
st_le16(addr, val);
|
|
}
|
|
|
|
static inline u16 scr_readw(volatile const u16 *addr)
|
|
{
|
|
return ld_le16(addr);
|
|
}
|
|
|
|
#define VT_BUF_HAVE_MEMCPYW
|
|
#define scr_memcpyw memcpy
|
|
|
|
#endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */
|
|
|
|
#ifdef __powerpc64__
|
|
#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap((x), s))
|
|
#else
|
|
#define VGA_MAP_MEM(x,s) (x)
|
|
#endif
|
|
|
|
#define vga_readb(x) (*(x))
|
|
#define vga_writeb(x,y) (*(y) = (x))
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_VGA_H_ */
|