Mike Banon has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829. Warning: Not tested on hardware, please test if you have this board.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc A src/mainboard/biostar/a68n_5200/bootblock.c D src/mainboard/biostar/a68n_5200/romstage.c 5 files changed, 56 insertions(+), 82 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/1
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig b/src/mainboard/biostar/a68n_5200/Kconfig index f608513..e4271d3 100644 --- a/src/mainboard/biostar/a68n_5200/Kconfig +++ b/src/mainboard/biostar/a68n_5200/Kconfig @@ -15,14 +15,10 @@ # GNU General Public License for more details. #
-config BOARD_BIOSTAR_A68N5200 - def_bool n - if BOARD_BIOSTAR_A68N5200
config BOARD_SPECIFIC_OPTIONS def_bool y - #select ROMCC_BOOTBLOCK select CPU_AMD_AGESA_FAMILY16_KB select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB select SOUTHBRIDGE_AMD_AGESA_YANGTZE diff --git a/src/mainboard/biostar/a68n_5200/Kconfig.name b/src/mainboard/biostar/a68n_5200/Kconfig.name index 6d765d2..52a7f15 100644 --- a/src/mainboard/biostar/a68n_5200/Kconfig.name +++ b/src/mainboard/biostar/a68n_5200/Kconfig.name @@ -1,2 +1,2 @@ -#config BOARD_BIOSTAR_A68N5200 -# bool"A68N-5200" +config BOARD_BIOSTAR_A68N5200 + bool "A68N-5200" diff --git a/src/mainboard/biostar/a68n_5200/Makefile.inc b/src/mainboard/biostar/a68n_5200/Makefile.inc index f8895fa..4dde2cf 100644 --- a/src/mainboard/biostar/a68n_5200/Makefile.inc +++ b/src/mainboard/biostar/a68n_5200/Makefile.inc @@ -13,6 +13,8 @@ # GNU General Public License for more details. #
+bootblock-y += bootblock.c + romstage-y += buildOpts.c romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c diff --git a/src/mainboard/biostar/a68n_5200/bootblock.c b/src/mainboard/biostar/a68n_5200/bootblock.c new file mode 100644 index 0000000..3d36956 --- /dev/null +++ b/src/mainboard/biostar/a68n_5200/bootblock.c @@ -0,0 +1,52 @@ +/* + * 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 <bootblock_common.h> +#include <stdint.h> +#include <device/pci_def.h> +#include <southbridge/amd/common/amd_defs.h> +#include <superio/ite/common/ite.h> +#include <superio/ite/it8728f/it8728f.h> + +#define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) + +#define SERIAL_DEV PNP_DEV(0x2e, IT8728F_SP1) +#define GPIO_DEV PNP_DEV(0x2e, IT8728F_GPIO) +#define CLKIN_DEV PNP_DEV(0x2e, IT8728F_GPIO) + +static void sbxxx_enable_48mhzout(void) +{ + u32 reg32; + + /* most likely programming to 48MHz out signal */ + /* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */ + reg32 = SB_MMIO_MISC32(0x28); + reg32 &= 0xfff8ffff; + SB_MMIO_MISC32(0x28) = reg32; + + /* Enable Auxiliary Clock1, disable FCH 14 MHz OscClk */ + reg32 = SB_MMIO_MISC32(0x40); + reg32 &= 0xffffbffb; + SB_MMIO_MISC32(0x40) = reg32; +} + +void bootblock_mainboard_early_init(void) +{ + /* enable SIO clock */ + sbxxx_enable_48mhzout(); + + /* Enable serial output on it8728f */ + ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_48); + ite_kill_watchdog(GPIO_DEV); + ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); +} diff --git a/src/mainboard/biostar/a68n_5200/romstage.c b/src/mainboard/biostar/a68n_5200/romstage.c deleted file mode 100644 index 5d210fa..0000000 --- a/src/mainboard/biostar/a68n_5200/romstage.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 Advanced Micro Devices, Inc. - * Copyright (C) 2016 Edward O'Callaghan funfunctor@folklore1984.net - * Copyright (C) 2017 Damien Zammit damien@zamaudio.com - * - * 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 <device/pci_ops.h> -#include <northbridge/amd/agesa/state_machine.h> -#include <southbridge/amd/agesa/hudson/hudson.h> -#include <superio/ite/common/ite.h> -#include <superio/ite/it8728f/it8728f.h> - -#define SB_MMIO 0xFED80000 -#define SB_MMIO_MISC32(x) *(volatile u32 *)(SB_MMIO + 0xE00 + (x)) - -#define SERIAL_DEV PNP_DEV(0x2e, IT8728F_SP1) -#define GPIO_DEV PNP_DEV(0x2e, IT8728F_GPIO) -#define CLKIN_DEV PNP_DEV(0x2e, IT8728F_GPIO) - -static void sbxxx_enable_48mhzout(void) -{ - /* most likely programming to 48MHz out signal */ - /* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */ - u32 reg32; - reg32 = SB_MMIO_MISC32(0x28); - reg32 &= 0xfff8ffff; - SB_MMIO_MISC32(0x28) = reg32; - - /* Enable Auxiliary Clock1, disable FCH 14 MHz OscClk */ - reg32 = SB_MMIO_MISC32(0x40); - reg32 &= 0xffffbffb; - SB_MMIO_MISC32(0x40) = reg32; -} - -void board_BeforeAgesa(struct sysinfo *cb) -{ - u8 byte; - - /* Enable the AcpiMmio space */ - outb(0x24, 0xcd6); - outb(0x1, 0xcd7); - - /* Set LPC decode enables. */ - pci_devfn_t dev = PCI_DEV(0, 0x14, 3); - pci_write_config32(dev, 0x44, 0xff03ffd5); - - /* enable SIO LPC decode */ - byte = pci_read_config8(dev, 0x48); - byte |= 3; /* 2e, 2f */ - pci_write_config8(dev, 0x48, byte); - - /* enable serial decode */ - byte = pci_read_config8(dev, 0x44); - byte |= (1 << 6); /* 0x3f8 */ - pci_write_config8(dev, 0x44, byte); - - /* run ite */ - sbxxx_enable_48mhzout(); - ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_48); - ite_kill_watchdog(GPIO_DEV); - ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); -}
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/1/src/mainboard/biostar/a68n_... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/1/src/mainboard/biostar/a68n_... PS1, Line 21: #define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) Macros with complex values should be enclosed in parentheses
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/2/src/mainboard/biostar/a68n_... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/2/src/mainboard/biostar/a68n_... PS2, Line 21: #define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) Macros with complex values should be enclosed in parentheses
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/3/src/mainboard/biostar/a68n_... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/3/src/mainboard/biostar/a68n_... PS3, Line 21: #define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) Macros with complex values should be enclosed in parentheses
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/4/src/mainboard/biostar/a68n_... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/4/src/mainboard/biostar/a68n_... PS4, Line 21: #define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) Macros with complex values should be enclosed in parentheses
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/5/src/mainboard/biostar/a68n_... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/5/src/mainboard/biostar/a68n_... PS5, Line 21: #define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) Macros with complex values should be enclosed in parentheses
Mike Banon has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 5:
I really hope that some boards like this Biostar A68N-5200 could be saved even without a board test result, considering that its' availability to the people is much higher than AMD CRBs - although we made some "Switch away from ROMCC_BOOTBLOCK" changes for them as well - and that these "no ROMCC_BOOTBLOCK" are quite straightforward (i.e. AM1I-A booted at the 1st attempt)
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/6/src/mainboard/biostar/a68n_... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/6/src/mainboard/biostar/a68n_... PS6, Line 21: #define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x)) Macros with complex values should be enclosed in parentheses
Hello Kyösti Mälkki, HAOUAS Elyes, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#7).
Change subject: [TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
[TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829. Warning: Not tested on hardware, please test if you have this board.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc A src/mainboard/biostar/a68n_5200/bootblock.c D src/mainboard/biostar/a68n_5200/romstage.c 5 files changed, 56 insertions(+), 82 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/7
Hello Kyösti Mälkki, HAOUAS Elyes, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#8).
Change subject: [TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
[TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829. Warning: Not tested on hardware, please test if you have this board.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc A src/mainboard/biostar/a68n_5200/bootblock.c D src/mainboard/biostar/a68n_5200/romstage.c 5 files changed, 54 insertions(+), 82 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/8
Hello Kyösti Mälkki, HAOUAS Elyes, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#9).
Change subject: [TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
[TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829. Warning: Not tested on hardware, please test if you have this board.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc A src/mainboard/biostar/a68n_5200/bootblock.c D src/mainboard/biostar/a68n_5200/romstage.c 5 files changed, 55 insertions(+), 82 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/9
Hello Kyösti Mälkki, HAOUAS Elyes, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#10).
Change subject: [TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
[TESTME]biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829. Warning: Not tested on hardware, please test if you have this board.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc A src/mainboard/biostar/a68n_5200/bootblock.c D src/mainboard/biostar/a68n_5200/romstage.c 5 files changed, 54 insertions(+), 82 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/10
Damien Zammit has uploaded a new patch set (#11) to the change originally created by Mike Banon. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829.
TESTED on a68n-5200, boots to payload
Also-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 16 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/11
Damien Zammit has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 11:
Hey all, this board now works without ROMCC. Please note, the cpu fan control still does not work even with enabling IMC. As a workaround, I suggest plugging the cpu fan into sys_fan port.
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 11: Code-Review+1
(2 comments)
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 4: * Copyright (C) 2012 Advanced Micro Devices, Inc. : * Copyright (C) 2016 Edward O'Callaghan funfunctor@folklore1984.net : * Copyright (C) 2017,2020 Damien Zammit damien@zamaudio.com why please ?
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 21: #include <arch/io.h> not used
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 11:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 4: * Copyright (C) 2012 Advanced Micro Devices, Inc. : * Copyright (C) 2016 Edward O'Callaghan funfunctor@folklore1984.net : * Copyright (C) 2017,2020 Damien Zammit damien@zamaudio.com
why please ?
Ok, understood
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 11:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 22: include <device/pci_def.h> not used
Hello Kyösti Mälkki, HAOUAS Elyes, Edward O'Callaghan, build bot (Jenkins), Damien Zammit, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#12).
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the examples of change CB:37737 (ee8f969) and CB:37829.
TESTED on a68n-5200, boots to payload
Also-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/12
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 12: Code-Review+1
(3 comments)
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 4: * Copyright (C) 2012 Advanced Micro Devices, Inc. : * Copyright (C) 2016 Edward O'Callaghan funfunctor@folklore1984.net : * Copyright (C) 2017,2020 Damien Zammit damien@zamaudio.com
Ok, understood
Done
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 21: #include <arch/io.h>
not used
Done
https://review.coreboot.org/c/coreboot/+/37872/11/src/mainboard/biostar/a68n... PS11, Line 22: include <device/pci_def.h>
not used
Done
Damien Zammit has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 12:
Please note, I tested patchset 11 and have no plans to test the hw beyond this. I don't know why you needed to remove those two includes, it didn't seem to compile without them on my end. If it passes jenkins, and you're happy to merge an untested commit, go for it, but I suggest merging version 11.
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 12:
Patch Set 12:
Please note, I tested patchset 11 and have no plans to test the hw beyond this. I don't know why you needed to remove those two includes, it didn't seem to compile without them on my end. If it passes jenkins, and you're happy to merge an untested commit, go for it, but I suggest merging version 11.
those includes are not used at all. it compile without them on my end.
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 13: Code-Review+2
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 13:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37872/13//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37872/13//COMMIT_MSG@9 PS13, Line 9: Following the examples of change CB:37737 (ee8f969) and CB:37829. Please copy the corresponding commit messages.
https://review.coreboot.org/c/coreboot/+/37872/13//COMMIT_MSG@12 PS13, Line 12: : Also-by Tested-by: ?
Hello Kyösti Mälkki, HAOUAS Elyes, Edward O'Callaghan, build bot (Jenkins), Damien Zammit, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#14).
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the example of change CB:37737 (ee8f969). Switching was done by moving a SIO configuration and the clocks setup from 'romstage.c' to 'bootblock.c'.
Tested-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/14
Mike Banon has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 14:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37872/13//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37872/13//COMMIT_MSG@9 PS13, Line 9: Following the examples of change CB:37737 (ee8f969) and CB:37829.
Please copy the corresponding commit messages.
Done
https://review.coreboot.org/c/coreboot/+/37872/13//COMMIT_MSG@12 PS13, Line 12: : Also-by
Tested-by: ?
Done
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 14:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... PS14, Line 6: 2020 For copying code around?
Hello Kyösti Mälkki, HAOUAS Elyes, Edward O'Callaghan, build bot (Jenkins), Damien Zammit, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#15).
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the example of change CB:37737 (ee8f969). Switching was done by moving a SIO configuration and the clocks setup from 'romstage.c' to 'bootblock.c'.
Tested-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 14 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/15
Mike Banon has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 15:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... PS14, Line 6: 2020
For copying code around?
Done
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 15:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... PS14, Line 6: 2020
Done
That's not your decision to make.
Hello Kyösti Mälkki, HAOUAS Elyes, Edward O'Callaghan, build bot (Jenkins), Damien Zammit, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#16).
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the example of change CB:37737 (ee8f969). Switching was done by moving a SIO configuration and the clocks setup from 'romstage.c' to 'bootblock.c'.
Tested-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/16
HAOUAS Elyes has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Removed Code-Review+2 by HAOUAS Elyes ehaouas@noos.fr
Damien Zammit has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 16:
(1 comment)
Patchset 15 LGTM, 16 has an unnecessary modified copyright notice.
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... File src/mainboard/biostar/a68n_5200/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37872/14/src/mainboard/biostar/a68n... PS14, Line 6: 2020
That's not your decision to make.
The first few drafts of this change removed the copyright notices entirely, and was missing parts of the SIO init. I only added 2020 because I thought it was different to the original. Considering it's merely a copy paste from the original I am fine with not changing the copyright notice.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 16:
+2 once copyright header is dealt with
Hello Kyösti Mälkki, HAOUAS Elyes, Edward O'Callaghan, build bot (Jenkins), Damien Zammit, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37872
to look at the new patch set (#17).
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the example of change CB:37737 (ee8f969). Switching was done by moving a SIO configuration and the clocks setup from 'romstage.c' to 'bootblock.c'.
Tested-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 14 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/37872/17
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 17: Code-Review+2
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 17: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
Following the example of change CB:37737 (ee8f969). Switching was done by moving a SIO configuration and the clocks setup from 'romstage.c' to 'bootblock.c'.
Tested-by: Damien Zammit damien@zamaudio.com Signed-off-by: Mike Banon mikebdp2@gmail.com Signed-off-by: Damien Zammit damien@zamaudio.com Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37 Reviewed-on: https://review.coreboot.org/c/coreboot/+/37872 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/mainboard/biostar/a68n_5200/Kconfig M src/mainboard/biostar/a68n_5200/Kconfig.name M src/mainboard/biostar/a68n_5200/Makefile.inc R src/mainboard/biostar/a68n_5200/bootblock.c M src/mainboard/biostar/a68n_5200/irq_tables.c 5 files changed, 14 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved HAOUAS Elyes: Looks good to me, approved
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig b/src/mainboard/biostar/a68n_5200/Kconfig index f608513..e4271d3 100644 --- a/src/mainboard/biostar/a68n_5200/Kconfig +++ b/src/mainboard/biostar/a68n_5200/Kconfig @@ -15,14 +15,10 @@ # GNU General Public License for more details. #
-config BOARD_BIOSTAR_A68N5200 - def_bool n - if BOARD_BIOSTAR_A68N5200
config BOARD_SPECIFIC_OPTIONS def_bool y - #select ROMCC_BOOTBLOCK select CPU_AMD_AGESA_FAMILY16_KB select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB select SOUTHBRIDGE_AMD_AGESA_YANGTZE diff --git a/src/mainboard/biostar/a68n_5200/Kconfig.name b/src/mainboard/biostar/a68n_5200/Kconfig.name index 6d765d2..52a7f15 100644 --- a/src/mainboard/biostar/a68n_5200/Kconfig.name +++ b/src/mainboard/biostar/a68n_5200/Kconfig.name @@ -1,2 +1,2 @@ -#config BOARD_BIOSTAR_A68N5200 -# bool"A68N-5200" +config BOARD_BIOSTAR_A68N5200 + bool "A68N-5200" diff --git a/src/mainboard/biostar/a68n_5200/Makefile.inc b/src/mainboard/biostar/a68n_5200/Makefile.inc index f8895fa..4dde2cf 100644 --- a/src/mainboard/biostar/a68n_5200/Makefile.inc +++ b/src/mainboard/biostar/a68n_5200/Makefile.inc @@ -13,6 +13,8 @@ # GNU General Public License for more details. #
+bootblock-y += bootblock.c + romstage-y += buildOpts.c romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c diff --git a/src/mainboard/biostar/a68n_5200/romstage.c b/src/mainboard/biostar/a68n_5200/bootblock.c similarity index 86% rename from src/mainboard/biostar/a68n_5200/romstage.c rename to src/mainboard/biostar/a68n_5200/bootblock.c index 5e0cd7c..395419b 100644 --- a/src/mainboard/biostar/a68n_5200/romstage.c +++ b/src/mainboard/biostar/a68n_5200/bootblock.c @@ -15,14 +15,10 @@ * GNU General Public License for more details. */
+#include <amdblocks/acpimmio.h> +#include <bootblock_common.h> #include <stdint.h> -#include <amdblocks/acpimmio.h> -#include <device/pci_def.h> -#include <arch/io.h> #include <device/pci_ops.h> -#include <northbridge/amd/agesa/state_machine.h> -#include <southbridge/amd/agesa/hudson/hudson.h> -#include <amdblocks/acpimmio.h> #include <superio/ite/common/ite.h> #include <superio/ite/it8728f/it8728f.h>
@@ -32,18 +28,20 @@
static void sbxxx_enable_48mhzout(void) { - /* most likely programming to 48MHz out signal */ u32 reg32; + + /* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */ reg32 = misc_read32(0x28); reg32 &= 0xfff8ffff; misc_write32(0x28, reg32);
+ /* Enable Auxiliary Clock1, disable FCH 14 MHz OscClk */ reg32 = misc_read32(0x40); reg32 &= 0xffffbffb; misc_write32(0x40, reg32); }
-void board_BeforeAgesa(struct sysinfo *cb) +void bootblock_mainboard_early_init(void) { u8 byte;
@@ -64,8 +62,10 @@ byte |= (1 << 6); /* 0x3f8 */ pci_write_config8(dev, 0x44, byte);
- /* run ite */ + /* enable SIO clock */ sbxxx_enable_48mhzout(); + + /* Enable serial output on it8728f */ ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_48); ite_kill_watchdog(GPIO_DEV); ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/biostar/a68n_5200/irq_tables.c b/src/mainboard/biostar/a68n_5200/irq_tables.c index 530c132..ab26cba 100644 --- a/src/mainboard/biostar/a68n_5200/irq_tables.c +++ b/src/mainboard/biostar/a68n_5200/irq_tables.c @@ -16,6 +16,7 @@ #include <console/console.h> #include <string.h> #include <stdint.h> +#include <device/pci_def.h> #include <arch/pirq_routing.h>
static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37872 )
Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 18:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/207 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/206 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/205
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
build bot (Jenkins) (Code Review)
-
Damien Zammit (Code Review)
-
HAOUAS Elyes (Code Review)
-
Kyösti Mälkki (Code Review)
-
Mike Banon (Code Review)
-
Nico Huber (Code Review)
-
Paul Menzel (Code Review)