coreboot-gerrit January 2017

coreboot-gerrit@coreboot.org

1 participants
852 discussions

Patch set updated for coreboot: device/dram: use global DIMM_SPD_SIZE Kconfig variable
by Patrick Georgi 31 Jan '17

31 Jan '17

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18254 -gerrit commit f5facf2ea1a699720c1fe919d27343499e7e3120 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Sat Jan 28 13:12:09 2017 +0100 device/dram: use global DIMM_SPD_SIZE Kconfig variable Also make sure that no board changes behaviour because of that by adding a static assert. TEST=abuild over all builds still succeeds (where it doesn't if DIMM_SPD_SIZE isn't set to 128 bytes for boards that use the device/dram code). Change-Id: Iddb962b16857ee859ddcf1b52d18da9b3be56449 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/Kconfig | 1 - src/device/dram/spd_cache.c | 10 ++++++---- src/mainboard/amd/db-ft3b-lc/Kconfig | 4 ++++ src/mainboard/bap/ode_e20XX/Kconfig | 4 ++++ src/mainboard/bap/ode_e21XX/Kconfig | 4 ++++ src/mainboard/gizmosphere/gizmo/Kconfig | 4 ++++ src/mainboard/gizmosphere/gizmo2/Kconfig | 4 ++++ src/mainboard/pcengines/apu1/Kconfig | 4 ++++ src/mainboard/pcengines/apu2/Kconfig | 4 ++++ 9 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 436964c..aaba761 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -336,7 +336,6 @@ config DIMM_MAX config DIMM_SPD_SIZE int default 256 - depends on GENERIC_SPD_BIN help Total SPD size that will be used for DIMM. Ex: DDR3 256, DDR4 512. diff --git a/src/device/dram/spd_cache.c b/src/device/dram/spd_cache.c index c7dd97d..3bdd9c1 100644 --- a/src/device/dram/spd_cache.c +++ b/src/device/dram/spd_cache.c @@ -25,11 +25,13 @@ #define SPD_CRC_HI 127 #define SPD_CRC_LO 126 +_Static_assert(SPD_SIZE == CONFIG_DIMM_SPD_SIZE, "configured SPD sizes differ"); + int read_spd_from_cbfs(u8 *buf, int idx) { const char *spd_file; size_t spd_file_len = 0; - size_t min_len = (idx + 1) * SPD_SIZE; + size_t min_len = (idx + 1) * CONFIG_DIMM_SPD_SIZE; spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD, &spd_file_len); @@ -40,9 +42,9 @@ int read_spd_from_cbfs(u8 *buf, int idx) if (!spd_file || spd_file_len < min_len) return -1; - memcpy(buf, spd_file + (idx * SPD_SIZE), SPD_SIZE); + memcpy(buf, spd_file + (idx * CONFIG_DIMM_SPD_SIZE), CONFIG_DIMM_SPD_SIZE); - u16 crc = spd_ddr3_calc_crc(buf, SPD_SIZE); + u16 crc = spd_ddr3_calc_crc(buf, CONFIG_DIMM_SPD_SIZE); if (((buf[SPD_CRC_LO] == 0) && (buf[SPD_CRC_HI] == 0)) || (buf[SPD_CRC_LO] != (crc & 0xff)) @@ -53,7 +55,7 @@ int read_spd_from_cbfs(u8 *buf, int idx) buf[SPD_CRC_HI] = crc >> 8; u16 i; printk(BIOS_WARNING, "\nDisplay the SPD"); - for (i = 0; i < SPD_SIZE; i++) { + for (i = 0; i < CONFIG_DIMM_SPD_SIZE; i++) { if((i % 16) == 0x00) printk(BIOS_WARNING, "\n%02x: ", i); printk(BIOS_WARNING, "%02x ", buf[i]); diff --git a/src/mainboard/amd/db-ft3b-lc/Kconfig b/src/mainboard/amd/db-ft3b-lc/Kconfig index ace741d..7bf3c86 100644 --- a/src/mainboard/amd/db-ft3b-lc/Kconfig +++ b/src/mainboard/amd/db-ft3b-lc/Kconfig @@ -53,4 +53,8 @@ config HUDSON_LEGACY_FREE bool default y +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_AMD_DB_FT3B_LC diff --git a/src/mainboard/bap/ode_e20XX/Kconfig b/src/mainboard/bap/ode_e20XX/Kconfig index ad1c3de..ee26772 100644 --- a/src/mainboard/bap/ode_e20XX/Kconfig +++ b/src/mainboard/bap/ode_e20XX/Kconfig @@ -80,4 +80,8 @@ config BAP_E20_DDR3_1066 endchoice +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_ODE_E20XX diff --git a/src/mainboard/bap/ode_e21XX/Kconfig b/src/mainboard/bap/ode_e21XX/Kconfig index b356749..60a59ac 100644 --- a/src/mainboard/bap/ode_e21XX/Kconfig +++ b/src/mainboard/bap/ode_e21XX/Kconfig @@ -74,4 +74,8 @@ config BAP_E21_DDR3_1333 endchoice +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_ODE_E21XX diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig index 0c78f79..8109019 100644 --- a/src/mainboard/gizmosphere/gizmo/Kconfig +++ b/src/mainboard/gizmosphere/gizmo/Kconfig @@ -70,4 +70,8 @@ config SB800_AHCI_ROM bool default n +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_GIZMOSPHERE_GIZMO diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig index 55beca6..349f827 100644 --- a/src/mainboard/gizmosphere/gizmo2/Kconfig +++ b/src/mainboard/gizmosphere/gizmo2/Kconfig @@ -61,4 +61,8 @@ config HUDSON_LEGACY_FREE bool default y +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_GIZMOSPHERE_GIZMO2 diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig index 3099d14..f882b78 100644 --- a/src/mainboard/pcengines/apu1/Kconfig +++ b/src/mainboard/pcengines/apu1/Kconfig @@ -116,4 +116,8 @@ endchoice config UART_D_RS485 bool "UART D drives RTS# in RS485 mode" if APU1_PINMUX_UART_D +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_PCENGINES_APU1 diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig index 0acf416..de42721 100644 --- a/src/mainboard/pcengines/apu2/Kconfig +++ b/src/mainboard/pcengines/apu2/Kconfig @@ -88,4 +88,8 @@ config APU2_PINMUX_UART_D endchoice +config DIMM_SPD_SIZE + int + default 128 + endif # BOARD_PCENGINES_APU2

