Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16411
-gerrit
commit d6611bf703dead2fc412db12cc31d9523c4ad44e
Author: Martin Roth <martinroth(a)google.com>
Date: Fri Sep 2 11:09:05 2016 -0600
vendorcode/intel/Makefile.inc: Remove extraneous underscore
Commit e96543e1 (vendorcode/intel: Add UDK 2015 Bindings)
had an extra underscore at the end of one of the make lines that
we missed in the review. Remove it.
Fixes this build warning:
.../Makefile.inc:34: Extraneous text after `ifeq' directive
Change-Id: I0bc76d827207b4f641ac5ff08f540a114347533b
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/vendorcode/intel/Makefile.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/vendorcode/intel/Makefile.inc b/src/vendorcode/intel/Makefile.inc
index e5f7bcc..79b88b7 100644
--- a/src/vendorcode/intel/Makefile.inc
+++ b/src/vendorcode/intel/Makefile.inc
@@ -30,7 +30,7 @@ ifeq ($(CONFIG_UEFI_2_4_BINDING),y)
# a fixed width type.
CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Ia32
CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include
-else ifeq ($(CONFIG_UDK_2015_BINDING),y)_
+else ifeq ($(CONFIG_UDK_2015_BINDING),y)
CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/UDK2015/MdePkg/Include/Ia32
CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/UDK2015/MdePkg/Include
CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/UDK2015/IntelFsp2Pkg/Include
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16131
-gerrit
commit 871290b05de7d6f469f610d683a5431dec1c8779
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Aug 9 12:38:06 2016 -0600
Kconfig: Change use of CONFIG_MAINBOARD_DIR to MAINBOARDDIR
In the makefile, CONFIG_MAINBOARD_DIR gets the quotes stripped to become
MAINBOARDDIR. In all these cases, we want to use the version with the
quotes stripped, so use that version of the variable.
Change-Id: I70a6e4bb753053cbe1580cbc599dc80a01c5489c
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/Kconfig | 2 +-
src/soc/intel/apollolake/Kconfig | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig
index 3cb012e..08b6adb 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -402,7 +402,7 @@ config CBFS_SIZE
config FMDFILE
string "fmap description file in fmd format"
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS
+ default "src/mainboard/$(MAINBOARDDIR)/chromeos.fmd" if CHROMEOS
default ""
help
The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 0745679..588b471 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -179,7 +179,7 @@ config LBP2_FMAP_NAME
config LBP2_FILE_NAME
string "Path of file to write to logical boot partition 2 region"
depends on NEED_LBP2
- default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/lbp2.bin"
+ default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/lbp2.bin"
help
Name of file to store in the logical boot partition 2 region.
@@ -200,7 +200,7 @@ config IFWI_FMAP_NAME
config IFWI_FILE_NAME
string "Path of file to write to IFWI region"
depends on NEED_IFWI
- default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/ifwi.bin"
+ default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/ifwi.bin"
help
Name of file to store in the IFWI region.
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16386
-gerrit
commit 2c49f4c908d30e66831b1edf5a81343371a50096
Author: Martin Roth <martinroth(a)chromium.org>
Date: Tue Aug 30 16:21:53 2016 -0600
Kconfig: Add option for microcode filenames
Hardcoding the microcode filenames into the makefiles is great when
the microcode is in the blobs directory. When the microcode isn't
posted to the blobs directory, we need some method of supplying the
microcode binary into the build. This can of course be done manually
after the build has completed, as can be done with everything that
we're including in the ROM image. Instead of making life hard for
everyone though, let's just add a way to specify where the microcode
rom comes from.
BUG=chrome-os-partner:53013
Change-Id: I7c5127234809e8515906efa56c04af6005eecf0b
Signed-off-by: Martin Roth <martinroth(a)chromium.org>
---
src/cpu/Kconfig | 15 +++++++++++++++
src/cpu/intel/microcode/Makefile.inc | 2 ++
2 files changed, 17 insertions(+)
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index a026b28..009d80c 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -166,3 +166,18 @@ config CPU_MICROCODE_HEADER_FILES
help
A list of one or more microcode header files with path from the
coreboot directory. These should be separated by spaces.
+
+config CPU_UCODE_BINARIES
+ string "Microcode binary path and filename"
+ depends on CPU_MICROCODE_CBFS_GENERATE
+ default ""
+ help
+ Some platforms have microcode in the blobs directory, and these can
+ be hardcoded in the makefiles. For platforms with microcode
+ binaries that aren't in the makefile, set this option to pull
+ in the microcode.
+
+ This should contain the full path of the file for one or more
+ microcode binary files to include, separated by spaces.
+
+ If unsure, leave this blank.
diff --git a/src/cpu/intel/microcode/Makefile.inc b/src/cpu/intel/microcode/Makefile.inc
index f589430..b56e6a7 100644
--- a/src/cpu/intel/microcode/Makefile.inc
+++ b/src/cpu/intel/microcode/Makefile.inc
@@ -4,3 +4,5 @@
################################################################################
ramstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
romstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
+
+cpu_microcode_bins += $(call strip_quotes,$(CONFIG_CPU_UCODE_BINARIES))
the following patch was just integrated into master:
commit 36d405268f040208cd26902f3c0b5346f7d4d25b
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Mon Aug 1 12:21:30 2016 -0700
Update .checkpatch.conf
- Don't require a description of every config statement in the
Kconfig changes
- Don't complain about externs in .c files
- Don't complain about the use of the volatile keyword. The kernel
may not want it, but we definitely need it.
- Disable checks that seem to be broken.
Change-Id: Ic419b81cd36852a91e887e610d4a04984ab5fbd7
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: https://review.coreboot.org/16010
Tested-by: build bot (Jenkins)
Reviewed-by: Alexander Couzens <lynxis(a)fe80.eu>
See https://review.coreboot.org/16010 for details.
-gerrit
the following patch was just integrated into master:
commit 9391aac2e091345f0b9d45e0f4cddd1f2ecb0c30
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Aug 31 22:13:33 2016 -0600
.gitignore: Add coreinfo build residue, defconfig
Change-Id: I387603aff6efd6da5e9d78f204d94c064a99e1d1
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: https://review.coreboot.org/16389
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Omar Pakker
See https://review.coreboot.org/16389 for details.
-gerrit
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16131
-gerrit
commit d5b06b29f70e6f56e5346d606d74b6e884884298
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Aug 9 12:38:06 2016 -0600
Kconfig: Change use of CONFIG_MAINBOARD_DIR to MAINBOARDDIR
In the makefile, CONFIG_MAINBOARD_DIR gets the quotes stripped to become
MAINBOARDDIR. In all these cases, we want to use the version with the
quotes stripped, so use that version of the variable.
Change-Id: I70a6e4bb753053cbe1580cbc599dc80a01c5489c
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/Kconfig | 2 +-
src/soc/intel/apollolake/Kconfig | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig
index 3cb012e..08b6adb 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -402,7 +402,7 @@ config CBFS_SIZE
config FMDFILE
string "fmap description file in fmd format"
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS
+ default "src/mainboard/$(MAINBOARDDIR)/chromeos.fmd" if CHROMEOS
default ""
help
The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 0745679..7dae68d 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -179,7 +179,7 @@ config LBP2_FMAP_NAME
config LBP2_FILE_NAME
string "Path of file to write to logical boot partition 2 region"
depends on NEED_LBP2
- default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/lbp2.bin"
+ default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/lbp2.bin"
help
Name of file to store in the logical boot partition 2 region.
@@ -200,7 +200,7 @@ config IFWI_FMAP_NAME
config IFWI_FILE_NAME
string "Path of file to write to IFWI region"
depends on NEED_IFWI
- default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/ifwi.bin"
+ default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/ifwi.bin"
help
Name of file to store in the IFWI region.
the following patch was just integrated into master:
commit eb2e688a8ef8849c35d9cff68daaacb42cfca021
Author: Brandon Breitenstein <brandon.breitenstein(a)intel.com>
Date: Wed Aug 31 13:46:58 2016 -0700
apollolake: relocate fsp header files to vendorcode
FSP header files should be located in vendorcode, not soc directory.
This patch includes changes any references to the old location to
the new location.
Change-Id: I44270392617418ec1b9dec15ee187863f2503341
Signed-off-by: Brandon Breitenstein <brandon.breitenstein(a)intel.com>
Reviewed-on: https://review.coreboot.org/16310
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See https://review.coreboot.org/16310 for details.
-gerrit
the following patch was just integrated into master:
commit c31ba0ef529ef571ea839572f2c701a871cb33d7
Author: Brandon Breitenstein <brandon.breitenstein(a)intel.com>
Date: Wed Jul 27 17:34:45 2016 -0700
drivers/intel/fsp2_0: Make FSP Headers Consumable out of Box
The following patch is based off of the UEFI 2.6 patch. The FSP header files
are temporarily staying in soc/intel/apollolake and FspUpd.h has been relocated
since the other headers expect it to be in the root of an includable directory.
Any struct defines were removed since they are defined in the headers and no
longer need to be explicity declared as struct with the UEFI 2.6 includes.
BUG=chrome-os-partner:54100
BRANCH=none
TEST=confirmed coreboot builds successfully
Change-Id: I10739dca1b6da3f15bd850adf06238f7c51508f7
Signed-off-by: Brandon Breitenstein <brandon.breitenstein(a)intel.com>#
Signed-off-by: Andrey Petrov <andrey.petrov(a)intel.com>
Reviewed-on: https://review.coreboot.org/16308
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See https://review.coreboot.org/16308 for details.
-gerrit