From 96c4fc0aea01f621585fb3add48cb6eaa8b573d7 Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@chromium.org>
Date: Mon, 18 Jul 2016 10:27:28 -0600
Subject: [PATCH] UPSTREAM: gru: Update to match coreboot.org

These are some non-functional changes that were made at coreboot.org
as patches were pulled in.

* Remove second include of board.h
* Remove leading whitespace for comments
* Add coreboot license headers
* Add a line after the license header

BRANCH=none
BUG=none
TEST=none

Change-Id: I092cf64ddcde1ed07f38a8107766cbffded71796
Signed-off-by: Martin Roth <martinroth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/361360
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/google/gru/mainboard.c                |  2 --
 src/mainboard/google/gru/sdram_configs.c            |  2 +-
 .../gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc    | 13 +++++++++++++
 .../gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc    |  1 +
 .../gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc    | 13 +++++++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index 9231e4a8ef..200644fbc7 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -33,8 +33,6 @@
 
 #include "board.h"
 
-#include "board.h"
-
 static void configure_emmc(void)
 {
 	/* Host controller does not support programmable clock generator.
diff --git a/src/mainboard/google/gru/sdram_configs.c b/src/mainboard/google/gru/sdram_configs.c
index eac2cdde99..562055d158 100644
--- a/src/mainboard/google/gru/sdram_configs.c
+++ b/src/mainboard/google/gru/sdram_configs.c
@@ -23,7 +23,7 @@
 
 static struct rk3399_sdram_params sdram_configs[] = {
 #include "sdram_inf/sdram-lpddr3-hynix-4GB-200.inc"
-  /* THIS IS FOR KEVIN ONLY! crosbug.com/p/54144 */
+/* THIS IS FOR KEVIN ONLY! crosbug.com/p/54144 */
 #include "sdram_inf/kevin-sdram-lpddr3-hynix-4GB.inc"
 #include "sdram_inf/sdram-lpddr3-hynix-4GB-666.inc"
 #include "sdram_inf/sdram-lpddr3-hynix-4GB-800.inc"
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc b/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc
index d93d5310dd..253364097d 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc
+++ b/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc
@@ -1,3 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 {
 	{
 		{
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc b/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc
index 34f3c4696e..dc5a78f6bd 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc
+++ b/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc
@@ -10,6 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 {
 	{
 		{
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc b/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc
index 60983ba845..4b02679611 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc
+++ b/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc
@@ -1,3 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 {
 	{
 		{