diff options
| author | YH Lin <yueherngl@google.com> | 2022-11-30 21:44:08 +0000 |
|---|---|---|
| committer | YH Lin <yueherngl@google.com> | 2022-11-30 21:44:08 +0000 |
| commit | af25602b15b22b9ef5821dcba9934311f2157c48 (patch) | |
| tree | d0c89ae8814c2ba35c238c6c0644ec6b1602c63a /Makefile.toolchain | |
| parent | 54462f034b635260dd09173b3d082e47fc960ef3 (diff) | |
| parent | aa40b859b3a73e5a205bc561c1a29eff38485461 (diff) | |
| download | chrome-ec-af25602b15b22b9ef5821dcba9934311f2157c48.tar.gz | |
Merge remote-tracking branch cros/main into factory-brya-14517.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
Relevant changes:
git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh
e6da633c38 driver: Sort header files
234a87ae2d tcpci: Add FRS enable to driver structure
a56be59ccd tcpm_header: add test for tcpm_dump_registers
57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
e420c8ff9a marasov: Modify TypeC and TypeA configuration.
43b53e0045 Add default implementation of board_set_charge_limit
b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
f1b563c350 baseboard: Sort header files
7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
8f89f69a5b crota: disable lid angle sensor for clamshell
BRANCH=None
BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
BUG=b:163093572 b:254328661
TEST=`emerge-brya chromeos-ec`
Force-Relevant-Builds: all
Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
Signed-off-by: YH Lin <yueherngl@google.com>
Diffstat (limited to 'Makefile.toolchain')
| -rw-r--r-- | Makefile.toolchain | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index c2612d260c..80896e3e40 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -47,6 +47,8 @@ ifeq ($(filter $(BOARD), $(CLANG_BOARDS)), $(BOARD)) CC=clang USE_BUILTIN_STDLIB:=0 USE_CXX_COMPILER:=1 +# b/144957935: Generate exception on signed integer overflow. +COMMON_WARN+=-ftrapv endif ifeq ($(USE_CXX_COMPILER), 1) @@ -113,7 +115,7 @@ endif C_WARN = -Wstrict-prototypes -Wdeclaration-after-statement -Wno-pointer-sign C_WARN += -Werror-implicit-function-declaration -COMMON_WARN = -Wall -Wundef \ +COMMON_WARN += -Wall -Wundef \ -Wno-trigraphs -Wno-format-security -Wno-address-of-packed-member \ -fno-common -fno-strict-aliasing -fno-strict-overflow -Wimplicit-fallthrough # See https://www.chromium.org/chromium-os/build/c-exception-support @@ -207,6 +209,9 @@ else # TODO(https://issuetracker.google.com/234507656#comment19): C++ include path # should not be necessary. CXXFLAGS+=-I/usr/armv7m-cros-eabi/usr/include/c++/v1 +# TODO(https://issuetracker.google.com/254916723): Remove when toolchain is +# fixed. +CPPFLAGS+=-D_GNU_SOURCE endif ifeq ($(LIBFTDI_NAME),) @@ -224,6 +229,9 @@ LIBFTDIUSB_HOST_LDLIBS:=$(shell $(HOST_PKG_CONFIG) --libs lib${LIBFTDI_NAME} l LIBFTDIUSB_BUILD_CFLAGS:=$(shell $(BUILD_PKG_CONFIG) --cflags lib${LIBFTDI_NAME} libusb-1.0) LIBFTDIUSB_BUILD_LDLIBS:=$(shell $(BUILD_PKG_CONFIG) --libs lib${LIBFTDI_NAME} libusb-1.0) +LIBEC_HOST_CFLAGS:=$(shell $(HOST_PKG_CONFIG) --cflags libec) +LIBEC_HOST_LDLIBS:=$(shell $(HOST_PKG_CONFIG) --libs libec) + ifeq ($(TEST_FUZZ),y) LIBPROTOBUF_CFLAGS:=$(shell $(PKG_CONFIG) --cflags protobuf) LIBPROTOBUF_LDLIBS:=$(shell $(PKG_CONFIG) --libs protobuf) @@ -242,6 +250,7 @@ HOST_CFLAGS=$(HOST_CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) \ HOST_CFLAGS+=$(LIBFTDIUSB_HOST_CFLAGS) HOST_CFLAGS+=-DCHROMIUM_EC=$(EMPTY) HOST_CXXFLAGS=$(HOST_CFLAGS) -Wno-c99-designator +HOST_CXXFLAGS+=$(LIBEC_HOST_CFLAGS) ifneq (${SYSROOT},) LDFLAGS_EXTRA+=--sysroot=${SYSROOT} endif @@ -261,6 +270,7 @@ HOST_LDFLAGS=$(LIBFTDIUSB_HOST_LDLIBS) ifneq (${HOST_SYSROOT},) HOST_LDFLAGS+=--sysroot=${HOST_SYSROOT} endif +HOST_LDFLAGS+=$(LIBEC_HOST_LDLIBS) HOST_TEST_LDFLAGS=-Wl,-T core/host/host_exe.lds -lrt -pthread -rdynamic -lm\ -fuse-ld=bfd -no-pie \ $(if $(TEST_COVERAGE), --coverage,) \ |