Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34478 )
Change subject: soc/amd/picasso: Set HAVE_BOOTBLOCK=n ......................................................................
soc/amd/picasso: Set HAVE_BOOTBLOCK=n
Change-Id: Iaf370e04adb04eb81555a57e81812ebe3339971d Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/amd/picasso/Kconfig M src/soc/amd/picasso/Makefile.inc D src/soc/amd/picasso/bootblock/bootblock.c D src/soc/amd/picasso/cache_as_ram.S 4 files changed, 4 insertions(+), 46 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/34478/1
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 5ca0c91..0ba90ef 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -72,6 +72,10 @@ int default 200
+config HAVE_BOOTBLOCK + bool + default n + # TODO: Sync these with definitions in PI vendorcode. # DCACHE_RAM_BASE must equal BSP_STACK_BASE_ADDR. # DCACHE_RAM_SIZE must equal BSP_STACK_SIZE. diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 93a8bbb..7f37192 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -37,13 +37,6 @@ subdirs-y += ../../../cpu/x86/pae subdirs-y += ../../../cpu/x86/smm
-# TODO: Make coreboot modifications so bootblock can be removed. This soc -# also selects C_ENVIRONMENT_BOOTBLOCK to enforce certain codepaths -# in romstage. As a result, the bootblock build also needs a -# dummy cache_as_ram.S -bootblock-y += cache_as_ram.S -bootblock-y += bootblock/bootblock.c - romstage-y += i2c.c romstage-y += romstage.c romstage-y += gpio.c diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock/bootblock.c deleted file mode 100644 index 62e4e15..0000000 --- a/src/soc/amd/picasso/bootblock/bootblock.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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> - -asmlinkage void bootblock_c_entry(uint64_t base_timestamp) -{ - /* This function is here for building/linking only */ -} diff --git a/src/soc/amd/picasso/cache_as_ram.S b/src/soc/amd/picasso/cache_as_ram.S deleted file mode 100644 index 2869062..0000000 --- a/src/soc/amd/picasso/cache_as_ram.S +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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. - */ - -/* - * TODO: This is a dummy file for making bootblock build and link. At some - * point, this should be removed from picasso since bootblock is - * ignored. - */ -.global bootblock_pre_c_entry -bootblock_pre_c_entry:
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34478 )
Change subject: soc/amd/picasso: Set HAVE_BOOTBLOCK=n ......................................................................
Patch Set 1: Code-Review+1
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34478 )
Change subject: soc/amd/picasso: Set HAVE_BOOTBLOCK=n ......................................................................
Patch Set 1: Code-Review+1
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34478 )
Change subject: soc/amd/picasso: Set HAVE_BOOTBLOCK=n ......................................................................
Patch Set 1: Code-Review+2
Marshall Dawson has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34478 )
Change subject: soc/amd/picasso: Set HAVE_BOOTBLOCK=n ......................................................................
soc/amd/picasso: Set HAVE_BOOTBLOCK=n
Change-Id: Iaf370e04adb04eb81555a57e81812ebe3339971d Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34478 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/soc/amd/picasso/Kconfig M src/soc/amd/picasso/Makefile.inc D src/soc/amd/picasso/bootblock/bootblock.c D src/soc/amd/picasso/cache_as_ram.S 4 files changed, 4 insertions(+), 46 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Aaron Durbin: Looks good to me, but someone else must approve Marshall Dawson: Looks good to me, approved
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 5ca0c91..0ba90ef 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -72,6 +72,10 @@ int default 200
+config HAVE_BOOTBLOCK + bool + default n + # TODO: Sync these with definitions in PI vendorcode. # DCACHE_RAM_BASE must equal BSP_STACK_BASE_ADDR. # DCACHE_RAM_SIZE must equal BSP_STACK_SIZE. diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 93a8bbb..7f37192 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -37,13 +37,6 @@ subdirs-y += ../../../cpu/x86/pae subdirs-y += ../../../cpu/x86/smm
-# TODO: Make coreboot modifications so bootblock can be removed. This soc -# also selects C_ENVIRONMENT_BOOTBLOCK to enforce certain codepaths -# in romstage. As a result, the bootblock build also needs a -# dummy cache_as_ram.S -bootblock-y += cache_as_ram.S -bootblock-y += bootblock/bootblock.c - romstage-y += i2c.c romstage-y += romstage.c romstage-y += gpio.c diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock/bootblock.c deleted file mode 100644 index 62e4e15..0000000 --- a/src/soc/amd/picasso/bootblock/bootblock.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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> - -asmlinkage void bootblock_c_entry(uint64_t base_timestamp) -{ - /* This function is here for building/linking only */ -} diff --git a/src/soc/amd/picasso/cache_as_ram.S b/src/soc/amd/picasso/cache_as_ram.S deleted file mode 100644 index 2869062..0000000 --- a/src/soc/amd/picasso/cache_as_ram.S +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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. - */ - -/* - * TODO: This is a dummy file for making bootblock build and link. At some - * point, this should be removed from picasso since bootblock is - * ignored. - */ -.global bootblock_pre_c_entry -bootblock_pre_c_entry: