diff options
| author | marcel <marcel@FreeBSD.org> | 2012-07-02 21:25:24 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2012-07-02 21:25:24 +0000 |
| commit | 027ab2407dfe5b87fdda1863623f97303e4d236b (patch) | |
| tree | ad9b1646fb7ceeb3b1e3045a1499e2fc6855871e /sys/powerpc/conf | |
| parent | d03048e85374bd7f304f38a595afbfcf907c4ccc (diff) | |
| download | FreeBSD-src-027ab2407dfe5b87fdda1863623f97303e4d236b.zip FreeBSD-src-027ab2407dfe5b87fdda1863623f97303e4d236b.tar.gz | |
Remove device uart_z8530 and options GEOM_PART_APM from DEFAULTS and instead
add them to GENERIC and GENERIC64. They are applicable to Apple H/W and not
at all for Book-E platforms.
Diffstat (limited to 'sys/powerpc/conf')
| -rw-r--r-- | sys/powerpc/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/powerpc/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/powerpc/conf/GENERIC64 | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS index 4faf6c1..9d933b3 100644 --- a/sys/powerpc/conf/DEFAULTS +++ b/sys/powerpc/conf/DEFAULTS @@ -8,9 +8,7 @@ device mem # Memory and kernel memory devices # UART chips on this platform device uart_ns8250 -device uart_z8530 -options GEOM_PART_APM options GEOM_PART_MBR options NEW_PCIB diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index bff88d6..4ca103a 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -49,6 +49,7 @@ options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options GEOM_PART_APM #Apple Partition Maps. options GEOM_PART_GPT #GUID Partition Tables. options GEOM_LABEL #Provides labelization options COMPAT_FREEBSD4 #Keep this for a while @@ -127,6 +128,7 @@ makeoptions SC_DFLT_FONT=cp437 # Serial (COM) ports device scc device uart +device uart_z8530 # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 112da64..e7577be 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -49,6 +49,7 @@ options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options GEOM_PART_APM #Apple Partition Maps. options GEOM_PART_GPT #GUID Partition Tables. options GEOM_LABEL #Provides labelization options COMPAT_FREEBSD32 #Compatible with FreeBSD/powerpc binaries @@ -125,6 +126,7 @@ makeoptions SC_DFLT_FONT=cp437 # Serial (COM) ports device scc device uart +device uart_z8530 # Ethernet hardware device glc # Sony Playstation 3 Ethernet |
