From fb73bb35c03f62a6249db90fb09bdd7f59db3a86 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Sat, 8 Oct 2016 10:14:14 -0600 Subject: [PATCH] amd/gardenia: Remove board ID capability Remove the last bit of Bettong board_id checking from Gardenia. Original-Signed-off-by: Marshall Dawson Original-Reviewed-by: Marc Jones (cherry picked from commit b617823d1d2860a3f6d766a40ae95e5486739a5c) Change-Id: Ibc56dbbfa1b15b21ebadb9f6c9c54936566a2986 Signed-off-by: Marc Jones Reviewed-on: https://review.coreboot.org/17221 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/amd/gardenia/Makefile.inc | 2 -- src/mainboard/amd/gardenia/boardid.c | 48 ------------------------- 2 files changed, 50 deletions(-) delete mode 100644 src/mainboard/amd/gardenia/boardid.c diff --git a/src/mainboard/amd/gardenia/Makefile.inc b/src/mainboard/amd/gardenia/Makefile.inc index 99159e8548..0994a70aef 100644 --- a/src/mainboard/amd/gardenia/Makefile.inc +++ b/src/mainboard/amd/gardenia/Makefile.inc @@ -15,11 +15,9 @@ romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c -romstage-y += boardid.c ramstage-y += BiosCallOuts.c ramstage-y += OemCustomize.c ifeq ($(CONFIG_HUDSON_IMC_FWM), y) ramstage-y += fchec.c endif -ramstage-y += boardid.c diff --git a/src/mainboard/amd/gardenia/boardid.c b/src/mainboard/amd/gardenia/boardid.c deleted file mode 100644 index e2e816211b..0000000000 --- a/src/mainboard/amd/gardenia/boardid.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Advanced Micro Devices, Inc. - * - * 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 -#include -#include - -/** - *Gardenia uses 3 GPIO(5-7) pins to identify board. - *The GPIO ports are mapped to MMIO space. - *The GPIO value and board version are mapped as follow: - *GPIO5 GPIO6 GPIO7 Version - * 0 0 0 A - * 0 0 1 B - * ...... - * 1 1 1 H - */ -uint8_t board_id(void) -{ - void *gpiommioaddr; - u8 value = 0; - u8 boardrev = 0; - char boardid; - - gpiommioaddr = (void *)0xfed80000ul + 0x1500; - value = read8(gpiommioaddr + (7 << 2) + 2); /* agpio7: board_id2 */ - boardrev = value & 1; - value = read8(gpiommioaddr + (6 << 2) + 2); /* agpio6: board_id1 */ - boardrev |= (value & 1) << 1; - value = read8(gpiommioaddr + (5 << 2) + 2); /* agpio5: board_id0 */ - boardrev |= (value & 1) << 2; - - boardid = 'A' + boardrev; - - return boardid; -}