diff options
author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:17:55 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:18 +0000 |
commit | dd732876495ed4942d00b9f9ca8dd3b01bad7120 (patch) | |
tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /zephyr/shim/include/config_chip.h | |
parent | 184d13e77614be3be5374d3fef9d1edf66ec8687 (diff) | |
download | chrome-ec-dd732876495ed4942d00b9f9ca8dd3b01bad7120.tar.gz |
Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main
This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..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:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'zephyr/shim/include/config_chip.h')
-rw-r--r-- | zephyr/shim/include/config_chip.h | 129 |
1 files changed, 9 insertions, 120 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 28a93739c5..7c63ca31f9 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -15,8 +15,6 @@ #line 16 #include <zephyr/devicetree.h> -#include <zephyr/toolchain.h> - #include <autoconf.h> #define SENSOR_NODE DT_PATH(motionsense_sensor) @@ -314,11 +312,6 @@ #ifdef CONFIG_PLATFORM_EC_OCPC #define CONFIG_OCPC #define CONFIG_OCPC_DEF_RBATT_MOHMS CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS -#ifdef CONFIG_PLATFORM_EC_OCPC_DEF_DRIVELIMIT_MILLIVOLTS -#undef CONFIG_OCPC_DEF_DRIVELIMIT_MILLIVOLTS -#define CONFIG_OCPC_DEF_DRIVELIMIT_MILLIVOLTS \ - CONFIG_PLATFORM_EC_OCPC_DEF_DRIVELIMIT_MILLIVOLTS -#endif #endif #undef CONFIG_CHARGER_SINGLE_CHIP @@ -495,23 +488,17 @@ /* The jump data goes at the end of data ram, so for posix, the end of ram is * wherever the jump data ended up. */ -extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; +#include "sysjump.h" +extern char mock_jump_data[sizeof(struct jump_data) + 256]; #define CONFIG_RAM_BASE 0x0 -#define CONFIG_DATA_RAM_SIZE \ - (((uintptr_t)&mock_jump_data) + \ - CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE) +#define CONFIG_DATA_RAM_SIZE \ + (((uintptr_t)&mock_jump_data) + sizeof(mock_jump_data)) #else #error "A zephyr,sram device must be chosen in the device tree" #endif #define CONFIG_RAM_SIZE CONFIG_DATA_RAM_SIZE -#undef CONFIG_PRESERVED_END_OF_RAM_SIZE -#ifdef CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE -#define CONFIG_PRESERVED_END_OF_RAM_SIZE \ - CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE -#endif - #define CONFIG_RO_MEM_OFF CONFIG_CROS_EC_RO_MEM_OFF #define CONFIG_RO_MEM_SIZE CONFIG_CROS_EC_RO_MEM_SIZE #define CONFIG_RW_MEM_OFF CONFIG_CROS_EC_RW_MEM_OFF @@ -649,11 +636,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_FAN_BYPASS_SLOW_RESPONSE #endif -#undef CONFIG_CUSTOM_FAN_CONTROL -#ifdef CONFIG_PLATFORM_EC_CUSTOM_FAN_CONTROL -#define CONFIG_CUSTOM_FAN_CONTROL -#endif - #ifdef CONFIG_PLATFORM_EC_I2C /* Also see shim/include/i2c/i2c.h which defines the ports enum */ #define CONFIG_I2C_CONTROLLER @@ -729,11 +711,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_KEYBOARD_REFRESH_ROW3 #endif /* CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 */ -#undef CONFIG_KEYBOARD_FACTORY_TEST -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_FACTORY_TEST -#define CONFIG_KEYBOARD_FACTORY_TEST -#endif - #undef CONFIG_KEYBOARD_KEYPAD #ifdef CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD #define CONFIG_KEYBOARD_KEYPAD @@ -1017,9 +994,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; CONFIG_PLATFORM_EC_PD_POWER_SUPPLY_TURN_OFF_DELAY #endif -#undef CONFIG_EXTPOWER_DEBOUNCE_MS -#define CONFIG_EXTPOWER_DEBOUNCE_MS CONFIG_PLATFORM_EC_EXTPOWER_DEBOUNCE_MS - #undef CONFIG_CMD_PPC_DUMP #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP #define CONFIG_CMD_PPC_DUMP @@ -1052,16 +1026,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #endif -#undef CONFIG_CHARGE_STATE_DEBUG -#ifdef CONFIG_PLATFORM_EC_CHARGE_STATE_DEBUG -#define CONFIG_CHARGE_STATE_DEBUG -#endif - -#undef CONFIG_CMD_PWR_AVG -#ifdef CONFIG_PLATFORM_EC_CMD_PWR_AVG -#define CONFIG_CMD_PWR_AVG -#endif - #undef CONFIG_CHARGESPLASH #ifdef CONFIG_PLATFORM_EC_CHARGESPLASH #define CONFIG_CHARGESPLASH @@ -1078,22 +1042,9 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; CONFIG_PLATFORM_EC_CHARGESPLASH_MAX_REQUESTS_PER_PERIOD #endif -#undef CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT -#ifdef CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT -#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT \ - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT -#endif - -#undef CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT -#ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_INPUT_CURRENT_LIMIT -#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT \ - CONFIG_PLATFORM_EC_CHARGER_MIN_INPUT_CURRENT_LIMIT -#endif - -#undef CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT -#ifdef CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT_DERATE_PCT -#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT \ - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT_DERATE_PCT +#undef CONFIG_CHARGER_INPUT_CURRENT +#ifdef CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT +#define CONFIG_CHARGER_INPUT_CURRENT CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT #endif #undef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON @@ -1376,11 +1327,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_USB_PE_SM #endif -#undef CONFIG_USB_DPM_SM -#ifdef CONFIG_PLATFORM_EC_USB_DPM_SM -#define CONFIG_USB_DPM_SM -#endif - #undef CONFIG_USB_PD_DECODE_SOP #ifdef CONFIG_PLATFORM_EC_USB_PD_DECODE_SOP #define CONFIG_USB_PD_DECODE_SOP @@ -1981,42 +1927,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_ACCEL_FIFO_THRES CONFIG_PLATFORM_EC_ACCEL_FIFO_THRES #endif /* CONFIG_PLATFORM_EC_ACCEL_FIFO */ -#undef CONFIG_BODY_DETECTION -#undef CONFIG_BODY_DETECTION_SENSOR -#undef CONFIG_BODY_DETECTION_MAX_WINDOW_SIZE -#undef CONFIG_BODY_DETECTION_VAR_THRESHOLD -#undef CONFIG_BODY_DETECTION_CONFIDENCE_DELTA -#undef CONFIG_BODY_DETECTION_VAR_NOISE_FACTOR -#undef CONFIG_BODY_DETECTION_ON_BODY_CON -#undef CONFIG_BODY_DETECTION_OFF_BODY_CON -#undef CONFIG_BODY_DETECTION_STATIONARY_DURATION -#undef CONFIG_BODY_DETECTION_NOTIFY_MODE_CHANGE -#undef CONFIG_BODY_DETECTION_ALWAYS_ENABLE_IN_S0 -#ifdef CONFIG_PLATFORM_EC_BODY_DETECTION -#define CONFIG_BODY_DETECTION -#define CONFIG_BODY_DETECTION_SENSOR SENSOR_ID(DT_ALIAS(on_body_sensor)) -#define CONFIG_BODY_DETECTION_MAX_WINDOW_SIZE \ - CONFIG_PLATFORM_EC_BODY_DETECTION_MAX_WINDOW_SIZE -#define CONFIG_BODY_DETECTION_VAR_THRESHOLD \ - CONFIG_PLATFORM_EC_BODY_DETECTION_VAR_THRESHOLD -#define CONFIG_BODY_DETECTION_CONFIDENCE_DELTA \ - CONFIG_PLATFORM_EC_BODY_DETECTION_CONFIDENCE_DELTA -#define CONFIG_BODY_DETECTION_VAR_NOISE_FACTOR \ - CONFIG_PLATFORM_EC_BODY_DETECTION_VAR_NOISE_FACTOR -#define CONFIG_BODY_DETECTION_ON_BODY_CON \ - CONFIG_PLATFORM_EC_BODY_DETECTION_ON_BODY_CON -#define CONFIG_BODY_DETECTION_OFF_BODY_CON \ - CONFIG_PLATFORM_EC_BODY_DETECTION_OFF_BODY_CON -#define CONFIG_BODY_DETECTION_STATIONARY_DURATION \ - CONFIG_PLATFORM_EC_BODY_DETECTION_STATIONARY_DURATION -#ifdef CONFIG_PLATFORM_EC_BODY_DETECTION_NOTIFY_MODE_CHANGE -#define CONFIG_BODY_DETECTION_NOTIFY_MODE_CHANGE -#endif /* CONFIG_PLATFORM_EC_BODY_DETECTION_NOTIFY_MODE_CHANGE */ -#ifdef CONFIG_PLATFORM_EC_BODY_DETECTION_ALWAYS_ENABLE_IN_S0 -#define CONFIG_BODY_DETECTION_ALWAYS_ENABLE_IN_S0 -#endif -#endif /* CONFIG_PLATFORM_EC_BODY_DETECTION */ - #undef CONFIG_CMD_ACCELS #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS #define CONFIG_CMD_ACCELS @@ -2043,11 +1953,6 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_CMD_ACCEL_SPOOF #endif -#undef CONFIG_GESTURE_HOST_DETECTION -#ifdef CONFIG_PLATFORM_EC_GESTURE_HOST_DETECTION -#define CONFIG_GESTURE_HOST_DETECTION -#endif - #undef CONFIG_SENSOR_TIGHT_TIMESTAMPS #ifdef CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS #define CONFIG_SENSOR_TIGHT_TIMESTAMPS @@ -2168,10 +2073,7 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #undef CONFIG_MAX695X_SEVEN_SEGMENT_DISPLAY #ifdef CONFIG_PLATFORM_EC_MAX695X_SEVEN_SEGMENT_DISPLAY #define CONFIG_MAX695X_SEVEN_SEGMENT_DISPLAY -#define PORT80_I2C_ADDR \ - DT_REG_ADDR(DT_COMPAT_GET_ANY_STATUS_OKAY(maxim_max695x)) -BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(maxim_max695x)) == 1, - "Only one instance of maxim,max695x should be defined"); +#define PORT80_I2C_ADDR DT_REG_ADDR(DT_NODELABEL(seven_seg_display)) #endif #undef CONFIG_CMD_SEVEN_SEG_DISPLAY @@ -2499,16 +2401,6 @@ BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(maxim_max695x)) == 1, #define CONFIG_HIBERNATE_PSL #endif -#ifdef CONFIG_PLATFORM_EC_HIBERNATE_DELAY_SEC -#undef CONFIG_HIBERNATE_DELAY_SEC -#define CONFIG_HIBERNATE_DELAY_SEC CONFIG_PLATFORM_EC_HIBERNATE_DELAY_SEC -#endif - -#undef CONFIG_HIBERNATE -#ifdef CONFIG_PLATFORM_EC_HIBERNATE -#define CONFIG_HIBERNATE -#endif - #undef CONFIG_BATTERY_DEVICE_CHEMISTRY #ifdef CONFIG_PLATFORM_EC_USE_BATTERY_DEVICE_CHEMISTRY #define CONFIG_BATTERY_DEVICE_CHEMISTRY \ @@ -2645,10 +2537,7 @@ BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(maxim_max695x)) == 1, #undef CONFIG_MP2964 #ifdef CONFIG_PLATFORM_EC_MP2964 #define CONFIG_MP2964 -#define I2C_ADDR_MP2964_FLAGS \ - DT_REG_ADDR(DT_COMPAT_GET_ANY_STATUS_OKAY(mps_mp2964)) -BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(mps_mp2964)) == 1, - "Only one instance of mps,mp2964 should be defined"); +#define I2C_ADDR_MP2964_FLAGS DT_REG_ADDR(DT_NODELABEL(pmic_mp2964)) #endif #undef CONFIG_ACCELGYRO_ICM_COMM_SPI |