CONFIG_MACH mostly influences the inmate defaults, and those are board- specific. So make sure we can address different boards of the same SoC by naming the switches after the boards.
Signed-off-by: Jan Kiszka <[email protected]> --- ci/jailhouse-config-banana-pi.h | 2 +- inmates/lib/arm/include/mach.h | 6 +++--- inmates/lib/arm64/include/mach.h | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ci/jailhouse-config-banana-pi.h b/ci/jailhouse-config-banana-pi.h index 96adb20..f62060f 100644 --- a/ci/jailhouse-config-banana-pi.h +++ b/ci/jailhouse-config-banana-pi.h @@ -1,2 +1,2 @@ #define CONFIG_ARM_GIC_V2 1 -#define CONFIG_MACH_SUN7I 1 +#define CONFIG_MACH_BANANAPI 1 diff --git a/inmates/lib/arm/include/mach.h b/inmates/lib/arm/include/mach.h index b7ad294..1d2cf51 100644 --- a/inmates/lib/arm/include/mach.h +++ b/inmates/lib/arm/include/mach.h @@ -1,8 +1,8 @@ /* * Jailhouse, a Linux-based partitioning hypervisor * - * Copyright (c) Siemens AG, 2015 * Copyright (c) ARM Limited, 2014 + * Copyright (c) Siemens AG, 2015-2017 * * Authors: * Jan Kiszka <[email protected]> @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#ifdef CONFIG_MACH_TEGRA124 +#ifdef CONFIG_MACH_JETSON_TK1 #define CON_TYPE "8250" #define CON_BASE 0x70006300 /* UART D on tegra124, exposed to the DB9 connector of the Jetson TK1 */ @@ -26,7 +26,7 @@ #define TIMER_IRQ 27 -#elif defined(CONFIG_MACH_SUN7I) +#elif defined(CONFIG_MACH_BANANAPI) #define CON_TYPE "8250" #define CON_BASE 0x01c29c00 #define CON_DIVIDER 0x0d diff --git a/inmates/lib/arm64/include/mach.h b/inmates/lib/arm64/include/mach.h index 11aff7d..af4f012 100644 --- a/inmates/lib/arm64/include/mach.h +++ b/inmates/lib/arm64/include/mach.h @@ -2,8 +2,7 @@ * Jailhouse AArch64 support * * Copyright (C) 2015 Huawei Technologies Duesseldorf GmbH - * Copyright (c) Siemens AG, 2016 - * + * Copyright (c) Siemens AG, 2016-2017 * * Authors: * Antonios Motakis <[email protected]> @@ -31,7 +30,7 @@ #define TIMER_IRQ 27 -#elif defined(CONFIG_MACH_HI6220) +#elif defined(CONFIG_MACH_HIKEY) #define CON_TYPE "PL011" #define CON_BASE 0xf7113000 @@ -40,7 +39,7 @@ #define TIMER_IRQ 27 -#elif defined(CONFIG_MACH_TEGRA_TX1) +#elif defined(CONFIG_MACH_JETSON_TX1) #define CON_TYPE "8250" #define CON_BASE 0x70006000 -- 2.1.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
