GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd/gardenia/bootblock/BiosCallOuts.c: Replace GPIO table 

Fill up the dummy gpio_set_stage_reset[] and gpio_set_stage_ram[] with data
from agesa_board_gpios[], wrap format and delete agesa_board_gpios[].
Finally, make platform_FchParams_reset() an empty function.

BUG=b:64140392
TEST=Build gardenia.

Change-Id: Id2ea63656a7d2f20f55fc5a4c75457db85b80cbd
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/22990
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Richard Spiegel 2018-01-04 15:16:52 -07:00 committed by Martin Roth
parent 254f10e9e6
commit ba29c9992c
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mainboard/amd/gardenia/bootblock/gpio.c
View File

@ -27,42 +27,27 @@
const struct soc_amd_stoneyridge_gpio gpio_set_stage_reset[] = { const struct soc_amd_stoneyridge_gpio gpio_set_stage_reset[] = {
/* NFC PU */ /* NFC PU */
{GPIO_64, Function0, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H }, {GPIO_64, Function0, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H },
/* PCIe presence detect */
{GPIO_69, Function0, FCH_GPIO_PULL_UP_ENABLE | INPUT },
/* MUX for Power Express Eval */
{GPIO_116, Function1, FCH_GPIO_PULL_DOWN_ENABLE | INPUT },
/* SD power */
{GPIO_119, Function2, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H },
}; };
const struct soc_amd_stoneyridge_gpio gpio_set_stage_ram[] = { const struct soc_amd_stoneyridge_gpio gpio_set_stage_ram[] = {
/* BT radio disable */ /* BT radio disable */
{GPIO_14, Function1, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H }, {GPIO_14, Function1, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H },
};
static const GPIO_CONTROL oem_gardenia_gpio[] = {
/* BT radio disable */
{14, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE
| FCH_GPIO_OUTPUT_ENABLE},
/* NFC PU */
{64, Function0, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE
| FCH_GPIO_OUTPUT_ENABLE},
/* NFC wake */ /* NFC wake */
{65, Function0, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE {GPIO_65, Function0, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H },
| FCH_GPIO_OUTPUT_ENABLE},
/* Webcam */ /* Webcam */
{66, Function0, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE {GPIO_66, Function0, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H },
| FCH_GPIO_OUTPUT_ENABLE},
/* PCIe presence detect */
{69, Function0, FCH_GPIO_PULL_UP_ENABLE},
/* GPS sleep */ /* GPS sleep */
{70, Function0, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE {GPIO_70, Function0, FCH_GPIO_PULL_UP_ENABLE | OUTPUT_H },
| FCH_GPIO_OUTPUT_ENABLE},
/* MUX for Power Express Eval */
{116, Function1, FCH_GPIO_PULL_DOWN_ENABLE},
/* SD power */
{119, Function2, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE
| FCH_GPIO_OUTPUT_ENABLE},
{-1}
}; };
void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset) void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset)
{ {
FchParams_reset->EarlyOemGpioTable = (void *)oem_gardenia_gpio;
} }
const struct soc_amd_stoneyridge_gpio *board_get_gpio(size_t *size) const struct soc_amd_stoneyridge_gpio *board_get_gpio(size_t *size)