1 0

Patch set updated for coreboot: payloads/depthcharge: Allow generic libpayload config
by Marshall Dawson 31 Jan '17

31 Jan '17

Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18271 -gerrit commit 279f98e21e498e0a60a150c950ee10205f4d6dd0 Author: Marshall Dawson <marshalldawson3rd(a)gmail.com> Date: Thu Dec 22 20:25:29 2016 -0500 payloads/depthcharge: Allow generic libpayload config Change Depthcharge to not require a board-specific config file for libpayload. If the Kconfig option is selected, use the settings in libpayload/configs/defconfig instead. Change-Id: I4fd1a5915472f28e757c62f3f2415716f1fdfc71 Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com> --- payloads/external/Makefile.inc | 3 ++- payloads/external/depthcharge/Kconfig | 8 ++++++++ payloads/external/depthcharge/Makefile | 13 ++++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d09305c..c46ee58 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -108,7 +108,8 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \ - DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) + DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) \ + OVERRIDE_DEFCONFIG=$(CONFIG_LP_DEFCONFIG_OVERRIDE) # FILO diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig index d6ce538..a913c7e 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -35,4 +35,12 @@ config PAYLOAD_FILE string default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf" +config LP_DEFCONFIG_OVERRIDE + def_bool n + help + The Depthcharge makefile looks for a file config.<boardname> in the + libpayload/configs directory. Say Y here to use the file defconfig + instead. This is can be a convenience for development purposes, or + if the defaults in defconfig are sufficient for your system. + endif diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 97d0950..c622ce4 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -30,6 +30,13 @@ unexport src srck obj objk BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR)) +ifeq ($(OVERRIDE_DEFCONFIG),y) +$(warning Depthcharge: Using default defconfig for libpayload) +libpayload_config=$(libpayload_dir)/configs/defconfig +else +libpayload_config=$(libpayload_dir)/configs/config.$(BOARD) +endif + all: build $(project_dir): @@ -47,10 +54,10 @@ checkout: fetch cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) $(libpayload_install_dir): $(project_dir) - test -f $(libpayload_dir)/configs/config.$(BOARD) || \ - (echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \ + test -f $(libpayload_config)|| \ + (echo "Error: $(libpayload_config) is not present" && \ false) - cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config + cp $(libpayload_config) $(libpayload_dir)/.config $(MAKE) -C $(libpayload_dir) olddefconfig $(MAKE) -C $(libpayload_dir) $(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir)

