From 3e581739206f58a45a68b6c4703246ebac995195 Mon Sep 17 00:00:00 2001 From: elmo_lan Date: Fri, 17 Jun 2022 14:47:59 +0800 Subject: nissa: Initial zephyr config for xivu Initial EC Zephyr config for Nissa/Xivu. BUG=b:235936531 TEST=zmake build xivu BRANCH=none Signed-off-by: elmo_lan Change-Id: I304249c9f18b20d8d2151c7f0bf6e0025104445b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3708626 Reviewed-by: Elthan Huang Reviewed-by: Andrew McRae Commit-Queue: Henry Sun Reviewed-by: Peter Marheine --- zephyr/projects/nissa/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index afc96e924f..9f2452bcbc 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -49,3 +49,12 @@ if(DEFINED CONFIG_BOARD_PUJJO) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/pujjo/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/pujjo/charger.c") endif() +if(DEFINED CONFIG_BOARD_XIVU) + zephyr_library_sources( + "src/xivu/led.c" + ) + project(xivu) + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/xivu/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/xivu/charger.c") +endif() + -- cgit v1.2.1 From a75badd9d994ba1bef0b8c8267f464c2bf430f73 Mon Sep 17 00:00:00 2001 From: Mark Hsieh Date: Thu, 16 Jun 2022 21:43:55 +0800 Subject: nissa/joxer: Initial EC image Create the initial Zephyr EC image for the joxer variant by copying the nissa reference board EC files into a new directory named for the variant. BUG=b:236086879 TEST=zmake configure -b joxer BRANCH=none Change-Id: I0570f604dcedaeccc2817a07a5242fa63eb5264e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3708989 Reviewed-by: Peter Marheine Commit-Queue: Mark Hsieh Tested-by: Mark Hsieh --- zephyr/projects/nissa/CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 9f2452bcbc..47f98daf9f 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -57,4 +57,12 @@ if(DEFINED CONFIG_BOARD_XIVU) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/xivu/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/xivu/charger.c") endif() - +if(DEFINED CONFIG_BOARD_JOXER) + project(joxer) + zephyr_library_sources( + "src/led.c" + "src/joxer/keyboard.c" + ) + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/joxer/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/joxer/charger.c") +endif() -- cgit v1.2.1 From b7d77ec7b9a3b25878f877bb2de5f80ce0f16500 Mon Sep 17 00:00:00 2001 From: Logan_Liao Date: Wed, 29 Jun 2022 08:36:25 +0800 Subject: Xivu : GPIO initial. This patch according to the HW circuit that modify GPIO setting. The Xivu have no HDMI relate pin, Remove the sub-board.c from CMakeLists. BUG=b:237432830 BRANCH=none TEST=zmake build xivu success. Signed-off-by: Logan_Liao Change-Id: I234f78fc4dc149ed235b60b63a89de8007116730 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3733929 Reviewed-by: Logan Liao Reviewed-by: Peter Marheine Commit-Queue: Logan Liao Tested-by: Logan Liao --- zephyr/projects/nissa/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 47f98daf9f..b2bb2c67d2 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -8,7 +8,6 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) zephyr_include_directories(include) zephyr_library_sources("src/common.c") -zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_AP_PWRSEQ "src/board_power.c") if(DEFINED CONFIG_BOARD_NIVVIKS) @@ -18,6 +17,7 @@ if(DEFINED CONFIG_BOARD_NIVVIKS) "src/nivviks/form_factor.c" "src/nivviks/keyboard.c" ) + zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/nivviks/fan.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nivviks/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nivviks/charger.c") @@ -28,6 +28,7 @@ if(DEFINED CONFIG_BOARD_NEREID) "src/led.c" "src/nereid/keyboard.c" ) + zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nereid/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nereid/charger.c") endif() @@ -36,6 +37,7 @@ if(DEFINED CONFIG_BOARD_CRAASK) "src/craask/led.c" ) project(craask) + zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/craask/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/craask/charger.c") endif() @@ -45,6 +47,7 @@ if(DEFINED CONFIG_BOARD_PUJJO) "src/led.c" "src/pujjo/keyboard.c" ) + zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/pujjo/fan.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/pujjo/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/pujjo/charger.c") @@ -63,6 +66,7 @@ if(DEFINED CONFIG_BOARD_JOXER) "src/led.c" "src/joxer/keyboard.c" ) + zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/joxer/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/joxer/charger.c") endif() -- cgit v1.2.1 From 89c8a8c43cff2e598a049a273bd7ee13f9e2b5d0 Mon Sep 17 00:00:00 2001 From: johnwc_yeh Date: Wed, 29 Jun 2022 14:13:03 +0800 Subject: Xivu: Implement LED behavior This patch adds led_policy and led_pins dts files for xivu and enables common led_driver code. Implement LED behavior. Power LED: Discharge in S0 : White on Discharge in S3 : Blinking White, 1sec on /3sec off Discharge in S5 : Off Charge LED: Charge : Amber on Full charge : White on Battery Low(0~10%) in S0 : Blinking Amber, 1sec on /3sec off Battery Low(0~10%) in S3 : Blinking White, 1sec on /3sec off Battery Low(0~10%) in S5 : Off Battery Error in S0 : Blinking Amber, 1sec on /1sec off Battery Error in S3 : Blinking White, 1sec on /3sec off Battery Error in S5 : Off BUG=b:237224850 BRANCH=none TEST=zmake build xivu Signed-off-by: johnwc_yeh Change-Id: I1d19810560248eab08187d1bfd86651150b9f478 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3733877 Reviewed-by: Elthan Huang Reviewed-by: Peter Marheine --- zephyr/projects/nissa/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index b2bb2c67d2..4bfc879758 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -53,9 +53,6 @@ if(DEFINED CONFIG_BOARD_PUJJO) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/pujjo/charger.c") endif() if(DEFINED CONFIG_BOARD_XIVU) - zephyr_library_sources( - "src/xivu/led.c" - ) project(xivu) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/xivu/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/xivu/charger.c") -- cgit v1.2.1 From 64c61107a4fbfc2de2a03ccfbb5674fb0ef21538 Mon Sep 17 00:00:00 2001 From: Scott Chao Date: Tue, 12 Jul 2022 09:23:11 +0800 Subject: nissa: Enable Joxer fan support Enable Joxer fan support, gated by FW_CONFIG fan flag. - GPL4 for FAN_ENABLE. - GPA7/ PWM7 for FAN PWM. - GPD7/ TACH1A for FAN TACH. BUG=b:234683955 TEST=zmake build joxer BRANCH=none Signed-off-by: Scott Chao Change-Id: I4078ca4fc2b9fd581ee5d37eac6f6bfc61de1caa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3755242 Reviewed-by: Andrew McRae Reviewed-by: Peter Marheine --- zephyr/projects/nissa/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 4bfc879758..258dbfdc3a 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -66,4 +66,5 @@ if(DEFINED CONFIG_BOARD_JOXER) zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/joxer/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/joxer/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/joxer/fan.c") endif() -- cgit v1.2.1 From 1f105c3a3ad8c5f8bd807c27e6962860bed29cbb Mon Sep 17 00:00:00 2001 From: Leila Lin Date: Wed, 13 Jul 2022 09:36:32 +0800 Subject: Xivu: Bypass the HDMI function Xivu project has no HDMI port, but still need sub-board.c to do board init. Otherwise, the dut will not power on with AC only. Add the sub-board.c file but bypass the HDMI settings if the HDMI relate pin is not use. BUG=b:237432830 BRANCH=none TEST=zmake build xivu, and check dut can power on with AC only. Signed-off-by: Leila Lin Change-Id: I2ed0f827e6ca83d422e188241d69201595b95fad Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3759828 Reviewed-by: Elmo Lan Reviewed-by: Andrew McRae Tested-by: LeilaCY Lin Commit-Queue: LeilaCY Lin Reviewed-by: Peter Marheine --- zephyr/projects/nissa/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 258dbfdc3a..84d7ca57c1 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -8,6 +8,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) zephyr_include_directories(include) zephyr_library_sources("src/common.c") +zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_AP_PWRSEQ "src/board_power.c") if(DEFINED CONFIG_BOARD_NIVVIKS) @@ -17,7 +18,6 @@ if(DEFINED CONFIG_BOARD_NIVVIKS) "src/nivviks/form_factor.c" "src/nivviks/keyboard.c" ) - zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/nivviks/fan.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nivviks/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nivviks/charger.c") @@ -28,7 +28,6 @@ if(DEFINED CONFIG_BOARD_NEREID) "src/led.c" "src/nereid/keyboard.c" ) - zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nereid/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nereid/charger.c") endif() @@ -37,7 +36,6 @@ if(DEFINED CONFIG_BOARD_CRAASK) "src/craask/led.c" ) project(craask) - zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/craask/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/craask/charger.c") endif() @@ -47,7 +45,6 @@ if(DEFINED CONFIG_BOARD_PUJJO) "src/led.c" "src/pujjo/keyboard.c" ) - zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/pujjo/fan.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/pujjo/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/pujjo/charger.c") @@ -63,7 +60,6 @@ if(DEFINED CONFIG_BOARD_JOXER) "src/led.c" "src/joxer/keyboard.c" ) - zephyr_library_sources("src/sub_board.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/joxer/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/joxer/charger.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/joxer/fan.c") -- cgit v1.2.1 From 4cec658bea5f64226db0ba91ebb3c2bd573c02f2 Mon Sep 17 00:00:00 2001 From: Sue Chen Date: Tue, 19 Jul 2022 14:33:01 +0800 Subject: Nissa/Craask: adjust keyboard top row Adjust keyboard top row. BUG=none BRANCH=none TEST=the function of top row keys is good. Signed-off-by: Sue Chen Change-Id: Ibee146ad5ade5b52ec998110e7b2efa6e92c8696 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3771323 Reviewed-by: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 84d7ca57c1..f63db78631 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -33,6 +33,7 @@ if(DEFINED CONFIG_BOARD_NEREID) endif() if(DEFINED CONFIG_BOARD_CRAASK) zephyr_library_sources( + "src/craask/keyboard.c" "src/craask/led.c" ) project(craask) -- cgit v1.2.1 From 0dea801e9a72f4eb7b34dded8aeca80bda584fd0 Mon Sep 17 00:00:00 2001 From: Andrew McRae Date: Tue, 19 Jul 2022 15:42:17 +1000 Subject: nissa: Rearrange projects into sub-directories Rearrange the projects into separate sub-directories to improve clarity and separation. BUG=none TEST=zmake testall BRANCH=none Signed-off-by: Andrew McRae Change-Id: I14c3324760d195807f831bd72bdbc129fe76912b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3771363 Reviewed-by: Peter Marheine --- zephyr/projects/nissa/CMakeLists.txt | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index f63db78631..ee7ec0525e 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -15,53 +15,53 @@ if(DEFINED CONFIG_BOARD_NIVVIKS) project(nivviks) zephyr_library_sources( "src/led.c" - "src/nivviks/form_factor.c" - "src/nivviks/keyboard.c" + "nivviks/src/form_factor.c" + "nivviks/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/nivviks/fan.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nivviks/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nivviks/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "nivviks/src/fan.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "nivviks/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "nivviks/src/charger.c") endif() if(DEFINED CONFIG_BOARD_NEREID) project(nereid) zephyr_library_sources( "src/led.c" - "src/nereid/keyboard.c" + "nereid/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nereid/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nereid/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "nereid/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "nereid/src/charger.c") endif() if(DEFINED CONFIG_BOARD_CRAASK) zephyr_library_sources( - "src/craask/keyboard.c" - "src/craask/led.c" + "craask/src/keyboard.c" + "craask/src/led.c" ) project(craask) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/craask/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/craask/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "craask/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "craask/src/charger.c") endif() if(DEFINED CONFIG_BOARD_PUJJO) project(pujjo) zephyr_library_sources( "src/led.c" - "src/pujjo/keyboard.c" + "pujjo/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/pujjo/fan.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/pujjo/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/pujjo/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "pujjo/src/fan.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "pujjo/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "pujjo/src/charger.c") endif() if(DEFINED CONFIG_BOARD_XIVU) project(xivu) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/xivu/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/xivu/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "xivu/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "xivu/src/charger.c") endif() if(DEFINED CONFIG_BOARD_JOXER) project(joxer) zephyr_library_sources( "src/led.c" - "src/joxer/keyboard.c" + "joxer/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/joxer/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/joxer/charger.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/joxer/fan.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "joxer/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "joxer/src/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "joxer/src/fan.c") endif() -- cgit v1.2.1 From c3c013fb6b142607e0077080dac3856b2b6eef69 Mon Sep 17 00:00:00 2001 From: Sue Chen Date: Wed, 20 Jul 2022 17:20:35 +0800 Subject: Nissa/Craask: Fix rotation parameters for base accelgyro Base accelgyro orientation is different after board ver2. BUG=none BRANCH=none TEST=base accel raw data on both ver1 and ver2 dut are the same. Signed-off-by: Sue Chen Change-Id: I0b37de560cc5da52ca193751f5fc0803ec4a0846 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3775279 Reviewed-by: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index ee7ec0525e..a76f91b6d2 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -33,6 +33,7 @@ if(DEFINED CONFIG_BOARD_NEREID) endif() if(DEFINED CONFIG_BOARD_CRAASK) zephyr_library_sources( + "craask/src/form_factor.c" "craask/src/keyboard.c" "craask/src/led.c" ) -- cgit v1.2.1 From b5e5bfae528c9fb967195d73d284806793505034 Mon Sep 17 00:00:00 2001 From: "jimmy.wu" Date: Tue, 26 Jul 2022 15:33:15 +0800 Subject: pujjo: Add power LED node Add power LED node for 500e/C380 sub-board. BUG=b:240087038 TEST=zmake build pujjo BRANCH=none Signed-off-by: jimmy.wu Change-Id: I74e5dfd50951706cd2a9bbde0466b2bfa8ac5ed5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3787365 Reviewed-by: Peter Marheine Reviewed-by: Andrew McRae Commit-Queue: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index a76f91b6d2..0d741bc7df 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -44,7 +44,7 @@ endif() if(DEFINED CONFIG_BOARD_PUJJO) project(pujjo) zephyr_library_sources( - "src/led.c" + "pujjo/src/led.c" "pujjo/src/keyboard.c" ) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "pujjo/src/fan.c") -- cgit v1.2.1 From ce4ecdb30eb6ce358a04985e7233571efa42325c Mon Sep 17 00:00:00 2001 From: Will Tsai Date: Mon, 25 Jul 2022 16:32:37 +0800 Subject: Joxer: Add led behavior support Power LED system on(S0) : white led continuously on system on suspend mode : white led blinks(1 second on, 1 second off) Battery LED charging state < 95% : amber led continuously on charging state >= 95% : white led continuously on discharge : led off charging state < 10% : amber led blinks(1 second on, 1 second off) suspend : led off battery error : amber led blinks quickly(0.5 second on, 0.5 second off) on factory test : white led blinks(1 second on, 1 second off) BRANCH=none BUG=b:240363751 TEST=zmake build joxer; ectool led battery amber; ectool led battery white; ectool led battery auto; ectool led battery off Signed-off-by: Will Tsai Change-Id: Ib5c0576db096cad7ccdbf46ca11661bd15571dda Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3784489 Reviewed-by: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 0d741bc7df..a4f78e47ae 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -59,7 +59,7 @@ endif() if(DEFINED CONFIG_BOARD_JOXER) project(joxer) zephyr_library_sources( - "src/led.c" + "joxer/src/led.c" "joxer/src/keyboard.c" ) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "joxer/src/usbc.c") -- cgit v1.2.1 From 1de22ccb3c82e265c7ac371fe9f7a0c052021292 Mon Sep 17 00:00:00 2001 From: Ruibin Chang Date: Thu, 14 Jul 2022 17:52:12 +1000 Subject: pujjo: Config hdmi-en-odl for pujjo Due to CL:3778918 only config hdmi-en-odl for nereid board v2, config hdmi-en-odl for pujjo as well. BUG=b:240084173 TEST=zmake build pujjo BRANCH=none Signed-off-by: jimmy.wu Signed-off-by: Peter Marheine Change-Id: Iecc66f9644d3bea882248a40de9b081296e9b1ec Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3787954 Reviewed-by: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index a4f78e47ae..ebaa902ab3 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -27,6 +27,7 @@ if(DEFINED CONFIG_BOARD_NEREID) zephyr_library_sources( "src/led.c" "nereid/src/keyboard.c" + "nereid/src/hdmi.c" ) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "nereid/src/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "nereid/src/charger.c") @@ -46,6 +47,7 @@ if(DEFINED CONFIG_BOARD_PUJJO) zephyr_library_sources( "pujjo/src/led.c" "pujjo/src/keyboard.c" + "pujjo/src/hdmi.c" ) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "pujjo/src/fan.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "pujjo/src/usbc.c") -- cgit v1.2.1 From d16be8f98d81d7e589935d1c6c78ec4430a8960d Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Thu, 4 Aug 2022 08:16:47 -0700 Subject: zephyr: Make ZEPHYR_BASE not an environment variable To minimize the amount of environment variable dependency we have, move ZEPHYR_BASE (used to find the "Zephyr" CMake package) from an environment variable to a CMake definition. This makes our only required environment variable PATH, so we can do a complete environment scrub for all commands executed. BUG=b:239619222 BRANCH=none TEST=zmake testall Signed-off-by: Jack Rosenthal Change-Id: Ie34a9e1f49177649cf0e54c95d73b41bd1b94992 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3811715 Reviewed-by: Abe Levkoy --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index ebaa902ab3..758f059a44 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") zephyr_include_directories(include) zephyr_library_sources("src/common.c") -- cgit v1.2.1 From ab36e4ff4322b9c3bcdb59ecaf19e055b1365545 Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Fri, 5 Aug 2022 15:58:49 +0000 Subject: Revert "zephyr: Make ZEPHYR_BASE not an environment variable" This reverts commit d16be8f98d81d7e589935d1c6c78ec4430a8960d. Reason for revert: suspected at fault for b/241489955 (suspect we're stripping ccache environment variables in ninja call) BUG=b:241489955 TEST=CQ Original change's description: > zephyr: Make ZEPHYR_BASE not an environment variable > > To minimize the amount of environment variable dependency we have, move > ZEPHYR_BASE (used to find the "Zephyr" CMake package) from an > environment variable to a CMake definition. > > This makes our only required environment variable PATH, so we can do a > complete environment scrub for all commands executed. > > BUG=b:239619222 > BRANCH=none > TEST=zmake testall > > Signed-off-by: Jack Rosenthal > Change-Id: Ie34a9e1f49177649cf0e54c95d73b41bd1b94992 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3811715 > Reviewed-by: Abe Levkoy Bug: b:239619222 Change-Id: I9cfdb04fc61d013ba670049c5dbbeeca7de4893c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3813042 Auto-Submit: Jack Rosenthal Tested-by: Jack Rosenthal Reviewed-by: Fabio Baltieri Commit-Queue: Jeremy Bettis Reviewed-by: Jeremy Bettis Tested-by: Bob Moragues --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 758f059a44..ebaa902ab3 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) -find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) zephyr_include_directories(include) zephyr_library_sources("src/common.c") -- cgit v1.2.1 From d7ee20ee4b8f528a9c1e6a8ea9b009e443363bce Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Tue, 9 Aug 2022 10:01:18 -0600 Subject: Reland "zephyr: Make ZEPHYR_BASE not an environment variable"" This reverts commit ab36e4ff4322b9c3bcdb59ecaf19e055b1365545. The original CL landed at CL:3811715, but was reverted, as we broke the ebuild case, as we dropped environment variables from the ninja call. This reland is exactly the same, but re-adds the environment to the ninja call: Change-Id: Id57845a3dca0cc05f9cafa55db337885f88a327a --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -782,6 +782,8 @@ class Zmake: errors="replace", + # TODO(b/239619222): Filter os.environ for ninja. + env=os.environ, ) BUG=b:239619222 BRANCH=none TEST=zmake testall emerge-brya-zephyr chromeos-zephyr Signed-off-by: Jack Rosenthal Change-Id: I62aa1672c3aa463fa36166b980fe6879aac04c40 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3820643 Reviewed-by: Abe Levkoy Commit-Queue: Abe Levkoy --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index ebaa902ab3..758f059a44 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") zephyr_include_directories(include) zephyr_library_sources("src/common.c") -- cgit v1.2.1 From b350ae69aca7be329d729d8ce684604571d9de1a Mon Sep 17 00:00:00 2001 From: Zick Wei Date: Thu, 18 Aug 2022 13:15:58 +0800 Subject: yaviks: initial EC image Clone from nereid, rename to yaviks. BUG=b:242936869 BRANCH=none TEST=zmake build yaviks Signed-off-by: Zick Wei Change-Id: I2146c33e17fcd8ad011dd56f05e6fd6d7fe96fee Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3837542 Reviewed-by: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 758f059a44..967c3b6b57 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -68,3 +68,13 @@ if(DEFINED CONFIG_BOARD_JOXER) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "joxer/src/charger.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "joxer/src/fan.c") endif() +if(DEFINED CONFIG_BOARD_YAVIKS) + project(yaviks) + zephyr_library_sources( + "src/led.c" + "yaviks/src/keyboard.c" + "yaviks/src/hdmi.c" + ) + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "yaviks/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "yaviks/src/charger.c") +endif() \ No newline at end of file -- cgit v1.2.1 From e03fddbfe79415ebbee22769bee1d5999f885243 Mon Sep 17 00:00:00 2001 From: ridden_liu Date: Mon, 29 Aug 2022 11:03:08 +0800 Subject: Xivu: Submit Keyboard Mapping CL The row of function keys on the xivu is wrong. So need to submit a firmware Change List (CL). that specifies the top row layout unique to the device. BUG=b:243308699 BRANCH=Xivu TEST=zmake build xivu.Check if the function keys are normal. Signed-off-by: ridden_liu Change-Id: I3b3fc31e3f86a52cb4bc0d4f23903a27a914cc90 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3858896 Reviewed-by: SamSP Liu Reviewed-by: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 967c3b6b57..4717c2c697 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -54,9 +54,12 @@ if(DEFINED CONFIG_BOARD_PUJJO) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "pujjo/src/charger.c") endif() if(DEFINED CONFIG_BOARD_XIVU) - project(xivu) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "xivu/src/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "xivu/src/charger.c") + project(xivu) + zephyr_library_sources( + "xivu/src/keyboard.c" + ) + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "xivu/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "xivu/src/charger.c") endif() if(DEFINED CONFIG_BOARD_JOXER) project(joxer) -- cgit v1.2.1 From 6449ab091125447945bb042dc94d610c331ae9f9 Mon Sep 17 00:00:00 2001 From: David Huang Date: Thu, 1 Sep 2022 17:48:14 +0800 Subject: Nissa: Modify LED behavior for Nirwen LED behavior: Charge | Amber on Full charge | Blue on Discharge in S3 | Amber on 1sec off 3sec Discharge in S5 | Off Discharge in S0 | Blue on Battery Error | Amber on 1sec off 1sec Factory mode | Blue on 2sec Amber on 2sec BUG=b:242957096 BRANCH=none TEST=check LED status Signed-off-by: David Huang Change-Id: I485606e65b23d117e287c8f684e097276fc90110 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3868874 Reviewed-by: Andrew McRae Commit-Queue: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 4717c2c697..6783ceb006 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -14,7 +14,7 @@ zephyr_library_sources_ifdef(CONFIG_AP_PWRSEQ "src/board_power.c") if(DEFINED CONFIG_BOARD_NIVVIKS) project(nivviks) zephyr_library_sources( - "src/led.c" + "nivviks/src/led.c" "nivviks/src/form_factor.c" "nivviks/src/keyboard.c" ) -- cgit v1.2.1 From 71b2ef709dcb14260f5fdaa3ab4ced005a29fb46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Sep 2022 14:54:36 -0400 Subject: Update license boilerplate text in source code files Normally we don't do this, but enough changes have accumulated that we're doing a tree-wide one-off update of the name & style. BRANCH=none BUG=chromium:1098010 TEST=`repo upload` works Change-Id: Icd3a1723c20595356af83d190b2c6a9078b3013b Signed-off-by: Mike Frysinger Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3891203 Reviewed-by: Jeremy Bettis Reviewed-by: Jack Rosenthal --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 6783ceb006..99fedacd93 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Copyright 2021 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -- cgit v1.2.1 From 0f5d89e24b7ab6bfe464affaaf2be905520d4f6a Mon Sep 17 00:00:00 2001 From: Zick Wei Date: Wed, 7 Sep 2022 19:02:36 +0800 Subject: yaviks: update led behavior yaviks has charge leds on left side and right side, each side have two colors: amber and white. The led behavior define as following: Charging led: led on with charging port active, other port is off. Charging: Amber. Discharging: Off. Battery Error: Blinking amber on both side (0.5 sec on, 0.5 sec off) Fuel < 10%: Blinking amber on both side (1 sec on, 1 sec off) Force idle for factory: Blinking amber (1 sec on, 1 sec off) System suspend with non-charging state: Blinking both side LED white (1 sec on, 1 sec off) BUG=b:246414045 BRANCH=none TEST=verify led behavior as intended, verify VT2 command: ectool led left/right auto/white/amber/off. Signed-off-by: Zick Wei Change-Id: I7d7ecaba5f1a78609d9093b94b67a23a40d62812 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3878626 Commit-Queue: Andrew McRae Reviewed-by: Andrew McRae Code-Coverage: Andrew McRae Reviewed-by: Peter Marheine Reviewed-by: Devin Lu --- zephyr/projects/nissa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 99fedacd93..2907d969b3 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -74,7 +74,7 @@ endif() if(DEFINED CONFIG_BOARD_YAVIKS) project(yaviks) zephyr_library_sources( - "src/led.c" + "yaviks/src/led.c" "yaviks/src/keyboard.c" "yaviks/src/hdmi.c" ) -- cgit v1.2.1 From 213df43e8d52cdb29eab4f82b5afce73a5053e6b Mon Sep 17 00:00:00 2001 From: "jimmy.wu" Date: Thu, 8 Sep 2022 19:53:44 +0800 Subject: pujjo: Use SSFC bit 0-1 value to identify base sensor. 0: bmi323 1: lsm6dsm BUG=b:235866642 BRANCH=none TEST=zmake build pujjo TEST=can read raw data from bmi323 after setting ssfc=0x00 TEST=can read raw data from lsm6dsm after setting ssfc=0x01 Signed-off-by: jimmy.wu Change-Id: I668317cde8b0431ae4b454ca28e3f0d644bb8d8c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3881429 Reviewed-by: Andrew McRae Reviewed-by: Peter Marheine Code-Coverage: Andrew McRae --- zephyr/projects/nissa/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'zephyr/projects/nissa/CMakeLists.txt') diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index 2907d969b3..30d574096b 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -48,6 +48,7 @@ if(DEFINED CONFIG_BOARD_PUJJO) "pujjo/src/led.c" "pujjo/src/keyboard.c" "pujjo/src/hdmi.c" + "pujjo/src/form_factor.c" ) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "pujjo/src/fan.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "pujjo/src/usbc.c") -- cgit v1.2.1