From 7704f1a6e3d9bceb2b3d2ae516aa66ff47069c20 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 7 Dec 2017 09:07:14 +0100
Subject: bsps/or1k: Avoid <libcpu/cache.h>

Update #3254.
---
 c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c | 5 ++---
 c/src/lib/libcpu/or1k/shared/cache/cache.c            | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c b/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c
index 2bf417a044..35a536ef0b 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c
+++ b/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c
@@ -16,10 +16,9 @@
 
 #include <bsp.h>
 #include <bsp/bootcard.h>
-#include <libcpu/cache.h>
 
 void bsp_start( void )
 {
-  _CPU_cache_enable_instruction();
-  _CPU_cache_enable_data();
+  rtems_cache_enable_instruction();
+  rtems_cache_enable_data();
 }
diff --git a/c/src/lib/libcpu/or1k/shared/cache/cache.c b/c/src/lib/libcpu/or1k/shared/cache/cache.c
index 47bc8f814d..898955f041 100644
--- a/c/src/lib/libcpu/or1k/shared/cache/cache.c
+++ b/c/src/lib/libcpu/or1k/shared/cache/cache.c
@@ -18,8 +18,7 @@
 #include <rtems/score/interr.h>
 #include <rtems/score/or1k-utility.h>
 #include <rtems/score/percpu.h>
-#include <libcpu/cache.h>
-#include <cache_.h>
+#include "cache_.h"
 
 static inline void _CPU_OR1K_Cache_data_block_prefetch(const void *d_addr)
 {
-- 
cgit v1.2.3