From e86190839e996c069c28454657e8056ffaa8b8db Mon Sep 17 00:00:00 2001
From: Kent McLeod <Kent.Mcleod@data61.csiro.au>
Date: Fri, 12 Apr 2019 14:11:58 +1000
Subject: [PATCH] tx1: use declare_default_headers

 - remove unused header files replaced by declare_default_headers
---
 include/plat/tx1/plat/machine.h          | 22 ----------------------
 include/plat/tx1/plat/machine/hardware.h | 23 -----------------------
 include/plat/tx1/plat/machine/timer.h    | 20 --------------------
 src/plat/tx1/config.cmake                |  1 +
 4 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 include/plat/tx1/plat/machine.h
 delete mode 100644 include/plat/tx1/plat/machine/hardware.h
 delete mode 100644 include/plat/tx1/plat/machine/timer.h

diff --git a/include/plat/tx1/plat/machine.h b/include/plat/tx1/plat/machine.h
deleted file mode 100644
index 7e4cd404f..000000000
--- a/include/plat/tx1/plat/machine.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#ifndef __PLAT_MACHINE_H
-#define __PLAT_MACHINE_H
-
-enum IRQConstants {
-    maxIRQ                          = 224
-} platform_interrupt_t;
-
-#include <arch/machine/gic_pl390.h>
-
-#endif  /* ! __PLAT_MACHINE_H */
diff --git a/include/plat/tx1/plat/machine/hardware.h b/include/plat/tx1/plat/machine/hardware.h
deleted file mode 100644
index a120d25bc..000000000
--- a/include/plat/tx1/plat/machine/hardware.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#ifndef __PLAT_MACHINE_HARDWARE_H
-#define __PLAT_MACHINE_HARDWARE_H
-
-#include <config.h>
-#include <basic_types.h>
-#include <linker.h>
-#include <arch/object/vcpu.h>
-#include <plat/machine.h>
-#include <plat/machine/devices_gen.h>
-
-#endif /* __PLAT_MACHINE_HARDWARE_H */
diff --git a/include/plat/tx1/plat/machine/timer.h b/include/plat/tx1/plat/machine/timer.h
deleted file mode 100644
index e9eff7b59..000000000
--- a/include/plat/tx1/plat/machine/timer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#ifndef __PLAT_MACHINE_TIMER_H
-#define __PLAT_MACHINE_TIMER_H
-
-#define TIMER_CLOCK_HZ 19200000llu
-
-#include <arch/machine/generic_timer.h>
-
-#endif /* !__PLAT_MACHINE_TIMER_H */
diff --git a/src/plat/tx1/config.cmake b/src/plat/tx1/config.cmake
index bd62550da..5282d46aa 100644
--- a/src/plat/tx1/config.cmake
+++ b/src/plat/tx1/config.cmake
@@ -21,6 +21,7 @@ if(KernelPlatformTx1)
     set(KernelArmPASizeBits44 ON)
     list(APPEND KernelDTSList "tools/dts/tx1.dts")
     list(APPEND KernelDTSList "src/plat/tx1/overlay-tx1.dts")
+    declare_default_headers(19200000llu 224 arch/machine/gic_pl390.h arch/machine/generic_timer.h)
 endif()
 
 add_sources(