From 35fc713931e3f48b2a8e9f530f5ebfa078753367 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 14 Feb 2017 08:50:37 -1000 Subject: [PATCH] Kinetis K64 and K66 share mpu files --- .../chip/{kinetis_k64mpu.h => kinetis_k64k66mpu.h} | 13 +++++++------ arch/arm/src/kinetis/chip/kinetis_mpu.h | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) rename arch/arm/src/kinetis/chip/{kinetis_k64mpu.h => kinetis_k64k66mpu.h} (98%) diff --git a/arch/arm/src/kinetis/chip/kinetis_k64mpu.h b/arch/arm/src/kinetis/chip/kinetis_k64k66mpu.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_k64mpu.h rename to arch/arm/src/kinetis/chip/kinetis_k64k66mpu.h index 808ff15be22..5c9d22ccc63 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k64mpu.h +++ b/arch/arm/src/kinetis/chip/kinetis_k64k66mpu.h @@ -1,8 +1,9 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/kinetis_mpu.h + * arch/arm/src/kinetis/chip/kinetis_k64k66mpu.h * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. + * Authors: Gregory Nutt + * David Sidrane * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H -#define __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H +#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64K66MPU_H +#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64K66MPU_H /**************************************************************************************************** * Included Files @@ -355,4 +356,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64K66MPU_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_mpu.h b/arch/arm/src/kinetis/chip/kinetis_mpu.h index 1faa605d75b..50a4593238e 100644 --- a/arch/arm/src/kinetis/chip/kinetis_mpu.h +++ b/arch/arm/src/kinetis/chip/kinetis_mpu.h @@ -50,8 +50,8 @@ #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60) # include "chip/kinetis_k20k40k60mpu.h" -#elif defined(KINETIS_K64) -# include "chip/kinetis_k64mpu.h" +#elif defined(KINETIS_K64) || defined(KINETIS_K66) +# include "chip/kinetis_k64k66mpu.h" #else # error "No MPU definitions for this Kinetis part" #endif