1 0

Patch set updated for coreboot: payloads/depthcharge: Specify revision to build
by Marshall Dawson 31 Jan '17

31 Jan '17

Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18270 -gerrit commit 93d6c8f323a916b3311fe76c7710344a42bf2084 Author: Marshall Dawson <marshalldawson3rd(a)gmail.com> Date: Thu Dec 22 18:16:48 2016 -0500 payloads/depthcharge: Specify revision to build Add the capability for specifying which version of Depthcharge to checkout and build. This is similar to the existing feature for SeaBIOS. Coreboot's Depthcharge makefile already contains some structure for checking out master vs. stable however the calling Makefile.inc ignored this feature. Add the command-line variable assignment for these, along with a tree-ish for any revision. Change-Id: I99a5b088cb0ebb29e5d96a84217b3bfa852de8ac Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com> --- payloads/external/Makefile.inc | 7 +++++-- payloads/external/depthcharge/Kconfig | 31 +++++++++++++++++++++++++++++++ payloads/external/depthcharge/Makefile | 1 + 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 29163d0..d09305c 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -102,10 +102,13 @@ endif # Depthcharge payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) - $(MAKE) -C payloads/external/depthcharge \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ - MFLAGS= MAKEFLAGS= + MFLAGS= MAKEFLAGS= \ + DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ + DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ + DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \ + DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) # FILO diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig index 84b36e5..d6ce538 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -1,5 +1,36 @@ if PAYLOAD_DEPTHCHARGE +choice +prompt "Depthcharge version" + +config DEPTHCHARGE_STABLE + bool "stable" + help + Latest stable version. + +config DEPTHCHARGE_MASTER + bool "master" + help + Newest Depthcharge version. + +config DEPTHCHARGE_REVISION + bool "git revision" + help + Select this option if you have a specific commit or branch that + you want to use as the revision from which to build Depthcharge. + + You will be able to specify the name of a branch or a commit SHA + later. + +endchoice + +config DEPTHCHARGE_REVISION_ID + string "Insert a commit's SHA-1 or a branch name" + depends on DEPTHCHARGE_REVISION + default "origin/master" + help + The commit's SHA-1 or branch name of the revision to use. + config PAYLOAD_FILE string default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf" diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 89db111..97d0950 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -13,6 +13,7 @@ VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot) TAG-$(DEPTHCHARGE_MASTER)=origin/master TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID) +TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID) # todo: consider reverting this once stable moves past the commit below payload_target=depthcharge

1 0

New patch to review for coreboot: payloads/depthcharge: Allow generic libpayload config
by Marshall Dawson 31 Jan '17

