Author: jhb
Date: Sun Apr 3 23:03:54 2016
New Revision: 297530
URL: https://svnweb.freebsd.org/changeset/base/297530
Log:
Move i386/i386/autoconf.c to sys/x86/x86 and use it on both amd64 and i386.
Added:
head/sys/x86/x86/autoconf.c
- copied, changed from r297529, head/sys/i386/i386/autoconf.c
Deleted:
head/sys/amd64/amd64/autoconf.c
head/sys/i386/i386/autoconf.c
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/files.pc98
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Sun Apr 3 20:29:21 2016 (r297529)
+++ head/sys/conf/files.amd64 Sun Apr 3 23:03:54 2016 (r297530)
@@ -104,7 +104,6 @@ acpi_wakedata.h optional acpi
\
amd64/amd64/amd64_mem.c optional mem
#amd64/amd64/apic_vector.S standard
amd64/amd64/atomic.c standard
-amd64/amd64/autoconf.c standard
amd64/amd64/bios.c standard
amd64/amd64/bpf_jit_machdep.c optional bpf_jitter
amd64/amd64/cpu_switch.S standard
@@ -596,6 +595,7 @@ x86/isa/nmi.c standard
x86/isa/orm.c optional isa
x86/pci/pci_bus.c optional pci
x86/pci/qpi.c optional pci
+x86/x86/autoconf.c standard
x86/x86/bus_machdep.c standard
x86/x86/busdma_bounce.c standard
x86/x86/busdma_machdep.c standard
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Sun Apr 3 20:29:21 2016 (r297529)
+++ head/sys/conf/files.i386 Sun Apr 3 23:03:54 2016 (r297530)
@@ -452,7 +452,6 @@ i386/bios/smapi_bios.S optional smapi
#i386/i386/apic_vector.s optional apic
i386/i386/atomic.c standard \
compile-with "${CC} -c ${CFLAGS}
${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/i386/autoconf.c standard
i386/i386/bios.c standard
i386/i386/bioscall.s standard
i386/i386/bpf_jit_machdep.c optional bpf_jitter
@@ -591,6 +590,7 @@ x86/isa/nmi.c standard
x86/isa/orm.c optional isa
x86/pci/pci_bus.c optional pci
x86/pci/qpi.c optional pci
+x86/x86/autoconf.c standard
x86/x86/bus_machdep.c standard
x86/x86/busdma_bounce.c standard
x86/x86/busdma_machdep.c standard
Modified: head/sys/conf/files.pc98
==============================================================================
--- head/sys/conf/files.pc98 Sun Apr 3 20:29:21 2016 (r297529)
+++ head/sys/conf/files.pc98 Sun Apr 3 23:03:54 2016 (r297530)
@@ -147,7 +147,6 @@ i386/bios/apm.c optional apm
#i386/i386/apic_vector.s optional apic
i386/i386/atomic.c standard \
compile-with "${CC} -c ${CFLAGS}
${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/i386/autoconf.c standard
i386/i386/bios.c standard
i386/i386/bioscall.s standard
i386/i386/bpf_jit_machdep.c optional bpf_jitter
@@ -258,6 +257,7 @@ x86/isa/atpic.c optional atpic
x86/isa/clock.c standard
x86/isa/isa.c optional isa
x86/pci/pci_bus.c optional pci
+x86/x86/autoconf.c standard
x86/x86/busdma_bounce.c standard
x86/x86/busdma_machdep.c standard
x86/x86/cpu_machdep.c standard
Copied and modified: head/sys/x86/x86/autoconf.c (from r297529,
head/sys/i386/i386/autoconf.c)
==============================================================================
--- head/sys/i386/i386/autoconf.c Sun Apr 3 20:29:21 2016
(r297529, copy source)
+++ head/sys/x86/x86/autoconf.c Sun Apr 3 23:03:54 2016 (r297530)
@@ -65,7 +65,9 @@ __FBSDID("$FreeBSD$");
#include <net/ethernet.h>
#include <netinet/in.h>
+#ifdef PC98
#include <machine/bootinfo.h>
+#endif
#include <machine/md_var.h>
#ifdef DEV_ISA
@@ -92,7 +94,7 @@ configure_first(dummy)
void *dummy;
{
- /* nexus0 is the top of the i386 device tree */
+ /* nexus0 is the top of the x86 device tree */
device_add_child(root_bus, "nexus", 0);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
