[U-Boot] [PATCH 33/41] common: Move enable/disable_interrupts out of common.h

30 Sep 2019

Move these two functions into the irq_legacy.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
---
arch/arc/lib/bootm.c                          | 1 +
 arch/arm/cpu/arm11/cpu.c                      | 1 +
 arch/arm/cpu/arm920t/cpu.c                    | 1 +
 arch/arm/cpu/arm926ejs/cpu.c                  | 1 +
 arch/arm/cpu/arm946es/cpu.c                   | 1 +
 arch/arm/cpu/armv7/cpu.c                      | 1 +
 arch/arm/cpu/armv7m/cpu.c                     | 1 +
 arch/arm/cpu/armv8/cpu.c                      | 1 +
 arch/arm/cpu/pxa/pxa2xx.c                     | 1 +
 arch/arm/cpu/sa1100/cpu.c                     | 1 +
 arch/arm/lib/reset.c                          | 1 +
 arch/arm/mach-tegra/cmd_enterrcm.c            | 1 +
 arch/microblaze/include/asm/microblaze_intc.h | 2 ++
 arch/nds32/cpu/n1213/ag101/cpu.c              | 1 +
 arch/nios2/cpu/cpu.c                          | 1 +
 arch/nios2/lib/bootm.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                | 1 +
 arch/riscv/cpu/generic/cpu.c                  | 1 +
 arch/sh/cpu/sh4/cpu.c                         | 1 +
 arch/sh/lib/zimageboot.c                      | 1 +
 arch/x86/lib/zimage.c                         | 1 +
 board/bosch/shc/board.c                       | 1 +
 board/cobra5272/flash.c                       | 1 +
 board/freescale/b4860qds/b4860qds.c           | 1 +
 board/freescale/common/vid.c                  | 1 +
 board/freescale/m5253demo/flash.c             | 1 +
 board/freescale/t4qds/t4240qds.c              | 1 +
 board/synopsys/hsdk/hsdk.c                    | 1 +
 cmd/booti.c                                   | 1 +
 cmd/bootz.c                                   | 1 +
 cmd/fdc.c                                     | 1 +
 cmd/irq.c                                     | 1 +
 common/board_r.c                              | 1 +
 common/bootm.c                                | 1 +
 drivers/firmware/psci.c                       | 1 +
 drivers/mtd/pic32_flash.c                     | 1 +
 include/common.h                              | 6 ------
 include/exports.h                             | 2 ++
 include/irq_legacy.h                          | 9 ++++++++-
 lib/efi_loader/efi_boottime.c                 | 1 +
 post/cpu/mpc83xx/ecc.c                        | 1 +
 post/lib_powerpc/andi.c                       | 1 +
 post/lib_powerpc/b.c                          | 1 +
 post/lib_powerpc/cmp.c                        | 1 +
 post/lib_powerpc/cmpi.c                       | 1 +
 post/lib_powerpc/complex.c                    | 1 +
 post/lib_powerpc/cr.c                         | 1 +
 post/lib_powerpc/load.c                       | 1 +
 post/lib_powerpc/multi.c                      | 1 +
 post/lib_powerpc/rlwimi.c                     | 1 +
 post/lib_powerpc/rlwinm.c                     | 1 +
 post/lib_powerpc/rlwnm.c                      | 1 +
 post/lib_powerpc/srawi.c                      | 1 +
 post/lib_powerpc/store.c                      | 1 +
 post/lib_powerpc/string.c                     | 1 +
 post/lib_powerpc/three.c                      | 1 +
 post/lib_powerpc/threei.c                     | 1 +
 post/lib_powerpc/threex.c                     | 1 +
 post/lib_powerpc/two.c                        | 1 +
 post/lib_powerpc/twox.c                       | 1 +
 62 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 254e0284b3f..15764093c42 100644
--- 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.
  */