31 Jan '17

Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18271 -gerrit commit d29bc56b0b4d744c1c8f1f3e619a76c182ab9744 Author: Marshall Dawson <marshalldawson3rd(a)gmail.com> Date: Thu Dec 22 20:25:29 2016 -0500 payloads/depthcharge: Allow generic libpayload config Change Depthcharge to not require a board-specific config file for libpayload. If the Kconfig option is selected, use the settings in libpayload/configs/defconfig instead. Change-Id: I4fd1a5915472f28e757c62f3f2415716f1fdfc71 Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com> --- payloads/external/Makefile.inc | 3 ++- payloads/external/depthcharge/Kconfig | 8 ++++++++ payloads/external/depthcharge/Makefile | 13 ++++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d09305c..c46ee58 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -108,7 +108,8 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \ - DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) + DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) \ + OVERRIDE_DEFCONFIG=$(CONFIG_LP_DEFCONFIG_OVERRIDE) # FILO diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig index d6ce538..6f58d66 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -35,4 +35,12 @@ config PAYLOAD_FILE string default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf" +config LP_DEFCONFIG_OVERRIDE + def_bool n + help + The Depthcharge makefile looks for a file config.<boardname> in the + libpayload/configs directory. Say Y here to use the file defconfig + instead. This is can be a convenience for development purposes, or + if the defaults in defconfig are sufficient for your system. + endif diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 97d0950..c622ce4 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -30,6 +30,13 @@ unexport src srck obj objk BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR)) +ifeq ($(OVERRIDE_DEFCONFIG),y) +$(warning Depthcharge: Using default defconfig for libpayload) +libpayload_config=$(libpayload_dir)/configs/defconfig +else +libpayload_config=$(libpayload_dir)/configs/config.$(BOARD) +endif + all: build $(project_dir): @@ -47,10 +54,10 @@ checkout: fetch cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) $(libpayload_install_dir): $(project_dir) - test -f $(libpayload_dir)/configs/config.$(BOARD) || \ - (echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \ + test -f $(libpayload_config)|| \ + (echo "Error: $(libpayload_config) is not present" && \ false) - cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config + cp $(libpayload_config) $(libpayload_dir)/.config $(MAKE) -C $(libpayload_dir) olddefconfig $(MAKE) -C $(libpayload_dir) $(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir)

1 0

New patch to review for coreboot: payloads/depthcharge: Specify revision to build
by Marshall Dawson 31 Jan '17

31 Jan '17

Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18270 -gerrit commit 7c66af1c68acc40c398ad749ee89f5a0d0351c5d Author: Marshall Dawson <marshalldawson3rd(a)gmail.com> Date: Thu Dec 22 18:16:48 2016 -0500 payloads/depthcharge: Specify revision to build Add the capability for specifying which version of Depthcharge to checkout and build. This is similar to the existing feature for SeaBIOS. Coreboot's Depthcharge makefile already contains some structure for checking out master vs. stable. However the calling Makefile.inc ignored this feature. Add the command-line variable assignment for these, along with a tree-ish for any revision. Change-Id: I99a5b088cb0ebb29e5d96a84217b3bfa852de8ac Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com> --- payloads/external/Makefile.inc | 7 +++++-- payloads/external/depthcharge/Kconfig | 31 +++++++++++++++++++++++++++++++ payloads/external/depthcharge/Makefile | 1 + 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 29163d0..d09305c 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -102,10 +102,13 @@ endif # Depthcharge payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) - $(MAKE) -C payloads/external/depthcharge \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ - MFLAGS= MAKEFLAGS= + MFLAGS= MAKEFLAGS= \ + DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ + DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ + DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \ + DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) # FILO diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig index 84b36e5..d6ce538 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -1,5 +1,36 @@ if PAYLOAD_DEPTHCHARGE +choice +prompt "Depthcharge version" + +config DEPTHCHARGE_STABLE + bool "stable" + help + Latest stable version. + +config DEPTHCHARGE_MASTER + bool "master" + help + Newest Depthcharge version. + +config DEPTHCHARGE_REVISION + bool "git revision" + help + Select this option if you have a specific commit or branch that + you want to use as the revision from which to build Depthcharge. + + You will be able to specify the name of a branch or a commit SHA + later. + +endchoice + +config DEPTHCHARGE_REVISION_ID + string "Insert a commit's SHA-1 or a branch name" + depends on DEPTHCHARGE_REVISION + default "origin/master" + help + The commit's SHA-1 or branch name of the revision to use. + config PAYLOAD_FILE string default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf" diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 89db111..97d0950 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -13,6 +13,7 @@ VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot) TAG-$(DEPTHCHARGE_MASTER)=origin/master TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID) +TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID) # todo: consider reverting this once stable moves past the commit below payload_target=depthcharge

