Page MenuHomeFreeBSD

Move the identical x86 lines to files.x86
ClosedPublic

Authored by imp on Tue, Aug 13, 1:57 PM.

Details

Summary

Move all the identical x86 lines to files.x86. The non-identical ones should be
unified and moved as well, but that would require additional changes that would
need a more careful review and may not be MFCable, so I'll do them
separately. I'll delete the mildly snarky comment when things are unified.

Move all the hp* drivers too files.x86

The HPT drivers are all x86 only. Move them to files.x86. Because of the way we
run uudecode, we can use $M instead of needing entries for them in separate
files.

Apart from one MD file, aesni is common to x86. Move it into files.x86.

Move via padlock files to files.x86.

VIA Padlock support is for VIA C3, C7 and Eden processors, which are 64bit x86
processors.

The ACPI parts are identical between i386 and amd64

Apart from one MD file, ACPI is a x86 implementation, not specific to either
i386 or amd64, so put it into files.x86. Other architectures include fewer
files for the same options, so it can't move into the MI files file.

The bxe driver, QLogic NetXtreme II Ethernet 10Gb PCIe adapter driver, is x86 specific, and only builds there. Likewise the module is built there. Move it to the x86-only files.x86.

Move hyperv to files.x86

Move the comomon part of hyperv to files.x86.

Intel's isci is part of the chipset, so it is x86 specific.

Windows ndis support is x86 only. Move the MI parts there.

The x86 part of hwpmc is shared, so move it to files.x86.

Move the common x86 ipmi files to files.x86. The powerpc file list is different enough that unification will have to wait for the next pass.

Diff Detail

Repository
rS FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

imp created this revision.Tue, Aug 13, 1:57 PM
imp added a reviewer: jhb.Tue, Aug 13, 1:58 PM
jhb added a comment.Tue, Aug 13, 2:57 PM

There were several other things that looked like they were also identical (e.g. several agp drivers, all the atkbdc stuff, acpi_wmi_if.m). Those can be followup commits though.

sys/conf/files.i386
296 ↗(On Diff #60730)

I don't know that that comment is really warranted FWIW. APIC isn't really optional on amd64 but it is legitimately optional on i386.

imp added a comment.Tue, Aug 13, 2:59 PM
In D21248#461858, @jhb wrote:

There were several other things that looked like they were also identical (e.g. several agp drivers, all the atkbdc stuff, acpi_wmi_if.m). Those can be followup commits though.

Yup. I got to 300 line reduction and quit for the day and thought I'd get it into review.

sys/conf/files.i386
296 ↗(On Diff #60730)

We shouldn't configure them differently, even if it is always on. There's lots of things that are always on we wouldn't work without, but aren't 'standard'.

296 ↗(On Diff #60730)

I'll tone it down a bit though.

imp updated this revision to Diff 60734.Tue, Aug 13, 3:02 PM

minor comment fixing.

jhb added inline comments.Tue, Aug 13, 3:29 PM
sys/conf/files.i386
296 ↗(On Diff #60730)

Previously after DEFAULTS was first introduced I got a lot of grief for using it vs having things be 'standard', etc. :-P I would be happy to make more standard things optional by using DEFAULTS to turn them on by default though, esp. to reduce diffs between i386 and amd64.

imp added inline comments.Tue, Aug 13, 3:34 PM
sys/conf/files.i386
296 ↗(On Diff #60730)

Yea, that's exactly what I had in mind for phase 2. :)