Recent git broken in drivers/bios_emulator?

Is recent git broken in drivers/bios_emulator?

For make omap5912osk_config I get

arm-linux-gcc -g -Os -fno-strict-aliasing -fno-common -ffixed-r8
-msoft-float -D__KERNEL__ -DTEXT_BASE=0x11080000 -I/home/bmd2hi/omap_linux/davinci/uboot/uboot-omap/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/arm/arm-linux_4_1_0/bin/../lib/gcc/arm-linux/4.1.0/include -pipe
-DCONFIG_ARM -D__ARM__ -march=armv4 -mabi=apcs-gnu -Wall
-Wstrict-prototypes -I. -I./include -I./x86emu -I/home/bmd2hi/omap_linux/davinci/uboot/uboot-omap/include -D__PPC__ -D__BIG_ENDIAN__ -c -o besys.o besys.c
besys.c: In function 'BE_memaddr':
besys.c:95: warning: pointer targets in return differ in signedness besys.c: In function 'BE_inb':
besys.c:564: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)
besys.c:564: error: (Each undeclared identifier is reported only once besys.c:564: error: for each function it appears in.) besys.c: In function 'BE_inw':
besys.c:606: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)
besys.c: In function 'BE_inl':
besys.c:633: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)
besys.c: In function 'BE_outb':
besys.c:665: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)
besys.c: In function 'BE_outw':
besys.c:692: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)
besys.c: In function 'BE_outl':
besys.c:715: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)

Removing besys.o from drivers/bios_emulator/Makefile results in

arm-linux-gcc -g -Os -fno-strict-aliasing -fno-common -ffixed-r8
-msoft-float -D__KERNEL__ -DTEXT_BASE=0x11080000 -I/home/bmd2hi/omap_linux/davinci/uboot/uboot-omap/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/arm/arm-linux_4_1_0/bin/../lib/gcc/arm-linux/4.1.0/include -pipe
-DCONFIG_ARM -D__ARM__ -march=armv4 -mabi=apcs-gnu -Wall
-Wstrict-prototypes -I. -I./include -I./x86emu -I/home/bmd2hi/omap_linux/davinci/uboot/uboot-omap/include -D__PPC__ -D__BIG_ENDIAN__ -c -o bios.o bios.c
bios.c: In function 'int42':
bios.c:77: error: 'VIDEO_IO_OFFSET' undeclared (first use in this function)
bios.c:77: error: (Each undeclared identifier is reported only once bios.c:77: error: for each function it appears in.)

Removing bios.o as well will then do the trick.

Best regards

Dirk

...

Argh. I specifically asked Jason before he sent out his patches to watch out for these cases and to guard all of the BIOS_EMU code with a CONFIG_HAS_BIOS_EMU sort of #if defined() for just exactly these sorts of problems.

*sigh*

Sorry.

jdl

...

..

A quick hackish patch for this below. For anybody who doesn't need bios emulator and want their stuff to compile.

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bios_emulator_patch.txt
Url: http://lists.denx.de/pipermail/u-boot/attachments/20070807/fc04bab4/attachment.txt