1 0

New patch to review for coreboot: payloads/depthcharge: Use variable target name
by Marshall Dawson 31 Jan '17

31 Jan '17

Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18269 -gerrit commit 98cd707bcfbaf8f71b40c2b31895706ed145787f Author: Marshall Dawson <marshalldawson3rd(a)gmail.com> Date: Fri Dec 23 10:16:43 2016 -0500 payloads/depthcharge: Use variable target name Depending on the commit to build, Depthcharge may have a different target name (depthcharge vs. depthcharge_unified). Add some logic to determine which name should be used based on the commit ID being requested. Change-Id: I05b853934d13696f4bd0d79d53ff6c5f59096d1c Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com> --- payloads/external/depthcharge/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index fb0c75b..89db111 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -14,6 +14,11 @@ VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot) TAG-$(DEPTHCHARGE_MASTER)=origin/master TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID) +# todo: consider reverting this once stable moves past the commit below +payload_target=depthcharge +payload_target_old=$(payload_target)_unified +payload_namechange=74a07395eb9976747055b4ac7a0ae7dcb603a6f4 + unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG unexport KCONFIG_DEPENDENCIES @@ -60,8 +65,12 @@ config: $(libpayload_install_dir) checkout build: config echo " MAKE $(project_name) $(TAG-y)" - cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ - VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge + cd $(project_dir) && \ + git merge-base --is-ancestor $(payload_namechange) $(TAG-y) >/dev/null 2>&1 && \ + $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ + VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" $(payload_target) || \ + $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ + VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" $(payload_target_old) clean: test -d $(output_dir) && rm -rf $(output_dir) || exit 0

1 0

New patch to review for coreboot: payloads/depthcharge: Change make target from unified
by Marshall Dawson 31 Jan '17

31 Jan '17

Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18268 -gerrit commit 00baab4414e908faa511f2ee09ac036f8ba1baca Author: Marshall Dawson <marshalldawson3rd(a)gmail.com> Date: Wed Dec 14 15:14:51 2016 -0500 payloads/depthcharge: Change make target from unified Coreboot and Depthcharge have drifted out of sync. There is no longer a non-unified Depthcharge so the build breaks when building on master. This patch corresponds with the Depthcharge change: https://review.coreboot.org/cgit/depthcharge.git/commit/?id=74a0739 Change-Id: I8d028b14d2eee63dfdc9d3dd63695f1c58ea7984 Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com> --- payloads/external/depthcharge/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index edc48f8..fb0c75b 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -61,7 +61,7 @@ config: $(libpayload_install_dir) checkout build: config echo " MAKE $(project_name) $(TAG-y)" cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ - VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified + VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge clean: test -d $(output_dir) && rm -rf $(output_dir) || exit 0

1 0

Patch set updated for coreboot: ec/google/chromeec: Add support for tablet mode switch driver
by Gwendal Grignou 31 Jan '17

31 Jan '17

