From 9f2ec3f5431281a480c89107cb952ca5571d78e7 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 23 Apr 2014 21:20:43 +0900 Subject: spl: consolidate arch/arm/include/asm/arch-*/spl.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit arch/arm/include/asm/spl.h requires all SoCs to have arch/arm/include/asm/arch-*/spl.h. But many of them just define BOOT_DEVICE_* macros. Those macros are used in the "switch (boot_device) { ... }" statement in common/spl/spl.c. So they should not be archtecture specific, but be described as a simpile enumeration. This commit merges most of arch/arm/include/asm/arch-*/spl.h into arch/arm/include/asm/spl.h. With a little more effort, arch-zynq/spl.h and arch-socfpga/spl.h will be merged, while I am not sure about OMAP and Exynos. Signed-off-by: Masahiro Yamada Cc: Tom Rini Cc: Michal Simek Cc: Andreas Bießmann Cc: Stephen Warren Cc: Tom Warren CC: Stefano Babic CC: Minkyu Kang Cc: Dinh Nguyen Acked-by: Andreas Bießmann Acked-by: Michal Simek Acked-by: Stefano Babic Acked-by: Stephen Warren Acked-by: Tim Harvey Tested-by: Bo Shen [on sama5d3xek board for at91 part] Acked-by: Stephen Warren Tested-by: Stefano Babic [applying Tim's i.MX6 patches] Acked-by: Tom Rini --- board/denx/m53evk/m53evk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/denx') diff --git a/board/denx/m53evk/m53evk.c b/board/denx/m53evk/m53evk.c index 74f9501..5dd6cdd 100644 --- a/board/denx/m53evk/m53evk.c +++ b/board/denx/m53evk/m53evk.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.1