Currently arch specific headers can be included with longer possible as there won't be a single mach anymore. Move all uemd specific header files to include/mach/uemd/ to prepare for multi-arch support. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/boards/module-mb7707/board.c | 2 +- arch/arm/include/asm/debug_ll.h | 2 ++ .../arm/mach-uemd/include/mach => include/mach/uemd}/debug_ll.h | 2 +- .../arm/mach-uemd/include/mach => include/mach/uemd}/hardware.h | 0 4 files changed, 4 insertions(+), 2 deletions(-) rename {arch/arm/mach-uemd/include/mach => include/mach/uemd}/debug_ll.h (97%) rename {arch/arm/mach-uemd/include/mach => include/mach/uemd}/hardware.h (100%) diff --git a/arch/arm/boards/module-mb7707/board.c b/arch/arm/boards/module-mb7707/board.c index c4f78a8135..122348210d 100644 --- a/arch/arm/boards/module-mb7707/board.c +++ b/arch/arm/boards/module-mb7707/board.c @@ -7,7 +7,7 @@ #include <init.h> #include <driver.h> #include <usb/ehci.h> -#include <mach/hardware.h> +#include <mach/uemd/hardware.h> static int hostname_init(void) { diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h index b3bd8530de..63bd8c022a 100644 --- a/arch/arm/include/asm/debug_ll.h +++ b/arch/arm/include/asm/debug_ll.h @@ -30,6 +30,8 @@ #include <mach/layerscape/debug_ll.h> #elif defined CONFIG_ARCH_TEGRA #include <mach/tegra/debug_ll.h> +#elif defined CONFIG_ARCH_UEMD +#include <mach/uemd/debug_ll.h> #else #ifndef CONFIG_ARCH_ARM64_VIRT #include <mach/debug_ll.h> diff --git a/arch/arm/mach-uemd/include/mach/debug_ll.h b/include/mach/uemd/debug_ll.h similarity index 97% rename from arch/arm/mach-uemd/include/mach/debug_ll.h rename to include/mach/uemd/debug_ll.h index a565b67275..df24e1d938 100644 --- a/arch/arm/mach-uemd/include/mach/debug_ll.h +++ b/include/mach/uemd/debug_ll.h @@ -21,7 +21,7 @@ #define __INCLUDE_ARCH_DEBUG_LL_H__ #include <asm/io.h> -#include <mach/hardware.h> +#include <mach/uemd/hardware.h> #define DEBUG_LL_UART_ADDR UEMD_UART0_BASE #define DEBUG_LL_UART_RSHFT 2 diff --git a/arch/arm/mach-uemd/include/mach/hardware.h b/include/mach/uemd/hardware.h similarity index 100% rename from arch/arm/mach-uemd/include/mach/hardware.h rename to include/mach/uemd/hardware.h -- 2.30.2