x86: remove unused linker-defs-arch.h

Change-Id: Ib57cced30569adf2ae72f32d27baf30a5ca4fe71
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>

3 files changed, 10 insertions, 61 deletions

diff --git a/include/arch/x86/linker-common-sections.h b/include/arch/x86/linker-common-sections.h
index c4171ff9f..cb3c343ad 100644
--- a/include/arch/x86/linker-common-sections.h
+++ b/include/arch/x86/linker-common-sections.h
@@ -123,11 +123,17 @@ SECTIONS
 	*(.rodata)
 	*(".rodata.*")
 	*(.gnu.linkonce.r.*)
-	IDT_MEMORY
+
+	. = ALIGN(8);
+	_idt_base_address = .;
+	KEEP(*(staticIdt))
 
 #ifndef CONFIG_X86_FIXED_IRQ_MAPPING
-	IRQ_TO_INTERRUPT_VECTOR_MEMORY
+	. = ALIGN(4);
+	_irq_to_interrupt_vector = .;
+	KEEP(*(irq_int_vector_map))
 #endif
+
 	KEXEC_PGALIGN_PAD(MMU_PAGE_SIZE)
 	} GROUP_LINK_IN(ROMABLE_REGION)
 
@@ -254,8 +260,7 @@ SECTIONS
 	 */
 	*(.noinit)
 	*(".noinit.*")
-
-	INT_STUB_NOINIT
+	KEEP(*(.intStubSect))
 	} GROUP_LINK_IN(RAM)
 
 	/* Define linker symbols */
diff --git a/include/arch/x86/linker-defs-arch.h b/include/arch/x86/linker-defs-arch.h
deleted file mode 100644
index 99750b66c..000000000
--- a/include/arch/x86/linker-defs-arch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2013-2014 Wind River Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief Intel commonly used macro and defines for linker script
- *
- * Commonly used macros and defines for linker script.
- */
-#ifndef _LINKERDEFSARCH_H
-#define _LINKERDEFSARCH_H
-
-#include <toolchain.h>
-
-#define INT_STUB_NOINIT KEEP(*(.intStubSect))
-
-#define STATIC_IDT KEEP(*(staticIdt))
-
-#define INTERRUPT_VECTORS_ALLOCATED KEEP(*(int_vector_alloc))
-
-#define IRQ_TO_INTERRUPT_VECTOR KEEP(*(irq_int_vector_map))
-
-/*
- * The x86 manual recommends aligning the IDT on 8 byte boundary. This also
- * ensures that individual entries do not span a page boundary which the
- * interrupt management code relies on.
- */
-#define IDT_MEMORY \
-	. = ALIGN(8);\
-	_idt_base_address = .;\
-	STATIC_IDT
-
-#define INTERRUPT_VECTORS_ALLOCATED_MEMORY \
-	. = ALIGN(4); \
-	_interrupt_vectors_allocated = .; \
-	INTERRUPT_VECTORS_ALLOCATED
-
-#define IRQ_TO_INTERRUPT_VECTOR_MEMORY \
-	. = ALIGN(4); \
-	_irq_to_interrupt_vector = .; \
-	IRQ_TO_INTERRUPT_VECTOR
-
-#endif   /* _LINKERDEFSARCH_H */
diff --git a/include/linker-defs.h b/include/linker-defs.h
index 0310cc5cd..05c6d0296 100644
--- a/include/linker-defs.h
+++ b/include/linker-defs.h
@@ -34,7 +34,7 @@
 
 /* include platform dependent linker-defs */
 #ifdef CONFIG_X86
-#include <arch/x86/linker-defs-arch.h>
+/* Nothing yet to include */
 #elif defined(CONFIG_ARM)
 /* Nothing yet to include */
 #elif defined(CONFIG_ARC)