Change in coreboot[master]: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c
Mike Banon has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38353 )
Change subject: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c ......................................................................
[TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c
Move the rest of romstage.c code to bootblock.c. Based on a similar change which worked fine for ASUS A88XM-E at CB:30987.
Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I921ed188fe227148d6c48e476b2efff3de94b429 --- M src/mainboard/asus/f2a85-m/bootblock.c D src/mainboard/asus/f2a85-m/romstage.c 2 files changed, 19 insertions(+), 41 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/38353/1
diff --git a/src/mainboard/asus/f2a85-m/bootblock.c b/src/mainboard/asus/f2a85-m/bootblock.c index 0472877..b4b0987 100644 --- a/src/mainboard/asus/f2a85-m/bootblock.c +++ b/src/mainboard/asus/f2a85-m/bootblock.c @@ -17,11 +17,27 @@ #include <bootblock_common.h> #include <device/pnp_type.h> #include <amdblocks/acpimmio.h> -#include <stdint.h> #include <superio/ite/common/ite.h> #include <superio/ite/it8728f/it8728f.h> #include <superio/nuvoton/common/nuvoton.h> #include <superio/nuvoton/nct6779d/nct6779d.h> +#include <southbridge/amd/agesa/hudson/smbus.h> + +static void smbus_setup(void) +{ + /* turn on secondary smbus at b20 */ + u32 reg32; + reg32 = misc_read32(0x28); + reg32 |= 0x00000001; + misc_write32(0x28, reg32); + + /* set DDR3 voltage */ + reg32 = CONFIG_BOARD_ASUS_F2A85_M_DDR3_VOLT_VAL; + + /* default is reg32 = 0x0, so no need to set it in this case */ + if (reg32) + do_smbus_write_byte(0xb20, 0x15, 0x3, reg32); +}
static void sbxxx_enable_48mhzout(void) { @@ -56,6 +72,8 @@
void bootblock_mainboard_early_init(void) { + smbus_setup(); + /* enable SIO clock */ sbxxx_enable_48mhzout();
diff --git a/src/mainboard/asus/f2a85-m/romstage.c b/src/mainboard/asus/f2a85-m/romstage.c deleted file mode 100644 index 3aa29c8..0000000 --- a/src/mainboard/asus/f2a85-m/romstage.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 Advanced Micro Devices, Inc. - * Copyright (C) 2012 Rudolf Marek r.marek@assembler.cz - * - * 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 <arch/io.h> -#include <northbridge/amd/agesa/state_machine.h> -#include <southbridge/amd/agesa/hudson/smbus.h> -#include <stdint.h> - -void board_BeforeAgesa(struct sysinfo *cb) -{ - u8 byte; - - post_code(0x30); - - /* turn on secondary smbus at b20 */ - outb(0x28, 0xcd6); - byte = inb(0xcd7); - byte |= 1; - outb(byte, 0xcd7); - - /* set DDR3 voltage */ - byte = CONFIG_BOARD_ASUS_F2A85_M_DDR3_VOLT_VAL; - - /* default is byte = 0x0, so no need to set it in this case */ - if (byte) - do_smbus_write_byte(0xb20, 0x15, 0x3, byte); -}
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38353 )
Change subject: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... File src/mainboard/asus/f2a85-m/bootblock.c:
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... PS1, Line 26: smbus_setup why would you want to do this in the bootblock?
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38353 )
Change subject: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... File src/mainboard/asus/f2a85-m/bootblock.c:
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... PS1, Line 20: #include <stdint.h> why this is removed ?
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38353 )
Change subject: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... File src/mainboard/asus/f2a85-m/bootblock.c:
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... PS1, Line 26: smbus_setup
why would you want to do this in the bootblock?
Should be kept in romstage indeed. You neeed to consider cases where bootblock is read-only, and you will want to keep DDR3_VOLT_VAL below configurable.
Mike Banon has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38353 )
Change subject: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... File src/mainboard/asus/f2a85-m/bootblock.c:
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... PS1, Line 20: #include <stdint.h>
why this is removed ?
It builds fine without <stdint.h>, and I thought it's too tiny for a separate commit.
https://review.coreboot.org/c/coreboot/+/38353/1/src/mainboard/asus/f2a85-m/... PS1, Line 26: smbus_setup
Should be kept in romstage indeed. […]
I misunderstood that we need to move all the romstage.c contents to bootblock.c . Guess this change could be abandoned, then. I'll also revert it at A88XM-E CB:30987 .
Mike Banon has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/38353 )
Change subject: [TESTME]asus/f2a85-m: move the rest of romstage.c code to bootblock.c ......................................................................
Abandoned
This change is my misunderstanding.
-
Arthur Heymans (Code Review) -
HAOUAS Elyes (Code Review)
-
Kyösti Mälkki (Code Review)
-
Mike Banon (Code Review)