diff options
author | Simon Glass <sjg@chromium.org> | 2019-12-28 10:45:07 -0700 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-17 17:53:40 -0500 |
commit | db41d65a97f335167e1fbc0400a83333b5157703 (patch) | |
tree | 6ac31cad782169c4fe60c6195ec7ed2ca4b6298f /arch/arm | |
parent | 49acd56e4f1b0cb76af73bb1b22db20c81af3f78 (diff) |
common: Move hang() to the same header as panic()
At present panic() is in the vsprintf.h header file. That does not seem
like an obvious choice for hang(), even though it relates to panic(). So
let's put hang() in its own header.
Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Migrate a few more files]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm')
38 files changed, 39 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index f44205c3a8..16c080a1e1 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -11,6 +11,7 @@ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index 7a1b39844e..7c57cab0b1 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -8,6 +8,7 @@ #include <common.h> #include <config.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index c1a08fb4ac..6a5518f9de 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -9,6 +9,7 @@ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <asm/system.h> #include <asm/armv8/mmu.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index e3df696b88..dce915a2ea 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -9,6 +9,7 @@ #include <env.h> #include <fsl_ddr_sdram.h> #include <init.h> +#include <hang.h> #include <vsprintf.h> #include <asm/io.h> #include <linux/errno.h> diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h index 4a573208df..fc97c55114 100644 --- a/arch/arm/include/asm/armv8/mmu.h +++ b/arch/arm/include/asm/armv8/mmu.h @@ -7,6 +7,7 @@ #ifndef _ASM_ARMV8_MMU_H_ #define _ASM_ARMV8_MMU_H_ +#include <hang.h> #include <linux/const.h> /* diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 769a64257f..a135bcfc7b 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -15,6 +15,7 @@ #include <command.h> #include <cpu_func.h> #include <dm.h> +#include <hang.h> #include <dm/root.h> #include <env.h> #include <image.h> diff --git a/arch/arm/lib/div0.c b/arch/arm/lib/div0.c index e185bfe0c6..b91b408f64 100644 --- a/arch/arm/lib/div0.c +++ b/arch/arm/lib/div0.c @@ -4,10 +4,10 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#include <hang.h> + /* Replacement (=dummy) for GNU/Linux division-by zero handler */ void __div0 (void) { - extern void hang (void); - hang(); } diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 6da6d41be2..156150c89c 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_wdt.h> diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c index 1065f090e0..822f877de7 100644 --- a/arch/arm/mach-at91/spl_at91.c +++ b/arch/arm/mach-at91/spl_at91.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91sam9_matrix.h> diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index 85290be369..6ee0e1c24c 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pit.h> diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index be3daa9bc0..d44e840aa0 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <config.h> +#include <hang.h> #include <spl.h> #include <asm/u-boot.h> #include <asm/utils.h> diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c index 8ed8b79c8b..4396880b74 100644 --- a/arch/arm/mach-imx/mx6/ddr.c +++ b/arch/arm/mach-imx/mx6/ddr.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <hang.h> #include <linux/types.h> #include <asm/arch/clock.h> #include <asm/arch/mx6-ddr.h> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 5a6493a625..87dbdf3011 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c index 4e011ee10e..6934e88a96 100644 --- a/arch/arm/mach-k3/security.c +++ b/arch/arm/mach-k3/security.c @@ -8,6 +8,7 @@ #include <common.h> #include <dm.h> +#include <hang.h> #include <linux/soc/ti/ti_sci_protocol.h> #include <mach/spl.h> #include <spl.h> diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c index cc2ec88505..b7de9ba099 100644 --- a/arch/arm/mach-keystone/mon.c +++ b/arch/arm/mach-keystone/mon.c @@ -5,6 +5,7 @@ * Copyright (C) 2012-2019 Texas Instruments Incorporated - http://www.ti.com/ */ +#include <hang.h> #include <asm/unaligned.h> #include <common.h> #include <command.h> diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c index 9b3590ff3d..37f1f219b2 100644 --- a/arch/arm/mach-mediatek/spl.c +++ b/arch/arm/mach-mediatek/spl.c @@ -6,6 +6,7 @@ #include <clk.h> #include <common.h> +#include <hang.h> #include <spl.h> #include "init.h" diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 3cb27b7f4b..a99bf166fd 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -7,6 +7,7 @@ #include <dm.h> #include <debug_uart.h> #include <fdtdec.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> #include <asm/arch/cpu.h> diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c index 7c666be758..8c61547ee9 100644 --- a/arch/arm/mach-omap2/am33xx/clock.c +++ b/arch/arm/mach-omap2/am33xx/clock.c @@ -8,6 +8,7 @@ * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ */ #include <common.h> +#include <hang.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> #include <asm/arch/hardware.h> diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c index 1005a5be96..c81dc808e5 100644 --- a/arch/arm/mach-omap2/am33xx/fdt.c +++ b/arch/arm/mach-omap2/am33xx/fdt.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <hang.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <malloc.h> diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c index 5932d694d3..9aff83e9df 100644 --- a/arch/arm/mach-omap2/clocks-common.c +++ b/arch/arm/mach-omap2/clocks-common.c @@ -13,6 +13,7 @@ * Rajendra Nayak <rnayak@ti.com> */ #include <common.h> +#include <hang.h> #include <i2c.h> #include <asm/omap_common.h> #include <asm/gpio.h> diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c index bb81063c0f..4658f67e84 100644 --- a/arch/arm/mach-omap2/emif-common.c +++ b/arch/arm/mach-omap2/emif-common.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <hang.h> #include <init.h> #include <net.h> #include <asm/emif.h> diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c index 9eda57c450..598074ba21 100644 --- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/utils.h> #include <asm/arch/dra7xx_iodelay.h> #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index 5ba8806dd7..c4adba31e6 100644 --- a/arch/arm/mach-omap2/omap5/fdt.c +++ b/arch/arm/mach-omap2/omap5/fdt.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <hang.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <malloc.h> diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index f3df8affa3..28b929f84f 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -14,6 +14,7 @@ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <init.h> #include <stdarg.h> diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index 10614c99d9..1524eca272 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/boot_mode.h> #include <asm/io.h> diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index 1b012f7f67..61d410d780 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <dm.h> +#include <hang.h> #include <syscon.h> #include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 514032a44a..7d0e6fa1af 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -6,6 +6,7 @@ #include <common.h> #include <debug_uart.h> #include <dm.h> +#include <hang.h> #include <ram.h> #include <spl.h> #include <asm/arch-rockchip/bootrom.h> diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index c3734cb070..31a3eb4c28 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -6,6 +6,7 @@ #include <common.h> #include <debug_uart.h> #include <dm.h> +#include <hang.h> #include <ram.h> #include <spl.h> #include <version.h> diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 3254bc1805..f30e7f80a2 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <hang.h> #include <wait_bit.h> #include <asm/io.h> #include <asm/arch/mailbox_s10.h> diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index db71105af3..2901b7db68 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -5,6 +5,7 @@ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <asm/io.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c index 7c38c50981..d9ef851054 100644 --- a/arch/arm/mach-socfpga/spl_a10.c +++ b/arch/arm/mach-socfpga/spl_a10.c @@ -5,6 +5,7 @@ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <asm/io.h> #include <asm/pl310.h> #include <asm/u-boot.h> diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c index c745d64114..ecc1a35c49 100644 --- a/arch/arm/mach-socfpga/spl_agilex.c +++ b/arch/arm/mach-socfpga/spl_agilex.c @@ -8,6 +8,7 @@ #include <asm/u-boot.h> #include <asm/utils.h> #include <common.h> +#include <hang.h> #include <image.h> #include <spl.h> #include <asm/arch/clock_manager.h> diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c index e19f55aa9b..70f8455ddc 100644 --- a/arch/arm/mach-socfpga/spl_gen5.c +++ b/arch/arm/mach-socfpga/spl_gen5.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/u-boot.h> #include <asm/utils.h> diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c index 8d96918cb4..d89151d902 100644 --- a/arch/arm/mach-socfpga/spl_s10.c +++ b/arch/arm/mach-socfpga/spl_s10.c @@ -4,6 +4,7 @@ * */ +#include <hang.h> #include <asm/io.h> #include <asm/u-boot.h> #include <asm/utils.h> diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c index a3b0d6f382..ca4231cd0d 100644 --- a/arch/arm/mach-stm32mp/spl.c +++ b/arch/arm/mach-stm32mp/spl.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c index 0762144ecf..c5361ca73d 100644 --- a/arch/arm/mach-tegra/cboot.c +++ b/arch/arm/mach-tegra/cboot.c @@ -7,6 +7,7 @@ #include <env.h> #include <fdt_support.h> #include <fdtdec.h> +#include <hang.h> #include <stdlib.h> #include <string.h> diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c index d09c91ab42..c7262d70a5 100644 --- a/arch/arm/mach-uniphier/spl_board_init.c +++ b/arch/arm/mach-uniphier/spl_board_init.c @@ -6,6 +6,7 @@ #include <common.h> #include <debug_uart.h> +#include <hang.h> #include <spl.h> #include "init.h" diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index 9b7c0be951..96ba90fb7a 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <debug_uart.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> |