The MACHINE variable is no longer needed because there are no mach
folders anymore. We can use the CONFIG_MACH_* directly in the headers
and remove the makefile dances.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
inmates/lib/arm/Makefile.lib | 8 --------
inmates/lib/arm/include/mach.h | 6 +++---
inmates/lib/arm64/Makefile.lib | 10 ----------
inmates/lib/arm64/include/mach.h | 10 +++++-----
4 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/inmates/lib/arm/Makefile.lib b/inmates/lib/arm/Makefile.lib
index a1042ca..0293c06 100644
--- a/inmates/lib/arm/Makefile.lib
+++ b/inmates/lib/arm/Makefile.lib
@@ -28,14 +28,6 @@ define DECLARE_TARGETS =
$$(_TARGETS:.bin=-linked.o) $$(_TARGETS)
endef
-mach-$(CONFIG_MACH_VEXPRESS) := VEXPRESS
-mach-$(CONFIG_MACH_SUN7I) := SUN7I
-mach-$(CONFIG_MACH_TEGRA124) := TEGRA124
-
-MACHINE := MACH_$(mach-y)
-KBUILD_CFLAGS += -D$(MACHINE)
-KBUILD_AFLAGS += -D$(MACHINE)
-
# prevent deleting intermediate files which would cause rebuilds
.SECONDARY: $(addprefix $(obj)/,$(targets))
diff --git a/inmates/lib/arm/include/mach.h b/inmates/lib/arm/include/mach.h
index d311b61..99f2341 100644
--- a/inmates/lib/arm/include/mach.h
+++ b/inmates/lib/arm/include/mach.h
@@ -12,7 +12,7 @@
* the COPYING file in the top-level directory.
*/
-#ifdef MACH_TEGRA124
+#ifdef CONFIG_MACH_TEGRA124
#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(MACH_SUN7I)
+#elif defined(CONFIG_MACH_SUN7I)
#define CON_TYPE "8250"
#define CON_BASE 0x01c29c00
@@ -38,7 +38,7 @@
#define TIMER_IRQ 27
-#elif defined(MACH_VEXPRESS)
+#elif defined(CONFIG_MACH_VEXPRESS)
#define CON_TYPE "PL011"
#define CON_BASE 0x1c090000
diff --git a/inmates/lib/arm64/Makefile.lib b/inmates/lib/arm64/Makefile.lib
index cdfe461..06dc593 100644
--- a/inmates/lib/arm64/Makefile.lib
+++ b/inmates/lib/arm64/Makefile.lib
@@ -26,16 +26,6 @@ define DECLARE_TARGETS =
$$(_TARGETS:.bin=-linked.o) $$(_TARGETS)
endef
-mach-$(CONFIG_MACH_FOUNDATION_V8) := FOUNDATION_V8
-mach-$(CONFIG_MACH_AMD_SEATTLE) := AMD_SEATTLE
-mach-$(CONFIG_MACH_HI6220) := HI6220
-mach-$(CONFIG_MACH_TEGRA_TX1) := TEGRA_TX1
-mach-$(CONFIG_MACH_ZYNQMP_ZCU102) := ZYNQMP_ZCU102
-
-MACHINE := MACH_$(mach-y)
-KBUILD_CFLAGS += -D$(MACHINE)
-KBUILD_AFLAGS += -D$(MACHINE)
-
# prevent deleting intermediate files which would cause rebuilds
.SECONDARY: $(addprefix $(obj)/,$(targets))
diff --git a/inmates/lib/arm64/include/mach.h b/inmates/lib/arm64/include/mach.h
index 0af49b8..11aff7d 100644
--- a/inmates/lib/arm64/include/mach.h
+++ b/inmates/lib/arm64/include/mach.h
@@ -13,7 +13,7 @@
* the COPYING file in the top-level directory.
*/
-#ifdef MACH_AMD_SEATTLE
+#ifdef CONFIG_MACH_AMD_SEATTLE
#define CON_TYPE "PL011"
#define CON_BASE 0xe1010000
@@ -22,7 +22,7 @@
#define TIMER_IRQ 27
-#elif defined(MACH_FOUNDATION_V8)
+#elif defined(CONFIG_MACH_FOUNDATION_V8)
#define CON_TYPE "PL011"
#define CON_BASE 0x1c090000
@@ -31,7 +31,7 @@
#define TIMER_IRQ 27
-#elif defined(MACH_HI6220)
+#elif defined(CONFIG_MACH_HI6220)
#define CON_TYPE "PL011"
#define CON_BASE 0xf7113000
@@ -40,7 +40,7 @@
#define TIMER_IRQ 27
-#elif defined(MACH_TEGRA_TX1)
+#elif defined(CONFIG_MACH_TEGRA_TX1)
#define CON_TYPE "8250"
#define CON_BASE 0x70006000
@@ -49,7 +49,7 @@
#define TIMER_IRQ 27
-#elif defined(MACH_ZYNQMP_ZCU102)
+#elif defined(CONFIG_MACH_ZYNQMP_ZCU102)
#define CON_TYPE "XUARTPS"
#define CON_BASE 0xff010000
--
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 jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
