diff options
| author | mmel <mmel@FreeBSD.org> | 2016-01-29 10:31:54 +0000 |
|---|---|---|
| committer | mmel <mmel@FreeBSD.org> | 2016-01-29 10:31:54 +0000 |
| commit | eec4d6c02731c54b0bb31053c7517dae8498e8aa (patch) | |
| tree | fea063924632398a9b978c5e11bc4a13f90572b9 /sys/conf | |
| parent | 46cf14d7bf24ebbb83d9692b2acabdb324575f1b (diff) | |
| download | FreeBSD-src-eec4d6c02731c54b0bb31053c7517dae8498e8aa.zip FreeBSD-src-eec4d6c02731c54b0bb31053c7517dae8498e8aa.tar.gz | |
ARM: remove old pmap-v6 code. The new pmap-v6 is mature enough, and
dual implementation is showstopper for major cleanup.
This patch only removes old code from tree. Cleanups will follow asap.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.arm | 3 | ||||
| -rw-r--r-- | sys/conf/options.arm | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 33bdd94..67b94df 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -64,8 +64,7 @@ arm/arm/pl310.c optional pl310 arm/arm/platform.c optional platform arm/arm/platform_if.m optional platform arm/arm/pmap.c optional !armv6 -arm/arm/pmap-v6.c optional armv6 !arm_new_pmap -arm/arm/pmap-v6-new.c optional armv6 arm_new_pmap +arm/arm/pmap-v6-new.c optional armv6 arm/arm/pmu.c optional pmu | fdt hwpmc arm/arm/sc_machdep.c optional sc arm/arm/setcpsr.S standard diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 8720ac2..ef66413 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -5,7 +5,6 @@ ARM_INTRNG opt_global.h ARM_KERN_DIRECTMAP opt_vm.h ARM_L2_PIPT opt_global.h ARM_MANY_BOARD opt_global.h -ARM_NEW_PMAP opt_global.h NKPT2PG opt_pmap.h ARM_WANT_TP_ADDRESS opt_global.h COUNTS_PER_SEC opt_timer.h |
