2005-02-02 Yoshinori K. Okuji <okuji@enbug.org>
* stage2/smp-imps.h (imps_any_new_apics): Removed. (imps_enabled): Likewise. (imps_lapic_addr): Likewise. (imps_num_cpus): Likewise. (imps_cpu_apic_map): Likewise. (imps_apic_cpu_map): Likewise. * stage2/Makefile.am (libgrub_a_CFLAGS): Remove -fwritable-strings. Not required for the grub shell actually. * grub/Makefile.am (AM_CFLAGS): Likewise.
This commit is contained in:
parent
ac1ef04cde
commit
660e9c195f
7 changed files with 37 additions and 37 deletions
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
||||||
|
2005-02-02 Yoshinori K. Okuji <okuji@enbug.org>
|
||||||
|
|
||||||
|
* stage2/smp-imps.h (imps_any_new_apics): Removed.
|
||||||
|
(imps_enabled): Likewise.
|
||||||
|
(imps_lapic_addr): Likewise.
|
||||||
|
(imps_num_cpus): Likewise.
|
||||||
|
(imps_cpu_apic_map): Likewise.
|
||||||
|
(imps_apic_cpu_map): Likewise.
|
||||||
|
|
||||||
|
* stage2/Makefile.am (libgrub_a_CFLAGS): Remove
|
||||||
|
-fwritable-strings. Not required for the grub shell actually.
|
||||||
|
|
||||||
|
* grub/Makefile.am (AM_CFLAGS): Likewise.
|
||||||
|
|
||||||
2005-02-01 Yoshinori K. Okuji <okuji@enbug.org>
|
2005-02-01 Yoshinori K. Okuji <okuji@enbug.org>
|
||||||
|
|
||||||
* grub/asmstub.c (grub_stage2): Use auto instead of static for
|
* grub/asmstub.c (grub_stage2): Use auto instead of static for
|
||||||
|
|
|
@ -13,7 +13,7 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
|
||||||
$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
|
$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
|
||||||
-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
|
-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
|
||||||
|
|
||||||
AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings
|
AM_CFLAGS = $(GRUB_CFLAGS)
|
||||||
|
|
||||||
grub_SOURCES = main.c asmstub.c
|
grub_SOURCES = main.c asmstub.c
|
||||||
grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
|
grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
|
||||||
|
|
|
@ -185,7 +185,7 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
|
||||||
$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
|
$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
|
||||||
-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
|
-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
|
||||||
|
|
||||||
AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings
|
AM_CFLAGS = $(GRUB_CFLAGS)
|
||||||
grub_SOURCES = main.c asmstub.c
|
grub_SOURCES = main.c asmstub.c
|
||||||
grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
|
grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
|
||||||
all: all-am
|
all: all-am
|
||||||
|
|
|
@ -24,8 +24,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
|
||||||
-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
|
-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
|
||||||
-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
|
-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
|
||||||
-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
|
-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
|
||||||
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \
|
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
|
||||||
-fwritable-strings
|
|
||||||
|
|
||||||
# Stage 2 and Stage 1.5's.
|
# Stage 2 and Stage 1.5's.
|
||||||
pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||||
|
|
|
@ -579,8 +579,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
|
||||||
-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
|
-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
|
||||||
-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
|
-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
|
||||||
-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
|
-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
|
||||||
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \
|
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
|
||||||
-fwritable-strings
|
|
||||||
|
|
||||||
@DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
|
@DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
|
||||||
@DISKLESS_SUPPORT_FALSE@ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
|
@DISKLESS_SUPPORT_FALSE@ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* GRUB -- GRand Unified Bootloader
|
* GRUB -- GRand Unified Bootloader
|
||||||
* Copyright (C) 1999 Free Software Foundation, Inc.
|
* Copyright (C) 1999,2005 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -249,13 +249,31 @@ defconfig =
|
||||||
* Exported globals here.
|
* Exported globals here.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* "imps_any_new_apics" is non-zero if any of the APICS (local or I/O)
|
||||||
|
* are *not* an 82489DX. This is useful to determine if more than 15
|
||||||
|
* CPUs can be supported (true if zero).
|
||||||
|
*/
|
||||||
static int imps_any_new_apics = 0;
|
static int imps_any_new_apics = 0;
|
||||||
#if 0
|
#if 0
|
||||||
volatile int imps_release_cpus = 0;
|
volatile int imps_release_cpus = 0;
|
||||||
#endif
|
#endif
|
||||||
|
/*
|
||||||
|
* "imps_enabled" is non-zero if the probe sequence found IMPS
|
||||||
|
* information and was successful.
|
||||||
|
*/
|
||||||
static int imps_enabled = 0;
|
static int imps_enabled = 0;
|
||||||
|
/*
|
||||||
|
* This represents the number of CPUs found.
|
||||||
|
*/
|
||||||
static int imps_num_cpus = 1;
|
static int imps_num_cpus = 1;
|
||||||
|
/*
|
||||||
|
* This contains the local APIC hardware address.
|
||||||
|
*/
|
||||||
static unsigned imps_lapic_addr = ((unsigned) (&lapic_dummy)) - LAPIC_ID;
|
static unsigned imps_lapic_addr = ((unsigned) (&lapic_dummy)) - LAPIC_ID;
|
||||||
|
/*
|
||||||
|
* These map from virtual cpu numbers to APIC id's and back.
|
||||||
|
*/
|
||||||
static unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
|
static unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
|
||||||
static unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];
|
static unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];
|
||||||
|
|
||||||
|
|
|
@ -182,36 +182,6 @@ struct imps_interrupt
|
||||||
* Exported globals here.
|
* Exported globals here.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* "imps_any_new_apics" is non-zero if any of the APICS (local or I/O)
|
|
||||||
* are *not* an 82489DX. This is useful to determine if more than 15
|
|
||||||
* CPUs can be supported (true if zero).
|
|
||||||
*/
|
|
||||||
extern int imps_any_new_apics;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* "imps_enabled" is non-zero if the probe sequence found IMPS
|
|
||||||
* information and was successful.
|
|
||||||
*/
|
|
||||||
extern int imps_enabled;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This contains the local APIC hardware address.
|
|
||||||
*/
|
|
||||||
extern unsigned imps_lapic_addr;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This represents the number of CPUs found.
|
|
||||||
*/
|
|
||||||
extern int imps_num_cpus;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These map from virtual cpu numbers to APIC id's and back.
|
|
||||||
*/
|
|
||||||
extern unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
|
|
||||||
extern unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is the primary function for probing for Intel MPS 1.1/1.4
|
* This is the primary function for probing for Intel MPS 1.1/1.4
|
||||||
* compatible hardware and BIOS information. While probing the CPUs
|
* compatible hardware and BIOS information. While probing the CPUs
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue