From eec4d6c02731c54b0bb31053c7517dae8498e8aa Mon Sep 17 00:00:00 2001 From: mmel Date: Fri, 29 Jan 2016 10:31:54 +0000 Subject: 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. --- sys/conf/files.arm | 3 +-- sys/conf/options.arm | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'sys/conf') 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 -- cgit v1.1