Unflatten edk includes
Installing the edk headers into a folder requires us to do odd things
with imports, and either include headers with "..", or otherwise get the
include directories lined up.
Move the contents of edk/*.c/h up a level, and just simplify the include
structure. This is done to fix the immediate change of the prior patch
and make this build again. Happy to discuss other options.
Change-Id: I328f20bca6d23100993493445bee0e5e11d2866a
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/generator/sections/gen-section-ampere.c b/generator/sections/gen-section-ampere.c
index 85fa765..90c521c 100644
--- a/generator/sections/gen-section-ampere.c
+++ b/generator/sections/gen-section-ampere.c
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-arm.c b/generator/sections/gen-section-arm.c
index f4edc70..c98bf84 100644
--- a/generator/sections/gen-section-arm.c
+++ b/generator/sections/gen-section-arm.c
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
#define ARM_ERROR_INFO_SIZE 32
diff --git a/generator/sections/gen-section-ccix-per.c b/generator/sections/gen-section-ccix-per.c
index f35f505..7323427 100644
--- a/generator/sections/gen-section-ccix-per.c
+++ b/generator/sections/gen-section-ccix-per.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-cxl-component.c b/generator/sections/gen-section-cxl-component.c
index 602dd19..6d702b4 100644
--- a/generator/sections/gen-section-cxl-component.c
+++ b/generator/sections/gen-section-cxl-component.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-cxl-protocol.c b/generator/sections/gen-section-cxl-protocol.c
index 076de96..424366d 100644
--- a/generator/sections/gen-section-cxl-protocol.c
+++ b/generator/sections/gen-section-cxl-protocol.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-dmar.c b/generator/sections/gen-section-dmar.c
index e7916be..e0ac603 100644
--- a/generator/sections/gen-section-dmar.c
+++ b/generator/sections/gen-section-dmar.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-firmware.c b/generator/sections/gen-section-firmware.c
index bc17fb2..dd2d69d 100644
--- a/generator/sections/gen-section-firmware.c
+++ b/generator/sections/gen-section-firmware.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-generic.c b/generator/sections/gen-section-generic.c
index 743c40e..02e2ee5 100644
--- a/generator/sections/gen-section-generic.c
+++ b/generator/sections/gen-section-generic.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-ia32x64.c b/generator/sections/gen-section-ia32x64.c
index 0e96d31..e1fb60d 100644
--- a/generator/sections/gen-section-ia32x64.c
+++ b/generator/sections/gen-section-ia32x64.c
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
-#include "../../edk/Cper.h"
+#include "../../Cper.h"
#include "../gen-utils.h"
#include "gen-section.h"
#define IA32X64_ERROR_STRUCTURE_SIZE 64
diff --git a/generator/sections/gen-section-memory.c b/generator/sections/gen-section-memory.c
index cecb319..b573dbd 100644
--- a/generator/sections/gen-section-memory.c
+++ b/generator/sections/gen-section-memory.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-nvidia.c b/generator/sections/gen-section-nvidia.c
index 0cb4cb4..a505089 100644
--- a/generator/sections/gen-section-nvidia.c
+++ b/generator/sections/gen-section-nvidia.c
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <string.h>
#include <stdio.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-pci-bus.c b/generator/sections/gen-section-pci-bus.c
index ebdeb7e..decfb53 100644
--- a/generator/sections/gen-section-pci-bus.c
+++ b/generator/sections/gen-section-pci-bus.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-pci-dev.c b/generator/sections/gen-section-pci-dev.c
index 6182b1c..58ae95e 100644
--- a/generator/sections/gen-section-pci-dev.c
+++ b/generator/sections/gen-section-pci-dev.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section-pcie.c b/generator/sections/gen-section-pcie.c
index 3547f1d..611ef62 100644
--- a/generator/sections/gen-section-pcie.c
+++ b/generator/sections/gen-section-pcie.c
@@ -5,7 +5,7 @@
**/
#include <stdlib.h>
-#include "../../edk/BaseTypes.h"
+#include "../../BaseTypes.h"
#include "../gen-utils.h"
#include "gen-section.h"
diff --git a/generator/sections/gen-section.h b/generator/sections/gen-section.h
index 1c6e227..6ce5a88 100644
--- a/generator/sections/gen-section.h
+++ b/generator/sections/gen-section.h
@@ -6,7 +6,7 @@
#endif
#include <stdlib.h>
-#include "../../edk/Cper.h"
+#include "../../Cper.h"
//Section generator function predefinitions.
size_t generate_section_generic(void **location);