common: Move enable/disable_interrupts out of common.h

Move these two functions into the irq_funcs.h header file. Also move
interrupt_handler_t as this is used by the irq_install_handler() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 254e0284b3fb2e55a30d04e53d515f32335b5eed..d38c18ef8f436ab629b628e7c7e17b91b6219259 100644 (file)
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
  */
 
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
  */
 

+#include <irq_func.h>

 #include <asm/cache.h>
 #include <common.h>
 
 #include <asm/cache.h>
 #include <common.h>
 

diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c
index 674ad0715b51159fe2cc3df684f36c49d65898ec..177d1f40b93f96efc729238873c939264babfd08 100644 (file)
--- a/arch/arm/cpu/arm11/cpu.c
+++ b/arch/arm/cpu/arm11/cpu.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 
 static void cache_flush(void);
 #include <asm/system.h>
 
 static void cache_flush(void);

diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c
index 4874b620e6b2accc63b9e0c0a2ffd79ab881e2e1..305713e78615ac058d20dcde5abea2aa98756bd0 100644 (file)
--- a/arch/arm/cpu/arm920t/cpu.c
+++ b/arch/arm/cpu/arm920t/cpu.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 
 static void cache_flush(void);
 #include <asm/system.h>
 
 static void cache_flush(void);

diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
index ffa2a2302a81f0e8ae5b09ad62140cf69c6d0adb..6ab320da7d935d82de597b4b26ea0b92f37958f2 100644 (file)
--- a/arch/arm/cpu/arm926ejs/cpu.c
+++ b/arch/arm/cpu/arm926ejs/cpu.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 
 static void cache_flush(void);
 #include <asm/system.h>
 
 static void cache_flush(void);

diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index 8523a9759e73aca56fc0274ff87680f0113f9875..fb0ea5e817ffdcdb4af562657d668d87591c241a 100644 (file)
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 #include <asm/io.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 

diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 03557e8a2ae10a2d356830e7d3c145e22eccdb79..68807d20997879ec6cc6e8937935566419b9d78e 100644 (file)
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>

diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c
index d548dd833c155d0722d651d52f1f11d6563a3f69..7f827da033bffa61524dc0f2a31757c56fd24471 100644 (file)
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
 
 #include <common.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/io.h>
 #include <asm/armv7m.h>
 
 #include <asm/io.h>
 #include <asm/armv7m.h>
 

diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index 210301c1fe4a724e6d139682e0d2c4926714f682..2467e0b87be230b5077596ed4e28bb148b3385b3 100644 (file)
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 #include <asm/secure.h>
 #include <linux/compiler.h>
 #include <asm/system.h>
 #include <asm/secure.h>
 #include <linux/compiler.h>

diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index 7d6abf4dbca41b9d9d6b1f94d3b7bb0dc1c315a8..002ff7988b90b7eb8695fe2ed9622024947171d5 100644 (file)
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
 
 #include <common.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c
index 17c01dd81fd97cc76e39ba1a484b64a1ba2ac1c6..91e100af1b67d37b3685e759599e84b597783432 100644 (file)
--- a/arch/arm/cpu/sa1100/cpu.c
+++ b/arch/arm/cpu/sa1100/cpu.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <asm/system.h>
 #include <asm/io.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 

diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index f3ea116e8700cb8b15a85708f4d8b096d08c7f3b..3c4512d495a9fe5b9770bfc525e1f48bc84ccf64 100644 (file)
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 __weak void reset_misc(void)
 {
 
 __weak void reset_misc(void)
 {

diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c
index 4a889f0e3422fc1261f37bc37c7a52161cc32d26..5247e52a5aadd58694b72b953fd4d629924ea93e 100644 (file)
--- a/arch/arm/mach-tegra/cmd_enterrcm.c
+++ b/arch/arm/mach-tegra/cmd_enterrcm.c
@@ -25,6 +25,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
 
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
 

diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h
index b4e0fc69305fd419d07c056e4a730f69fba7077f..1434be87561eaaceb1c71ce6959eb267aa7e3d02 100644 (file)
--- a/arch/microblaze/include/asm/microblaze_intc.h
+++ b/arch/microblaze/include/asm/microblaze_intc.h
@@ -5,6 +5,8 @@
  * Michal  SIMEK <monstr@monstr.cz>
  */
 
  * Michal  SIMEK <monstr@monstr.cz>
  */
 

+#include <irq_func.h>
+

 typedef volatile struct microblaze_intc_t {
        int isr; /* interrupt status register */
        int ipr; /* interrupt pending register */
 typedef volatile struct microblaze_intc_t {
        int isr; /* interrupt status register */
        int ipr; /* interrupt pending register */

diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c
index 34443b58c8f6bacb3e5ce805cb4bdadf976ddc06..3ae87a21bb94b99d25aa5b362ad3aa6c83f0dc44 100644 (file)
--- a/arch/nds32/cpu/n1213/ag101/cpu.c
+++ b/arch/nds32/cpu/n1213/ag101/cpu.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <watchdog.h>
 #include <asm/cache.h>
 
 #include <watchdog.h>
 #include <asm/cache.h>
 

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 05b26e8d20627cac3685992c92ae1e914058c61d..37ffa8f4a43223af329c1170b85c1506162ff339 100644 (file)
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>

+#include <irq_func.h>

 #include <asm/cache.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 #include <asm/cache.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index a68b091f8724a73636733c4a66744bc8a2b1b386..e1891617c761d75cf10e2e21101a83ec2a6d6738 100644 (file)
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
 
 #include <common.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 
 #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
 
 
 #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
 

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 20ed82fbcdfb77abef93fb4db8b780df9aaa9dd6..c3e25978a807b3d4fa54cd2f3be10713dc6a54d7 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
 
 #include <common.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>

diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 10e9b96add12c1bb72ad8a1067cc5d60a833d512..a6eb7cb97cb8c4f02c366a19b542a733a7fc7f91 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 #include <mpc83xx.h>
 #include <command.h>
 
 #include <mpc83xx.h>
 #include <command.h>
 

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 64024612cd516fcd6e8269ccd1c6eb7a06ffc61c..18556629c3d6cf925ecbe6ff62324e25b217eec8 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>

diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c
index ad2950ce40ae7dbad48e2a4821c58b049752c13f..c0a5288bdbb1ac318eb499d712455cb35eb6e42e 100644 (file)
--- a/arch/riscv/cpu/generic/cpu.c
+++ b/arch/riscv/cpu/generic/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
 
 #include <common.h>
 #include <dm.h>

+#include <irq_func.h>

 
 /*
  * cleanup_before_linux() is called just before we call linux
 
 /*
  * cleanup_before_linux() is called just before we call linux

diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index ee36aca407d2fac0923c6564b7e4f65221c6e409..f1b8df9b0b205cf7b429549ebe68518371acf29d 100644 (file)
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
 
 #include <common.h>
 #include <command.h>

+#include <irq_func.h>

 #include <cpu_func.h>
 #include <netdev.h>
 #include <asm/processor.h>
 #include <cpu_func.h>
 #include <netdev.h>
 #include <asm/processor.h>

diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index 93933b7931d76181f1924433858d24057ab5fd2e..602776a4742e08b738838fe4ff0e162b1627a131 100644 (file)
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 #include <asm/io.h>
 #include <asm/zimage.h>
 
 #include <asm/io.h>
 #include <asm/zimage.h>
 

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index d07041fd4ceb4dfd2a5a6cae47675e63b6fa0758..9b5e767ccc245b32fb63fb3b68492ed24c9387a7 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <env.h>
 
 #include <common.h>
 #include <env.h>

+#include <irq_func.h>

 #include <malloc.h>
 #include <asm/acpi_table.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <asm/acpi_table.h>
 #include <asm/io.h>

diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index a96fdef992d2370660dc1f51001c480f4a241d0b..145bc0233a1363d6da04928fbf302cf3ed8b0bde 100644 (file)
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
 #include <common.h>
 #include <env.h>
 #include <errno.h>

+#include <irq_func.h>

 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 6f36c269d42a4c4ed0803c6f148bfa5ea6bd7c78..1d3c5acddf8db1494b3fcffa7c947f29997919e9 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <console.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <console.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000

diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c
index 33cd4b496489d14cc47393a2be1a525934f30fc0..24efe77b575cb93ce8fc9f765d8d1a7a0889824b 100644 (file)
--- a/board/freescale/b4860qds/b4860qds.c
+++ b/board/freescale/b4860qds/b4860qds.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
 #include <command.h>
 #include <env.h>
 #include <i2c.h>

+#include <irq_func.h>

 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>

diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index b37f3bf4f8fea213e455f3dfb0ea2c1549536646..20852476dd5d93604c2ae6823fc6f10bf99009a3 100644 (file)
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
 #include <command.h>
 #include <env.h>
 #include <i2c.h>

+#include <irq_func.h>

 #include <asm/io.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>
 #include <asm/io.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>

diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 0706b62396d127beac7f75fb8970cebb2c48e4b6..a5223ecee6c1645e1f0db25c1dabfe7e0af75394 100644 (file)
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 #include <asm/immap.h>
 
 
 #include <asm/immap.h>
 

diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c
index bb18b97e6a2e0162b1ddd2ab429fdc90560d9c15..d73ddf59210144fd99bac81f1620c0d5bfcfc1b9 100644 (file)
--- a/board/freescale/t4qds/t4240qds.c
+++ b/board/freescale/t4qds/t4240qds.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
 #include <command.h>
 #include <env.h>
 #include <i2c.h>

+#include <irq_func.h>

 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>

diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 470d09e528ca9924097467a1064fd2ee882ed3e9..6af45c99e149abc8e69d4f851e43373819d0629f 100644 (file)
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <env.h>

+#include <irq_func.h>

 #include <linux/printk.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/kernel.h>
 #include <linux/io.h>

diff --git a/cmd/booti.c b/cmd/booti.c
index 841eff10d139641337de01a1aac061ed9105e56c..d0671deb759cebbd127a7b7dc91b7af621ab815c 100644 (file)
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -8,6 +8,7 @@
 #include <bootm.h>
 #include <command.h>
 #include <image.h>
 #include <bootm.h>
 #include <command.h>
 #include <image.h>

+#include <irq_func.h>

 #include <lmb.h>
 #include <mapmem.h>
 #include <linux/kernel.h>
 #include <lmb.h>
 #include <mapmem.h>
 #include <linux/kernel.h>

diff --git a/cmd/bootz.c b/cmd/bootz.c
index 0e75509ee9623505570f10440b6e4880d8057f06..74be62c2c5e45885d5544aba1c74e1b791826b9b 100644 (file)
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <common.h>
 #include <bootm.h>
 #include <command.h>

+#include <irq_func.h>

 #include <lmb.h>
 #include <linux/compiler.h>
 
 #include <lmb.h>
 #include <linux/compiler.h>
 

diff --git a/cmd/fdc.c b/cmd/fdc.c
index 7bfaae0e381a72e21dc3b82473d2685caef1c2af..7d4b8296374e2a8b76533bd7f9b4f85ec51f3834 100644 (file)
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <command.h>
 #include <image.h>
 #include <config.h>
 #include <command.h>
 #include <image.h>

+#include <irq_func.h>

 
 
 #undef FDC_DEBUG
 
 
 #undef FDC_DEBUG

diff --git a/cmd/irq.c b/cmd/irq.c
index bcc718b4bc88d2c998dbc57df6e053bcf192fefa..52d06b3eedb8b463c8d6908e1dd3855216727261 100644 (file)
--- a/cmd/irq.c
+++ b/cmd/irq.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
 #include <common.h>
 #include <config.h>
 #include <command.h>

+#include <irq_func.h>

 
 static int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc,
                         char * const argv[])
 
 static int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc,
                         char * const argv[])

diff --git a/common/board_r.c b/common/board_r.c
index 969ed7356692a19e71902c6bbce47a8e6c4bfa6a..5464172259666542dc34e571890f7f6f2d63046d 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <api.h>
 #include <cpu_func.h>
 #include <common.h>
 #include <api.h>
 #include <cpu_func.h>

+#include <irq_func.h>

 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)

diff --git a/common/bootm.c b/common/bootm.c
index 3bbe490ab9ae5bdd778bfdc37a716bc5775acd55..902c13880dd3ecee9d6b05585c9bdd43873b79f1 100644 (file)
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <errno.h>
 #include <fdt_support.h>
 #include <env.h>
 #include <errno.h>
 #include <fdt_support.h>

+#include <irq_func.h>

 #include <lmb.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <lmb.h>
 #include <malloc.h>
 #include <mapmem.h>

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index c8c47acfd34066c52d3cd3289c662aec33397067..394f30fa886d798993f7cc999b23359e3d07d6e9 100644 (file)
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
 
 #include <common.h>
 #include <dm.h>

+#include <irq_func.h>

 #include <dm/lists.h>
 #include <efi_loader.h>
 #include <linux/libfdt.h>
 #include <dm/lists.h>
 #include <efi_loader.h>
 #include <linux/libfdt.h>

diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 8f09e5b25061c83c1bf14e6fb30b06e02b794072..8fff818e42fc5fbe23f3629b563c5e3708a431c4 100644 (file)
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <flash.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <flash.h>

+#include <irq_func.h>

 #include <mach/pic32.h>
 #include <wait_bit.h>
 
 #include <mach/pic32.h>
 #include <wait_bit.h>
 

diff --git a/include/common.h b/include/common.h
index 81387d561e251b93310120fdea5e2141a7c8f399..c22eb63501fbf8a57d70447d173bc4d09fe47329 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -46,8 +46,6 @@ typedef volatile unsigned char        vu_char;
 
 #include <log.h>
 
 
 #include <log.h>
 

-typedef void (interrupt_handler_t)(void *);
-

 #include <asm/u-boot.h> /* boot information for Linux kernel */
 #include <asm/global_data.h>   /* global data used for startup functions */
 
 #include <asm/u-boot.h> /* boot information for Linux kernel */
 #include <asm/global_data.h>   /* global data used for startup functions */
 


@@ -207,10 +205,6 @@ int        get_clocks (void);
 ulong  get_bus_freq  (ulong);
 int get_serial_clock(void);
 
 ulong  get_bus_freq  (ulong);
 int get_serial_clock(void);
 

-/* $(CPU)/interrupts.c */
-void   enable_interrupts  (void);
-int    disable_interrupts (void);
-

 /* lib/uuid.c */
 #include <uuid.h>
 
 /* lib/uuid.c */
 #include <uuid.h>
 

diff --git a/include/exports.h b/include/exports.h
index 88996227381da51f728f40ff8c2d70bf19ecba40..35f463287fb0950a8ede3e7a1e3aa299b44a73c6 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -9,6 +9,8 @@
 #include <phy_interface.h>
 #endif
 
 #include <phy_interface.h>
 #endif
 

+#include <irq_func.h>
+

 struct spi_slave;
 
 /* These are declarations of exported functions available in C code */
 struct spi_slave;
 
 /* These are declarations of exported functions available in C code */

diff --git a/include/irq_func.h b/include/irq_func.h
index 11d2bdd9125b9d69c7a3536b807b72990aac6317..c7c4babbfc9080cd5aaed1108ab57339c3907b0c 100644 (file)
--- a/include/irq_func.h
+++ b/include/irq_func.h
@@ -9,11 +9,18 @@
 #ifndef __IRQ_FUNC_H
 #define __IRQ_FUNC_H
 
 #ifndef __IRQ_FUNC_H
 #define __IRQ_FUNC_H
 

+struct pt_regs;
+
+typedef void (interrupt_handler_t)(void *arg);
+

 int interrupt_init(void);
 void timer_interrupt(struct pt_regs *regs);
 void external_interrupt(struct pt_regs *regs);
 int interrupt_init(void);
 void timer_interrupt(struct pt_regs *regs);
 void external_interrupt(struct pt_regs *regs);

-void irq_install_handler (int vec, interrupt_handler_t *handler, void *arg);
+void irq_install_handler(int vec, interrupt_handler_t *handler, void *arg);

 void irq_free_handler(int vec);
 void reset_timer(void);
 
 void irq_free_handler(int vec);
 void reset_timer(void);
 

+void enable_interrupts(void);
+int disable_interrupts(void);
+

 #endif
 #endif

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 265297ed46f9a431e603a13f078e8af75cf9a1e1..88a7604bbf33710da7ab7b255d181dc5ed97d957 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <div64.h>
 #include <efi_loader.h>
 #include <common.h>
 #include <div64.h>
 #include <efi_loader.h>

+#include <irq_func.h>

 #include <malloc.h>
 #include <time.h>
 #include <linux/libfdt_env.h>
 #include <malloc.h>
 #include <time.h>
 #include <linux/libfdt_env.h>

diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index 49c5ee634987608fc8e7eca3bf9e96a83534cd67..d4f60aa73880ae394c11bb01e640c49fd6880e0f 100644 (file)
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c
index 67edee01074a789d402a32f0dc9a6f61d572bb19..0b02e9169e2b4bf61bd05df03933f39d7b43cdfc 100644 (file)
--- a/post/lib_powerpc/b.c
+++ b/post/lib_powerpc/b.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index 79b22ebab71bbb9710555f69b8a16d50342343a6..e70869774cebd2e73cd78ae3d498676a6aedb84a 100644 (file)
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index b5b47bafb274438d73dc62bc8f856ecfbf0b9529..85a9b0ad36b288575d1e5536cfe32c7837544e3f 100644 (file)
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c
index 7ab3c352acb1607998fcf8eb4f1c74f37dd4b09a..bb29e91701276f22dbe809cb53d6a2ac0576dd73 100644 (file)
--- a/post/lib_powerpc/complex.c
+++ b/post/lib_powerpc/complex.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 93de47a1cff3e8edfc54759dd108a14792dbb1ea..56ed355dde715c6d9419c6311a1c06ac1ce6afb2 100644 (file)
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 3fbd8babfa5685edcd594a9d5075c4fd7bfa12b9..5269563b1e170349b86a46ff0adfc6fa43e0a322 100644 (file)
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 51750bb07073f087d41571a44a9001bc27cbf26e..7807eb17acfef12e13b65d8b83da3909c4175341 100644 (file)
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index 16e642238e15f08e7aad9438ea2d50c900dbf7c2..7b4dc79fb17d19b5f626a519f44aad09a9c8d320 100644 (file)
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index f88d62a73bdc1f28a297aff119bbe413f9bffe12..8a03e9b9bcb6f350c7dfa8a9acbc1ec2c094a8f2 100644 (file)
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index c12577fd4f5c763d4c7ef50860db277bdb7da7cf..e2beb4e4171320619487b30b41ed8cdd16cfc71c 100644 (file)
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index cad3aec82d0880860c73f635af9b8b672ef6b272..d4a8fabc4257c8a11df44b8a8f4613c3aa213c9c 100644 (file)
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index 8bd65c35817b5a395e433d94a40c335de35a8665..8e278fee885a66d7a77a22cf999e0cbc589856d6 100644 (file)
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index 3d3f2b117cc04f91a045e4a50ba2af6971bce9e1..fc460ceb9f0b75590db3422f2dcf7832bec927ab 100644 (file)
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index 27a32a274a497c292890554849eda6f7be42fc6b..fc6f1f5674adc1291033305531eaa929b4ff6823 100644 (file)
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index 28c17df71e49b695afb229cee43455e1f0971ad4..f49c85e6b9dacdaee6bb51d10e000936e28f61f5 100644 (file)
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index ea9e465862bad9c04c7ba0ec5aac913c817b68b8..6bc5a54706b4f8581758730bd6fd5475d2fada9d 100644 (file)
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index 2c0efaec36b47a069e8e3d7e3a45cf23fbc5eafb..fa376c76b1bb0c6ea2ad3bf6a9b4a3ba9d9138b9 100644 (file)
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test

diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index eae4c57244282f28e87947504d976fdaf349ae8e..5c36012a9b791699b6d8b442739921e0843152d0 100644 (file)
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <irq_func.h>

 
 /*
  * CPU test
 
 /*
  * CPU test