From 2645818c1b270ca8687f9048d887bd4e48618a05 Mon Sep 17 00:00:00 2001
From: Victor Chong <victor.chong@linaro.org>
Date: Wed, 13 Dec 2017 14:50:29 +0900
Subject: [PATCH] fixup! poplar: Add initial support

---
 core/arch/arm/plat-poplar/hi3798cv200.h     | 5 ++---
 core/arch/arm/plat-poplar/main.c            | 3 ---
 core/arch/arm/plat-poplar/platform_config.h | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/arch/arm/plat-poplar/hi3798cv200.h b/core/arch/arm/plat-poplar/hi3798cv200.h
index 0f15b9d66a1..1b6b61ef62e 100644
--- a/core/arch/arm/plat-poplar/hi3798cv200.h
+++ b/core/arch/arm/plat-poplar/hi3798cv200.h
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017, Linaro Limited
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __HI3798cv200_H__
diff --git a/core/arch/arm/plat-poplar/main.c b/core/arch/arm/plat-poplar/main.c
index a5ca73019be..9e7b444ceb0 100644
--- a/core/arch/arm/plat-poplar/main.c
+++ b/core/arch/arm/plat-poplar/main.c
@@ -1,7 +1,5 @@
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
@@ -10,7 +8,6 @@
 #ifdef CFG_PL061
 #include <drivers/pl061_gpio.h>
 #endif
-#include <hi3798cv200.h>
 #include <kernel/generic_boot.h>
 #include <kernel/panic.h>
 #include <kernel/pm_stubs.h>
diff --git a/core/arch/arm/plat-poplar/platform_config.h b/core/arch/arm/plat-poplar/platform_config.h
index 34901314628..fb885d72205 100644
--- a/core/arch/arm/plat-poplar/platform_config.h
+++ b/core/arch/arm/plat-poplar/platform_config.h
@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef PLATFORM_CONFIG_H
 #define PLATFORM_CONFIG_H
 
+#include <hi3798cv200.h>
+
 /* Make stacks aligned to data cache line length */
 #define STACK_ALIGNMENT		64