From 7f0ab527e3a47037c227dd46cb290af070ff0aab Mon Sep 17 00:00:00 2001
From: "Charles E. Youse" <charles.youse@intel.com>
Date: Fri, 28 Jun 2019 09:41:39 -0700
Subject: [PATCH] arch/x86: move 32-bit linker script to ia32/ directory

No functional changes. All references in soc/ are updated.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
---
 include/arch/x86/{ => ia32}/linker.ld     | 0
 soc/x86/apollo_lake/linker.ld             | 9 +--------
 soc/x86/atom/linker.ld                    | 2 +-
 soc/x86/ia32/linker.ld                    | 2 +-
 soc/x86/intel_quark/quark_se/linker.ld    | 2 +-
 soc/x86/intel_quark/quark_x1000/linker.ld | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)
 rename include/arch/x86/{ => ia32}/linker.ld (100%)

diff --git a/include/arch/x86/linker.ld b/include/arch/x86/ia32/linker.ld
similarity index 100%
rename from include/arch/x86/linker.ld
rename to include/arch/x86/ia32/linker.ld
diff --git a/soc/x86/apollo_lake/linker.ld b/soc/x86/apollo_lake/linker.ld
index dc7f6ff63c9..5afcb726435 100644
--- a/soc/x86/apollo_lake/linker.ld
+++ b/soc/x86/apollo_lake/linker.ld
@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @file
- * @brief Linker command/script file
- *
- * This is the linker script for both standard images and XIP images.
- */
-
 #include <autoconf.h>
 #include <generated_dts_board.h>
 /* physical address where the kernel is loaded */
@@ -44,5 +37,5 @@ MEMORY
 #endif
     }
 
-#include <arch/x86/linker.ld>
+#include <arch/x86/ia32/linker.ld>
 
diff --git a/soc/x86/atom/linker.ld b/soc/x86/atom/linker.ld
index dc7f6ff63c9..c71deac3478 100644
--- a/soc/x86/atom/linker.ld
+++ b/soc/x86/atom/linker.ld
@@ -44,5 +44,5 @@ MEMORY
 #endif
     }
 
-#include <arch/x86/linker.ld>
+#include <arch/x86/ia32/linker.ld>
 
diff --git a/soc/x86/ia32/linker.ld b/soc/x86/ia32/linker.ld
index 56a5232b804..b7c9b42ec58 100644
--- a/soc/x86/ia32/linker.ld
+++ b/soc/x86/ia32/linker.ld
@@ -43,5 +43,5 @@ MEMORY
     MMU_LIST	    : ORIGIN = 0xFFFF2000, LENGTH = 1K
     }
 
-#include <arch/x86/linker.ld>
+#include <arch/x86/ia32/linker.ld>
 
diff --git a/soc/x86/intel_quark/quark_se/linker.ld b/soc/x86/intel_quark/quark_se/linker.ld
index 594b9795847..eca933f8fe1 100644
--- a/soc/x86/intel_quark/quark_se/linker.ld
+++ b/soc/x86/intel_quark/quark_se/linker.ld
@@ -69,5 +69,5 @@ MEMORY
     MMU_LIST	    : ORIGIN = 4k, LENGTH = 1K
     }
 
-#include <arch/x86/linker.ld>
+#include <arch/x86/ia32/linker.ld>
 
diff --git a/soc/x86/intel_quark/quark_x1000/linker.ld b/soc/x86/intel_quark/quark_x1000/linker.ld
index e64c3df231b..e0f2bc666ae 100644
--- a/soc/x86/intel_quark/quark_x1000/linker.ld
+++ b/soc/x86/intel_quark/quark_x1000/linker.ld
@@ -42,5 +42,5 @@ MEMORY
     IDT_LIST        : ORIGIN = 2K, LENGTH = 2K
     }
 
-#include <arch/x86/linker.ld>
+#include <arch/x86/ia32/linker.ld>