summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2019-05-04 17:06:06 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-05-07 15:58:39 +0000
commit0ebdf2ac75a6459534d0543d3bc963a96316f920 (patch)
tree65a538bceafc80666ede4b0a828a8024633bcc49
parentfeb50f15cc888150c90a5a12e749773cfe401dd5 (diff)
downloadcoreboot-0ebdf2ac75a6459534d0543d3bc963a96316f920.tar.xz
mb/purism/librem_skl: Refactor to get rid of `pei_data`
The SoC specific `struct pei_data` was filled with values that were never consumed anywhere again. So just merge the used code into `romstage.c` where it's effectively used. Change-Id: I499b3cfcdd5400ea132749555d433a2d8a9471a3 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32595 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
-rw-r--r--src/mainboard/purism/librem_skl/Makefile.inc3
-rw-r--r--src/mainboard/purism/librem_skl/pei_data.c65
-rw-r--r--src/mainboard/purism/librem_skl/pei_data.h24
-rw-r--r--src/mainboard/purism/librem_skl/romstage.c36
4 files changed, 35 insertions, 93 deletions
diff --git a/src/mainboard/purism/librem_skl/Makefile.inc b/src/mainboard/purism/librem_skl/Makefile.inc
index 5a7131f1ba..35f0f6cbde 100644
--- a/src/mainboard/purism/librem_skl/Makefile.inc
+++ b/src/mainboard/purism/librem_skl/Makefile.inc
@@ -13,8 +13,5 @@
## GNU General Public License for more details.
##
-romstage-y += pei_data.c
-
-ramstage-y += pei_data.c
ramstage-y += ramstage.c
ramstage-y += hda_verb.c
diff --git a/src/mainboard/purism/librem_skl/pei_data.c b/src/mainboard/purism/librem_skl/pei_data.c
deleted file mode 100644
index 0be917d3c7..0000000000
--- a/src/mainboard/purism/librem_skl/pei_data.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Google Inc.
- * Copyright (C) 2015 Intel Corporation
- * Copyright (C) 2017 Purism SPC.
- *
- * 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.
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
-#include "pei_data.h"
-
-void mainboard_fill_dq_map_data(void *dq_map_ptr)
-{
- /* DQ byte map */
- const u8 dq_map[2][12] = {
- { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
- 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
- { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC,
- 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };
- memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
-}
-
-void mainboard_fill_dqs_map_data(void *dqs_map_ptr)
-{
- /* DQS CPU<>DRAM map */
- const u8 dqs_map[2][8] = {
- { 0, 1, 3, 2, 4, 5, 6, 7 },
- { 1, 0, 4, 5, 2, 3, 6, 7 } };
- memcpy(dqs_map_ptr, dqs_map, sizeof(dqs_map));
-}
-
-void mainboard_fill_rcomp_res_data(void *rcomp_ptr)
-{
- /* Rcomp resistor */
- const u16 RcompResistor[3] = { 121, 81, 100 };
- memcpy(rcomp_ptr, RcompResistor,
- sizeof(RcompResistor));
-}
-
-void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr)
-{
- /* Rcomp target */
- const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 };
- memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget));
-}
-
-void mainboard_fill_pei_data(struct pei_data *pei_data)
-{
- mainboard_fill_dq_map_data(&pei_data->dq_map);
- mainboard_fill_dqs_map_data(&pei_data->dqs_map);
- mainboard_fill_rcomp_res_data(&pei_data->RcompResistor);
- mainboard_fill_rcomp_strength_data(&pei_data->RcompTarget);
-}
diff --git a/src/mainboard/purism/librem_skl/pei_data.h b/src/mainboard/purism/librem_skl/pei_data.h
deleted file mode 100644
index 320d9803d1..0000000000
--- a/src/mainboard/purism/librem_skl/pei_data.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2017 Purism SPC.
- *
- * 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.
- */
-
-#ifndef _MAINBOARD_PEI_DATA_H_
-#define _MAINBOARD_PEI_DATA_H_
-
-void mainboard_fill_dq_map_data(void *dq_map_ptr);
-void mainboard_fill_dqs_map_data(void *dqs_map_ptr);
-void mainboard_fill_rcomp_res_data(void *rcomp_ptr);
-void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr);
-
-#endif
diff --git a/src/mainboard/purism/librem_skl/romstage.c b/src/mainboard/purism/librem_skl/romstage.c
index 63d148a98e..faf4090ae1 100644
--- a/src/mainboard/purism/librem_skl/romstage.c
+++ b/src/mainboard/purism/librem_skl/romstage.c
@@ -19,7 +19,41 @@
#include <assert.h>
#include <soc/romstage.h>
#include <spd_bin.h>
-#include "pei_data.h"
+#include <string.h>
+
+static void mainboard_fill_dq_map_data(void *dq_map_ptr)
+{
+ /* DQ byte map */
+ const u8 dq_map[2][12] = {
+ { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
+ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
+ { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC,
+ 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };
+ memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
+}
+
+static void mainboard_fill_dqs_map_data(void *dqs_map_ptr)
+{
+ /* DQS CPU<>DRAM map */
+ const u8 dqs_map[2][8] = {
+ { 0, 1, 3, 2, 4, 5, 6, 7 },
+ { 1, 0, 4, 5, 2, 3, 6, 7 } };
+ memcpy(dqs_map_ptr, dqs_map, sizeof(dqs_map));
+}
+
+static void mainboard_fill_rcomp_res_data(void *rcomp_ptr)
+{
+ /* Rcomp resistor */
+ const u16 RcompResistor[3] = { 121, 81, 100 };
+ memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor));
+}
+
+static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr)
+{
+ /* Rcomp target */
+ const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 };
+ memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget));
+}
void mainboard_memory_init_params(FSPM_UPD *mupd)
{