diff options
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 |