diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2015-09-04 10:41:02 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-09-10 09:52:06 +0000 |
| commit | 74b964ec4ace463d0b221a369a754bc86776e594 (patch) | |
| tree | 3a5bc109379703d7282a3bb33f84eb7a0904f76f /src/mainboard/intel/kunimitsu/spd | |
| parent | 963bfa7a0f36d25b22ff221ddc3f1a537bb655a2 (diff) | |
| download | coreboot-74b964ec4ace463d0b221a369a754bc86776e594.tar.xz | |
kunimitsu: Clean up mainboard code to match glados
Clean up the intel/kunimitsu mainboard code to match the code
and cleanups in glados. Many of these are trivial changes that
do not impact things in a meaningful way but will make it easier
to diff the code and keep the mainboards in sync.
- use relative path for mainboard includes to make porting easier
- fix trivial style issues to match glados so diffs are clean
- pull GPIO configuration into gpio.h and use from there
- remove thermal.h as it is not used on this board
- make info message BIOS_INFO instead of BIOS_ERR
- add support for SPD manufacturer and part number in SMBIOS
BUG=chrome-os-partner:40635
BRANCH=none
TEST=emerge-kunimitsu coreboot
Change-Id: I64a053bcec0e0ff25a57f65659f391ab64d9a11a
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e47f0fd3e00a665f07098c7ea0018d51b105d1be
Original-Change-Id: Ib787f3ccc63115de48c4d608ca2bd81b58d24b6c
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/297752
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11576
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/intel/kunimitsu/spd')
| -rw-r--r-- | src/mainboard/intel/kunimitsu/spd/spd.c | 23 | ||||
| -rw-r--r-- | src/mainboard/intel/kunimitsu/spd/spd.h | 8 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/mainboard/intel/kunimitsu/spd/spd.c b/src/mainboard/intel/kunimitsu/spd/spd.c index e54f1a6bb1..b8e0be6545 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd.c +++ b/src/mainboard/intel/kunimitsu/spd/spd.c @@ -19,17 +19,18 @@ */ #include <arch/byteorder.h> +#include <boardid.h> #include <cbfs.h> #include <console/console.h> -#include <string.h> #include <gpio.h> #include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> -#include <ec/google/chromeec/ec.h> -#include <mainboard/intel/kunimitsu/spd/spd.h> -#include <boardid.h> -#include <mainboard/intel/kunimitsu/boardid.h> +#include <string.h> + +#include "../boardid.h" +#include "../gpio.h" +#include "spd.h" static void mainboard_print_spd_info(uint8_t spd[]) { @@ -90,10 +91,10 @@ void mainboard_fill_spd_data(struct pei_data *pei_data) int spd_index, sku_id; gpio_t spd_gpios[] = { - GPP_C12, /* PCH_MEM_CONFIG[0] */ - GPP_C13, /* PCH_MEM_CONFIG[1] */ - GPP_C14, /* PCH_MEM_CONFIG[2] */ - GPP_C15, /* PCH_MEM_CONFIG[3] */ + GPIO_MEM_CONFIG_0, + GPIO_MEM_CONFIG_1, + GPIO_MEM_CONFIG_2, + GPIO_MEM_CONFIG_3, }; spd_index = gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios)); @@ -102,8 +103,8 @@ void mainboard_fill_spd_data(struct pei_data *pei_data) * and not SKU ID but on SCRD it indicates SKU. */ sku_id = board_id(); - printk(BIOS_ERR, "SPD index %d\n", spd_index); - printk(BIOS_ERR, "Board ID %d\n", sku_id); + printk(BIOS_INFO, "SPD index %d\n", spd_index); + printk(BIOS_INFO, "Board ID %d\n", sku_id); /* Load SPD data from CBFS */ spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD, diff --git a/src/mainboard/intel/kunimitsu/spd/spd.h b/src/mainboard/intel/kunimitsu/spd/spd.h index 18d4e68c00..eaa873b55a 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd.h +++ b/src/mainboard/intel/kunimitsu/spd/spd.h @@ -18,8 +18,8 @@ * Foundation, Inc. */ -#ifndef _MAINBOARD_SPD_H_ -#define _MAINBOARD_SPD_H_ +#ifndef MAINBOARD_SPD_H +#define MAINBOARD_SPD_H #define SPD_LEN 256 @@ -32,6 +32,6 @@ #define SPD_BUS_DEV_WIDTH 8 #define SPD_PART_OFF 128 #define SPD_PART_LEN 18 +#define SPD_MANU_OFF 148 - -#endif /* _MAINBOARD_SPD_H_ */ +#endif |