Mike Banon has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37979 )
Change subject: mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK
Warning: not tested on hardware.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: If56c4c505c1704411a3a861fe21bd416b3df6356 --- M src/mainboard/amd/olivehillplus/Kconfig M src/mainboard/amd/olivehillplus/Kconfig.name M src/mainboard/amd/olivehillplus/Makefile.inc A src/mainboard/amd/olivehillplus/bootblock.c D src/mainboard/amd/olivehillplus/romstage.c 5 files changed, 35 insertions(+), 73 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/37979/1
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig index 907de3b..49b270d 100644 --- a/src/mainboard/amd/olivehillplus/Kconfig +++ b/src/mainboard/amd/olivehillplus/Kconfig @@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y #select BINARYPI_LEGACY_WRAPPER - #select ROMCC_BOOTBLOCK select CPU_AMD_PI_00730F01 select NORTHBRIDGE_AMD_PI_00730F01 select SOUTHBRIDGE_AMD_PI_AVALON diff --git a/src/mainboard/amd/olivehillplus/Kconfig.name b/src/mainboard/amd/olivehillplus/Kconfig.name index 1ce4a20..85a3e86 100644 --- a/src/mainboard/amd/olivehillplus/Kconfig.name +++ b/src/mainboard/amd/olivehillplus/Kconfig.name @@ -1,3 +1,2 @@ -# Disabled -#config BOARD_AMD_OLIVEHILLPLUS -# bool "Olive Hill Plus" +config BOARD_AMD_OLIVEHILLPLUS + bool "Olive Hill Plus" diff --git a/src/mainboard/amd/olivehillplus/Makefile.inc b/src/mainboard/amd/olivehillplus/Makefile.inc index 37c1dce..e6934b4 100644 --- a/src/mainboard/amd/olivehillplus/Makefile.inc +++ b/src/mainboard/amd/olivehillplus/Makefile.inc @@ -13,6 +13,8 @@ # GNU General Public License for more details. #
+bootblock-y += bootblock.c + romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c
diff --git a/src/mainboard/amd/olivehillplus/bootblock.c b/src/mainboard/amd/olivehillplus/bootblock.c new file mode 100644 index 0000000..78f6830 --- /dev/null +++ b/src/mainboard/amd/olivehillplus/bootblock.c @@ -0,0 +1,31 @@ +/* + * 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. + */ + +#include <amdblocks/acpimmio.h> +#include <bootblock_common.h> + +void bootblock_mainboard_early_init(void) +{ + volatile u32 i, val; + + /* Disable PCI-PCI bridge and release GPIO32/33 for other uses. */ + pm_write8(0xea, 0x1); + + /* + * This refers to LpcClkDrvSth settling time. Without this setting, processor + * initialization is slow or incorrect, so this wait has been replicated from + * earlier development boards. + */ + for (i = 0; i < 200000; i++) + inb(0xcd6); +} diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c deleted file mode 100644 index 3dd7d53..0000000 --- a/src/mainboard/amd/olivehillplus/romstage.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 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 <stdint.h> -#include <device/pci_def.h> -#include <arch/io.h> -#include <arch/cpu.h> -#include <cpu/x86/lapic.h> -#include <console/console.h> -#include <northbridge/amd/agesa/state_machine.h> -#include <southbridge/amd/pi/hudson/hudson.h> - -static void romstage_main_template(void) -{ - u32 val; - - /* - * In Hudson RRG, PMIOxD2[5:4] is "Drive strength control for - * LpcClk[1:0]". This following register setting has been - * replicated in every reference design since Parmer, so it is - * believed to be required even though it is not documented in - * the SoC BKDGs. Without this setting, there is no serial - * output. - */ - outb(0xD2, 0xcd6); - outb(0x00, 0xcd7); - - if (!cpu_init_detectedx && boot_cpu()) { - post_code(0x30); - - post_code(0x31); - console_init(); - } - - /* Load MPB */ - val = cpuid_eax(1); - printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx); - - /* - * This refers to LpcClkDrvSth settling time. Without this setting, processor - * initialization is slow or incorrect, so this wait has been replicated from - * earlier development boards. - */ - { - int i; - for (i = 0; i < 200000; i++) - inb(0xCD6); - } -} - -void agesa_postcar(struct sysinfo *cb) -{ - /* After AMD_INIT_ENV -> move to ramstage ? */ - outb(0xEA, 0xCD6); - outb(0x1, 0xcd7); -}
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37979
to look at the new patch set (#2).
Change subject: mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK
Warning: not tested on hardware.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: If56c4c505c1704411a3a861fe21bd416b3df6356 --- M src/mainboard/amd/olivehillplus/Kconfig M src/mainboard/amd/olivehillplus/Kconfig.name M src/mainboard/amd/olivehillplus/Makefile.inc A src/mainboard/amd/olivehillplus/bootblock.c D src/mainboard/amd/olivehillplus/romstage.c 5 files changed, 35 insertions(+), 76 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/37979/2
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37979
to look at the new patch set (#3).
Change subject: mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK
Warning: not tested on hardware.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: If56c4c505c1704411a3a861fe21bd416b3df6356 --- M src/mainboard/amd/olivehillplus/Kconfig M src/mainboard/amd/olivehillplus/Kconfig.name M src/mainboard/amd/olivehillplus/Makefile.inc A src/mainboard/amd/olivehillplus/bootblock.c D src/mainboard/amd/olivehillplus/romstage.c 5 files changed, 35 insertions(+), 76 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/37979/3
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37979
to look at the new patch set (#4).
Change subject: mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK
Warning: not tested on hardware.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: If56c4c505c1704411a3a861fe21bd416b3df6356 --- M src/mainboard/amd/olivehillplus/Kconfig M src/mainboard/amd/olivehillplus/Kconfig.name M src/mainboard/amd/olivehillplus/Makefile.inc A src/mainboard/amd/olivehillplus/bootblock.c D src/mainboard/amd/olivehillplus/romstage.c 5 files changed, 36 insertions(+), 76 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/37979/4
Mike Banon has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37979 )
Change subject: mb/amd/olivehillplus: Switch away from ROMCC_BOOTBLOCK ......................................................................
Abandoned
These remaining-with-ROMCC rare boards seem to be broken: even if switched away from ROMCC_BOOTBLOCK, their builds are failing because of the other reasons (unrelated to new bootblock.c file). I am abandoning their "switch away from ROMCC_BOOTBLOCK" changes (CB:37975 - CB:37982), but if anyone cares about these boards - they can restore these changes and advance. Read more at CB:37750.
-
Mike Banon (Code Review)