From dec0823852830fda6e12144806f8b55be3ecc8bc Mon Sep 17 00:00:00 2001
From: Martin Kojtal <martin.kojtal@arm.com>
Date: Tue, 25 Aug 2020 12:34:01 +0100
Subject: [PATCH 1/2] cmake: fix sd component recent dir structure

---
 storage/blockdevice/COMPONENT_SD/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/blockdevice/COMPONENT_SD/CMakeLists.txt b/storage/blockdevice/COMPONENT_SD/CMakeLists.txt
index 5129221913d..f4b71510e99 100644
--- a/storage/blockdevice/COMPONENT_SD/CMakeLists.txt
+++ b/storage/blockdevice/COMPONENT_SD/CMakeLists.txt
@@ -3,10 +3,11 @@
 
 target_sources(mbed-os
     PRIVATE
-        SDBlockDevice.cpp
+        source/SDBlockDevice.cpp
 )
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        include
+        include/SD
 )

From 9fa95eee15d05513e73a58df3b2ef23ce849ed0d Mon Sep 17 00:00:00 2001
From: Martin Kojtal <martin.kojtal@arm.com>
Date: Tue, 25 Aug 2020 13:50:13 +0100
Subject: [PATCH 2/2] CMake: Fix blockdevice components source and include
 paths

This file paths were updated on master and this was broken after
rebasing.
---
 storage/blockdevice/COMPONENT_DATAFLASH/CMakeLists.txt | 5 +++--
 storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt  | 5 ++---
 storage/blockdevice/COMPONENT_I2CEE/CMakeLists.txt     | 5 +++--
 storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt     | 5 ++---
 storage/blockdevice/COMPONENT_SPIF/CMakeLists.txt      | 5 +++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/storage/blockdevice/COMPONENT_DATAFLASH/CMakeLists.txt b/storage/blockdevice/COMPONENT_DATAFLASH/CMakeLists.txt
index 8022392cef4..e9c2978ea28 100644
--- a/storage/blockdevice/COMPONENT_DATAFLASH/CMakeLists.txt
+++ b/storage/blockdevice/COMPONENT_DATAFLASH/CMakeLists.txt
@@ -3,10 +3,11 @@
 
 target_sources(mbed-os
     PRIVATE
-        DataFlashBlockDevice.cpp
+        source/DataFlashBlockDevice.cpp
 )
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        include
+        include/DataFlash
 )
diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt b/storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt
index 598d9e084d3..ab86ba24b3c 100644
--- a/storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt
+++ b/storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt
@@ -3,9 +3,8 @@
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/FlashIAP
+        include
+        include/FlashIAP
 )
 
 target_sources(mbed-os
diff --git a/storage/blockdevice/COMPONENT_I2CEE/CMakeLists.txt b/storage/blockdevice/COMPONENT_I2CEE/CMakeLists.txt
index be7083dce06..14cf2cd0638 100644
--- a/storage/blockdevice/COMPONENT_I2CEE/CMakeLists.txt
+++ b/storage/blockdevice/COMPONENT_I2CEE/CMakeLists.txt
@@ -3,10 +3,11 @@
 
 target_sources(mbed-os
     PRIVATE
-        I2CEEBlockDevice.cpp
+        source/I2CEEBlockDevice.cpp
 )
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        include
+        include/I2CEE
 )
diff --git a/storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt b/storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt
index 2b896b97c2e..474b0a88b9e 100644
--- a/storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt
+++ b/storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt
@@ -3,9 +3,8 @@
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/QSPIF
+        include
+        include/QSPIF
 )
 
 target_sources(mbed-os
diff --git a/storage/blockdevice/COMPONENT_SPIF/CMakeLists.txt b/storage/blockdevice/COMPONENT_SPIF/CMakeLists.txt
index 4f8bf18811b..a664270e493 100644
--- a/storage/blockdevice/COMPONENT_SPIF/CMakeLists.txt
+++ b/storage/blockdevice/COMPONENT_SPIF/CMakeLists.txt
@@ -3,10 +3,11 @@
 
 target_sources(mbed-os
     PRIVATE
-        SPIFBlockDevice.cpp
+        source/SPIFBlockDevice.cpp
 )
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        include
+        include/SPIF
 )