+#include <irq_legacy.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 280622fe33a..9aa410458ef 100644
--- 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_legacy.h>
+#include <irq_legacy.h>
 #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 e632aa52f8c..ccdb9f8d5e7 100644
--- 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_legacy.h>
+#include <irq_legacy.h>
 #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 f4b27d93be6..a5911d904d9 100644
--- 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_legacy.h>
+#include <irq_legacy.h>
 #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 19b805096f4..24efd186bba 100644
--- 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_legacy.h>
+#include <irq_legacy.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 bf3ebba0523..8f09986cf9a 100644
--- 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_legacy.h>
+#include <irq_legacy.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 fed17bd6490..61520f93e7b 100644
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -9,6 +9,7 @@
#include <common.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.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 6fdc94ec081..55e13cb5818 100644
--- 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_legacy.h>
+#include <irq_legacy.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 aad4b52e7b2..48b9368ca24 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -11,6 +11,7 @@
#include <common.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.h>
 #include <time.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c
index ec408564c1e..caaa5ca546d 100644
--- 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_legacy.h>
+#include <irq_legacy.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index f3ea116e870..66f916f27a6 100644
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -21,6 +21,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
__weak void reset_misc(void)
 {
diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c
index 4a889f0e342..0259fd4b805 100644
--- a/arch/arm/mach-tegra/cmd_enterrcm.c
+++ b/arch/arm/mach-tegra/cmd_enterrcm.c
@@ -25,6 +25,7 @@
  */
#include <common.h>
+#include <irq_legacy.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 b4e0fc69305..09c2ba3a04d 100644
--- 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
  */
+#include <irq_legacy.h>
+
 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 f43b6960590..16d8b740c9e 100644
--- 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_legacy.h>
+#include <irq_legacy.h>
 #include <watchdog.h>
 #include <asm/cache.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 54b6741d4e4..39059b8bcb6 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <cpu_legacy.h>
 #include <dm.h>
 #include <errno.h>
+#include <irq_legacy.h>
 #include <asm/cache.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index c671e032148..836d84decba 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -6,6 +6,7 @@
#include <common.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.h>
#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 71e4bb3f287..9fc7fce93c6 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -11,6 +11,7 @@
#include <common.h>
 #include <cpu.h>
+#include <irq_legacy.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 10e9b96add1..7633c691710 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -7,6 +7,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
 #include <mpc83xx.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 8f58924b7ba..5009c6b76a6 100644
--- 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_legacy.h>
+#include <irq_legacy.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 ad2950ce40a..ea63d177b55 100644
--- 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 <irq_legacy.h>
/*
  * 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 d79e6ea71d5..3fb24965de2 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu.h>
+#include <irq_legacy.h>
 #include <netdev.h>
 #include <asm/processor.h>
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index 93933b7931d..2fb98e5a449 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -10,6 +10,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
 #include <asm/io.h>
 #include <asm/zimage.h>
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 6a6258a5057..e9639ad9909 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -14,6 +14,7 @@
#include <common.h>
 #include <env.h>
+#include <irq_legacy.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 a96fdef992d..2ceb836019e 100644
--- 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 <irq_legacy.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 ccff46adf8b..ec315dc479b 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <console.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.h>
#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 33cd4b49648..29c9fa00789 100644
--- 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 <irq_legacy.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 b37f3bf4f8f..5cccb870f60 100644
--- 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 <irq_legacy.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 0706b62396d..004fbee0ac3 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -8,6 +8,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
#include <asm/immap.h>
diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c
index bb18b97e6a2..8b60121ddf1 100644
--- 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 <irq_legacy.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 13607557103..6e226e5d7dd 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <cpu_legacy.h>
 #include <env.h>
+#include <irq_legacy.h>
 #include <linux/printk.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index c36b0235df8..6c9f40a85f0 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -8,6 +8,7 @@
 #include <bootm.h>
 #include <command.h>
 #include <image.h>
+#include <irq_legacy.h>
 #include <lmb.h>
 #include <mapmem.h>
 #include <linux/kernel.h>
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 0e75509ee96..6b781e28752 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
+#include <irq_legacy.h>
 #include <lmb.h>
 #include <linux/compiler.h>
diff --git a/cmd/fdc.c b/cmd/fdc.c
index 7bfaae0e381..2e879de4ae7 100644
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <command.h>
 #include <image.h>
+#include <irq_legacy.h>
#undef	FDC_DEBUG
diff --git a/cmd/irq.c b/cmd/irq.c
index bcc718b4bc8..43ab6be6730 100644
--- a/cmd/irq.c
+++ b/cmd/irq.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
+#include <irq_legacy.h>
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 a7a92b4de57..65cce0e8054 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <api.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.h>
 #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 b031c5ce205..c841a344985 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <errno.h>
 #include <fdt_support.h>
+#include <irq_legacy.h>
 #include <lmb.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index c8c47acfd34..054494dfca6 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -8,6 +8,7 @@
#include <common.h>
 #include <dm.h>
+#include <irq_legacy.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 910aa53a640..610cefaea48 100644
--- 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 <irq_legacy.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
diff --git a/include/common.h b/include/common.h
index 81387d561e2..c22eb63501f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -46,8 +46,6 @@ typedef volatile unsigned char	vu_char;
#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 */
@@ -207,10 +205,6 @@ int	get_clocks (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>
diff --git a/include/exports.h b/include/exports.h
index fc06c83f848..cd57f10601d 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -9,6 +9,8 @@
 #include <phy_interface.h>
 #endif
+#include <irq_legacy.h>
+
 struct spi_slave;
/* These are declarations of exported functions available in C code */
diff --git a/include/irq_legacy.h b/include/irq_legacy.h
index 72a3af65d7a..91b523d043a 100644
--- a/include/irq_legacy.h
+++ b/include/irq_legacy.h
@@ -7,11 +7,18 @@
 #ifndef __IRQ_LEGACY_H
 #define __IRQ_LEGACY_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);
-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 enable_interrupts(void);
+int disable_interrupts(void);
+
 #endif
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 265297ed46f..ab8b6527923 100644
--- 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 <irq_legacy.h>
 #include <malloc.h>
 #include <time.h>
 #include <linux/libfdt_env.h>
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index d3c5773f7b3..dfbfd5d1568 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_legacy.h>
 #include <irq_legacy.h>
+#include <irq_legacy.h>
 #include <mpc83xx.h>
 #include <watchdog.h>
 #include <asm/io.h>
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index 49c5ee63498..d8cd9b3fc82 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c
index 67edee01074..9e685e193f4 100644
--- a/post/lib_powerpc/b.c
+++ b/post/lib_powerpc/b.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index 79b22ebab71..fdacc40b14e 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index b5b47bafb27..f5e0b274de0 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c
index 7ab3c352acb..b3435320158 100644
--- a/post/lib_powerpc/complex.c
+++ b/post/lib_powerpc/complex.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 93de47a1cff..01298fbcb21 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 3fbd8babfa5..6e7251703ba 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 51750bb0707..eafd06f1995 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index 16e642238e1..59f8f574053 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index f88d62a73bd..5496d3cef15 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index c12577fd4f5..0d48dd210ca 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index cad3aec82d0..2aabb173f58 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index 8bd65c35817..73c136c981b 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index 3d3f2b117cc..0571c58c7d2 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index 27a32a274a4..353f6e55dee 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index 28c17df71e4..aa1534a59e6 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index ea9e465862b..d1806503686 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index 2c0efaec36b..f14f6d98e56 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index eae4c572442..1e0291a9eb8 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -5,6 +5,7 @@
  */
#include <common.h>
+#include <irq_legacy.h>
/*
  * CPU test
-- 
2.23.0.444.g18eeb5a265-goog


    