From: TJ <linux@tjworld.net>
Date: Sat, 30 Oct 2010 19:34:45 +0000 (+0100)
Subject: Move definition of op-codes that compilers may not support to an header file and
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=bootloader-ap.git;a=commitdiff_plain;h=3364752aee9f84b06fbac51988294cf71153d3a8

Move definition of op-codes that compilers may not support to an header file and
include it from all files that need those definitions.
---

diff --git a/arch/arch-init-7x30.S b/arch/arch-init-7x30.S
index c2b0dd9..5eef644 100644
--- a/arch/arch-init-7x30.S
+++ b/arch/arch-init-7x30.S
@@ -39,8 +39,7 @@
 .text
 .code 32
 
-#define DSB .byte 0x4f, 0xf0, 0x7f, 0xf5
-#define ISB .byte 0x6f, 0xf0, 0x7f, 0xf5
+#include <boot/arm-missing-opcodes.h>
 
 /*
  ; LVT Ring Osc counter
diff --git a/arch/arm-head.S b/arch/arm-head.S
index 1fe24ce..bf25cc6 100644
--- a/arch/arm-head.S
+++ b/arch/arm-head.S
@@ -20,6 +20,7 @@
 #include <boot/linkage.h>
 #include <boot/version.h>
 #include <boot/arm.h>
+#include <boot/arm-missing-opcodes.h>
 
     .section ".text", #alloc, #execinstr
 ENTRY(_start)
diff --git a/include/boot/arm-missing-opcodes.h b/include/boot/arm-missing-opcodes.h
new file mode 100644
index 0000000..18f066a
--- /dev/null
+++ b/include/boot/arm-missing-opcodes.h
@@ -0,0 +1,28 @@
+/*
+  ARM op-codes that compilers may not support
+  Copyright (c) 2010 TJ <linux@tjworld.net>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program (See the COPYRIGHT file the base directory).
+    If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ARM_MISSING_OPCODES_H
+#define __ARM_MISSING_OPCODES_H
+/*
+  moved from arch/arch-init-7x30.S so other source can use them
+*/
+#define DSB .byte 0x4f, 0xf0, 0x7f, 0xf5
+#define ISB .byte 0x6f, 0xf0, 0x7f, 0xf5
+
+#endif