Re: cvs commit: src/sys/boot/pc98/libpc98 biossmap.c

[Ruslan Ermilov]

On Thu, Nov 09, 2006 at 08:28:02AM +0000, Takahashi Yoshihiro wrote:
> nyan        2006-11-09 08:28:02 UTC
> 
>   FreeBSD src repository
> 
>   Added files:
>     sys/boot/pc98/libpc98 biossmap.c 
>   Log:
>   Add a stub of bios_addsmapdata().  PC98 does not have BIOS SMAP.
>   
>   Revision  Changes    Path
>   1.1       +38 -0     src/sys/boot/pc98/libpc98/biossmap.c (new)
> 
How about removing this and committing an attached patch instead?


Cheers,
-- 
Ruslan Ermilov
[EMAIL PROTECTED]
FreeBSD committer

Index: i386/libi386/bootinfo32.c
===================================================================
RCS file: /home/ncvs/src/sys/boot/i386/libi386/bootinfo32.c,v
retrieving revision 1.37
diff -u -p -r1.37 bootinfo32.c
--- i386/libi386/bootinfo32.c   2 Nov 2006 01:23:17 -0000       1.37
+++ i386/libi386/bootinfo32.c   9 Nov 2006 10:41:52 -0000
@@ -219,7 +219,9 @@ bi_load32(char *args, int *howtop, int *
     file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
     file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp);
     file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend);
+#ifndef PC98
     bios_addsmapdata(kfp);
+#endif
 
     /* Figure out the size and location of the metadata */
     *modulep = addr;
Index: pc98/libpc98/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/boot/pc98/libpc98/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- pc98/libpc98/Makefile       11 Apr 2006 20:11:30 -0000      1.24
+++ pc98/libpc98/Makefile       9 Nov 2006 10:41:18 -0000
@@ -5,11 +5,13 @@ INTERNALLIB=
 
 .PATH: ${.CURDIR}/../../i386/libi386
 
-SRCS=  bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \
+SRCS=  bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c \
        bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \
        i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
        time.c vidconsole.c
 
+CFLAGS+=       -DPC98
+
 BOOT_COMCONSOLE_PORT?= 0x238
 CFLAGS+=       -DCOMPORT=${BOOT_COMCONSOLE_PORT}
 

pgpVM86J0d7qy.pgp
Description: PGP signature