From d43563f6036360280484699269f9ea666b0f9ee5 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Tue, 14 Jul 2020 08:58:32 -0400
Subject: [PATCH] arm-bsp: Fix tc0 compile

TC0 does not compile on the latest master branch.  Clean-up the recipe
and get it compiling again.

Change-Id: I9eda0db826727ca33cac5a1f0be68024a8827900
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-kernel/linux/linux-arm-platforms.inc  | 13 +++++++++++++
 .../recipes-kernel/linux/linux-arm64-ack-tc0.inc  | 15 ---------------
 .../linux/linux-arm64-ack_4.19.bbappend           |  5 ++---
 .../recipes-kernel/linux/linux-arm64-ack_4.19.bb  |  1 -
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-tc0.inc

diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index 84cd6a7a..70bb8bde 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -44,3 +44,16 @@ do_patch_append_fvp-base() {
 #
 COMPATIBLE_MACHINE_juno = "juno"
 KMACHINE_juno = "juno"
+
+#
+# Total Compute KMACHINE
+#
+COMPATIBLE_MACHINE_tc0 = "tc0"
+KMACHINE_tc0 = "tc0"
+KBUILD_DEFCONFIG_tc0 = "defconfig"
+KCONFIG_MODE_tc0 = "--alldefconfig"
+SRC_URI_append_tc0 = " \
+    file://0001-drm-Add-component-aware-simple-encoder.patch \
+    file://0002-swap-red-and-blue-colors-in-HDLCD-driver.patch \
+    file://defconfig \
+    "
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-tc0.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-tc0.inc
deleted file mode 100644
index a8fe6ff4..00000000
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-tc0.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# TC0 MACHINE specific configurations
-#
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-arm64-ack-4.19:${THISDIR}/files:"
-
-SRC_URI_append = " \
-    file://defconfig \
-    file://0001-drm-Add-component-aware-simple-encoder.patch \
-    file://0002-swap-red-and-blue-colors-in-HDLCD-driver.patch \
-    "
-
-KCONFIG_MODE = "--alldefconfig"
-
-COMPATIBLE_MACHINE = "tc0"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_4.19.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_4.19.bbappend
index 4df48314..4b1aaa0f 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_4.19.bbappend
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_4.19.bbappend
@@ -1,6 +1,5 @@
 # Machine specific configurations
 
-MACHINE_ACK_REQUIRE ?= ""
-MACHINE_ACK_REQUIRE_tc0 = "linux-arm64-ack-tc0.inc"
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-arm64-ack-4.19:${THISDIR}/files:"
 
-require ${MACHINE_ACK_REQUIRE}
+require linux-arm-platforms.inc
diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb b/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
index 99db9605..4eb17e2c 100644
--- a/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
+++ b/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
@@ -3,7 +3,6 @@
 # Copyright (c) 2020 Arm Limited
 #
 
-
 DESCRIPTION = "Linux Android Common Kernel"
 SECTION = "kernel"
 LICENSE = "GPLv2"