From 350f184d98c42579e98114b1d0bd362646ef2997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?=
 <oyvind.ronningstad@nordicsemi.no>
Date: Wed, 29 Jan 2020 08:48:33 +0100
Subject: [PATCH] arch: common: Delete isr_tables.ld which was a copy of
 intlist.ld
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refer directly to intlist.ld in zephyr_linker_sources()

Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
---
 arch/common/CMakeLists.txt |  2 +-
 arch/common/isr_tables.ld  | 48 --------------------------------------
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 arch/common/isr_tables.ld

diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
index d5cbe559557..084c0241c0f 100644
--- a/arch/common/CMakeLists.txt
+++ b/arch/common/CMakeLists.txt
@@ -21,7 +21,7 @@ zephyr_cc_option(-ffunction-sections -fdata-sections)
 
 zephyr_linker_sources_ifdef(CONFIG_GEN_ISR_TABLES
   SECTIONS
-  isr_tables.ld
+  ${ZEPHYR_BASE}/include/linker/intlist.ld
 )
 
 zephyr_linker_sources_ifdef(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT
diff --git a/arch/common/isr_tables.ld b/arch/common/isr_tables.ld
deleted file mode 100644
index 549fd925aa2..00000000000
--- a/arch/common/isr_tables.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2019 Nordic Semiconductor ASA
- * Copyright (c) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* Copied from linker.ld */
-
-/* This creates a special section which is not included by the final binary,
- * instead it is consumed by the gen_isr_tables.py script.
- *
- * What we create here is a data structure:
- *
- * struct {
- *	u32_t num_vectors;       <- typically CONFIG_NUM_IRQS
- *	struct _isr_list isrs[]; <- Usually of smaller size than num_vectors
- * }
- *
- * Which indicates the memory address of the number of isrs that were
- * defined, the total number of IRQ lines in the system, followed by
- * an appropriate number of instances of struct _isr_list. See
- * include/sw_isr_table.h
- *
- * You will need to declare a bogus memory region for IDT_LIST. It doesn't
- * matter where this region goes as it is stripped from the final ELF image.
- * The address doesn't even have to be valid on the target. However, it
- * shouldn't overlap any other regions. On most arches the following should be
- * fine:
- *
- * MEMORY {
- *	.. other regions ..
- *	IDT_LIST        : ORIGIN = 0xfffff7ff, LENGTH = 2K
- * }
- */
-#ifndef LINKER_PASS2
-SECTION_PROLOGUE(.intList,,)
-{
-	KEEP(*(.irq_info))
-	KEEP(*(.intList))
-} GROUP_LINK_IN(IDT_LIST)
-#else
-/DISCARD/ :
-{
-	KEEP(*(.irq_info))
-	KEEP(*(.intList))
-}
-#endif