Gwendal Grignou (gwendal(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18173 -gerrit commit 12b8079f0f09f79bb7c0c5e99f7b79b8572c64df Author: Gwendal Grignou <gwendal(a)chromium.org> Date: Thu Jan 19 18:30:21 2017 -0800 ec/google/chromeec: Add support for tablet mode switch driver Add a new driver GOOG0006 to report tablet switch to user space. On glados based convertible, check that with a new kernel driver (cros_ec_tbmc) evtest collect tablet switch changes. Change-Id: I6821eaac1feb6c182bc973aaa2f747e687715afb Signed-off-by: Gwendal Grignou <gwendal(a)chromium.org> Reviewed-on: https://chromium-review.googlesource.com/430951 Reviewed-by: Duncan Laurie <dlaurie(a)google.com> --- src/ec/google/chromeec/acpi/ec.asl | 7 ++++++ src/ec/google/chromeec/acpi/tbmc.asl | 29 ++++++++++++++++++++++ src/mainboard/google/eve/ec.h | 6 ++++- .../reef/variants/baseboard/include/baseboard/ec.h | 8 ++++-- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index b182766..a40d0ac 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -322,6 +322,7 @@ Device (EC0) Notify (CREC, 0x80) } +#ifdef EC_ENABLE_TABLET_EVENT // TABLET mode switch Event Method (_Q1D, 0, NotSerialized) { @@ -329,7 +330,9 @@ Device (EC0) If (CondRefOf (\_SB.DPTF.TPET)) { \_SB.DPTF.TPET() } + Notify (TBMC, 0x80) } +#endif /* * Dynamic Platform Thermal Framework support @@ -478,4 +481,8 @@ Device (EC0) #ifdef EC_ENABLE_PD_MCU_DEVICE #include "pd.asl" #endif + +#ifdef EC_ENABLE_TABLET_EVENT + #include "tbmc.asl" +#endif } diff --git a/src/ec/google/chromeec/acpi/tbmc.asl b/src/ec/google/chromeec/acpi/tbmc.asl new file mode 100644 index 0000000..25a27ef1b --- /dev/null +++ b/src/ec/google/chromeec/acpi/tbmc.asl @@ -0,0 +1,29 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google 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. + */ + +Device (TBMC) +{ + Name (_HID, "GOOG0006") + Name (_UID, 1) + Name (_DDN, "Tablet Motion Control") + Method (TBMC) + { + If (LEqual (^^RCTM, One)) { + Return (0x1) + } Else { + Return (0x0) + } + } +} diff --git a/src/mainboard/google/eve/ec.h b/src/mainboard/google/eve/ec.h index d0e59e1..884b105 100644 --- a/src/mainboard/google/eve/ec.h +++ b/src/mainboard/google/eve/ec.h @@ -35,7 +35,8 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)) + EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\ + EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) #define MAINBOARD_EC_SMI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)) @@ -73,6 +74,9 @@ #define EC_ENABLE_LID_SWITCH #define EC_ENABLE_WAKE_PIN GPE_EC_WAKE +/* Enable Tablet switch */ +#define EC_ENABLE_TABLET_EVENT + #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ #define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */ diff --git a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h index 87c127c..47b193f 100644 --- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h @@ -34,7 +34,8 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_CHARGER) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)) + EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\ + EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) #define MAINBOARD_EC_SMI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)) @@ -67,7 +68,10 @@ /* Enable LID switch and provide wake pin for EC */ #define EC_ENABLE_LID_SWITCH -#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE +#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE + +/* Enable Tablet switch */ +#define EC_ENABLE_TABLET_EVENT #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */

1 0

Patch set updated for coreboot: mainboard/google/reef: remove NHLT DMIC 1ch and 2ch configuration
by Sathyanarayana Nujella 30 Jan '17

30 Jan '17

Sathyanarayana Nujella (sathyanarayana.nujella(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18252 -gerrit commit d6ba542d191b22a33d443a2118e6d2802e6b488f Author: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> Date: Fri Jan 27 14:51:59 2017 -0800 mainboard/google/reef: remove NHLT DMIC 1ch and 2ch configuration Apollolake boards should use DMIC-4ch configuration in Kernel side and use CaptureChannelMap in userspace to distinguish boards with different number of DMIC's. So, NHLT DMIC 1-ch & 2-ch endpoint configuration will not be required and hence removed. BUG=chrome-os-partner:60827 TEST=Verify internal mic capture TEST='arecord -Dhw:0,3 dmic_4ch.wav -f S16_LE -r 48000 -c 4 -d 10' works Change-Id: Ibe81290906c9e379ae49e437648ee9cd6f123ff8 Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> --- src/mainboard/google/reef/Kconfig | 2 -- src/mainboard/google/reef/variants/baseboard/nhlt.c | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 1ef2e88..f37b7b4 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -99,8 +99,6 @@ config UART_FOR_CONSOLE config INCLUDE_NHLT_BLOBS bool "Include blobs for audio." - select NHLT_DMIC_1CH_16B - select NHLT_DMIC_2CH_16B select NHLT_DMIC_4CH_16B select NHLT_DA7219 select NHLT_MAX98357 diff --git a/src/mainboard/google/reef/variants/baseboard/nhlt.c b/src/mainboard/google/reef/variants/baseboard/nhlt.c index d44d599..b935796 100644 --- a/src/mainboard/google/reef/variants/baseboard/nhlt.c +++ b/src/mainboard/google/reef/variants/baseboard/nhlt.c @@ -23,13 +23,16 @@ void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt) { /* 1-dmic configuration */ - if (!nhlt_soc_add_dmic_array(nhlt, 1)) + if (IS_ENABLED(CONFIG_NHLT_DMIC_1CH_16B) && + (!nhlt_soc_add_dmic_array(nhlt, 1))) printk(BIOS_ERR, "Added 1CH DMIC array.\n"); /* 2-dmic configuration */ - if (!nhlt_soc_add_dmic_array(nhlt, 2)) + if (IS_ENABLED(CONFIG_NHLT_DMIC_2CH_16B) && + (!nhlt_soc_add_dmic_array(nhlt, 2))) printk(BIOS_ERR, "Added 2CH DMIC array.\n"); /* 4-dmic configuration */ - if (!nhlt_soc_add_dmic_array(nhlt, 4)) + if (IS_ENABLED(CONFIG_NHLT_DMIC_4CH_16B) && + (!nhlt_soc_add_dmic_array(nhlt, 4))) printk(BIOS_ERR, "Added 4CH DMIC array.\n"); /* Dialog for Headset codec. * Headset codec is bi-directional but uses the same configuration

1 0

Patch set updated for coreboot: mainboard/google/reef: Set edge triggered interrupt for GPIO_22
by Vaibhav Shankar 30 Jan '17

30 Jan '17

Vaibhav Shankar (vaibhav.shankar(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18267 -gerrit commit 64361d3ebae257618b0c956c60dfbb9a42b258e5 Author: Vaibhav Shankar <vaibhav.shankar(a)intel.com> Date: Mon Jan 30 12:18:42 2017 -0800 mainboard/google/reef: Set edge triggered interrupt for GPIO_22 EC sets the logic level based on outstanding wake events. When GPIO_22 is configured as a level triggered interrupt, the events are not cleared from the interrupt handler. Hence, we'd just be re-signalling over and over causing an interrupt storm upon lid open. So, GPIO_22 needs to be configured as EDGE_SINGLE instead of LEVEL. BUG=chrome-os-partner:62458 TEST=Lid close/open. check CPU usage using top. It should not show 70% CPU usage. Signed-off-by: Vaibhav Shankar <vaibhav.shankar(a)intel.com> Change-Id: I710a690578c6e5b63be34b7fbcb21c703ef56e3a --- src/mainboard/google/reef/variants/baseboard/gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mainboard/google/reef/variants/baseboard/gpio.c b/src/mainboard/google/reef/variants/baseboard/gpio.c index 3bb9a5f..a9a6248 100644 --- a/src/mainboard/google/reef/variants/baseboard/gpio.c +++ b/src/mainboard/google/reef/variants/baseboard/gpio.c @@ -299,7 +299,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPIO_19, UP_20K, DEEP), /* unused */ PAD_CFG_GPI_APIC_LOW(GPIO_20, UP_20K, DEEP), /* NFC IRQ */ PAD_CFG_GPI_APIC_LOW(GPIO_21, NONE, DEEP), /* Touch IRQ */ - PAD_CFG_GPI_SCI_LOW(GPIO_22, NONE, DEEP, LEVEL), /* EC wake */ + PAD_CFG_GPI_SCI_LOW(GPIO_22, NONE, DEEP, EDGE_SINGLE), /* EC wake */ PAD_CFG_GPI(GPIO_23, UP_20K, DEEP), /* unused */ PAD_CFG_GPI(GPIO_24, NONE, DEEP), /* PEN_PDCT_ODL */ PAD_CFG_GPI(GPIO_25, UP_20K, DEEP), /* unused */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2017