diff options
| -rw-r--r-- | zephyr/program/nissa/BUILD.py | 3 | ||||
| -rw-r--r-- | zephyr/program/nissa/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | zephyr/program/nissa/Kconfig | 5 | ||||
| -rw-r--r-- | zephyr/program/nissa/gothrax/gothrax_vif.xml (renamed from zephyr/program/nissa/gothrax/nereid_vif.xml) | 2 | ||||
| -rw-r--r-- | zephyr/program/nissa/gothrax/project.conf | 2 | ||||
| -rw-r--r-- | zephyr/program/nissa/gothrax/src/usbc.c | 2 |
6 files changed, 20 insertions, 4 deletions
diff --git a/zephyr/program/nissa/BUILD.py b/zephyr/program/nissa/BUILD.py index 04b1f62778..fce86e7c71 100644 --- a/zephyr/program/nissa/BUILD.py +++ b/zephyr/program/nissa/BUILD.py @@ -113,6 +113,7 @@ uldren = register_nissa_project( project_name="uldren", chip="npcx9m3f", ) -gothrax = register_nereid_project( +gothrax = register_nissa_project( project_name="gothrax", + chip="it81302bx", ) diff --git a/zephyr/program/nissa/CMakeLists.txt b/zephyr/program/nissa/CMakeLists.txt index 88e2d1c8a4..3888d3f688 100644 --- a/zephyr/program/nissa/CMakeLists.txt +++ b/zephyr/program/nissa/CMakeLists.txt @@ -122,3 +122,13 @@ if(DEFINED CONFIG_BOARD_ULDREN) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "uldren/src/usbc.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "uldren/src/charger.c") endif() +if(DEFINED CONFIG_BOARD_GOTHRAX) + project(gothrax) + zephyr_library_sources( + "src/led.c" + "gothrax/src/keyboard.c" + "gothrax/src/hdmi.c" + ) + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "gothrax/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "gothrax/src/charger.c") +endif() diff --git a/zephyr/program/nissa/Kconfig b/zephyr/program/nissa/Kconfig index 5168a112ed..d31f420c76 100644 --- a/zephyr/program/nissa/Kconfig +++ b/zephyr/program/nissa/Kconfig @@ -77,6 +77,11 @@ config BOARD_ULDREN Build Google Uldren reference board. Uldren has Intel ADL-N SoC with NPCX993FA0BX EC. +config BOARD_GOTHRAX + bool "Google Gothrax Board" + help + Build Google Gothrax reference board. Gothrax has Intel ADL-N SoC + with IT81302 EC. module = NISSA module-str = Nissa board-specific code diff --git a/zephyr/program/nissa/gothrax/nereid_vif.xml b/zephyr/program/nissa/gothrax/gothrax_vif.xml index 91c8dbe68b..1fd17e50c9 100644 --- a/zephyr/program/nissa/gothrax/nereid_vif.xml +++ b/zephyr/program/nissa/gothrax/gothrax_vif.xml @@ -7,7 +7,7 @@ <vif:Version>3.2.4.0</vif:Version>
</vif:VIF_App>
<vif:Vendor_Name>Google</vif:Vendor_Name>
- <vif:Model_Part_Number>Nereid</vif:Model_Part_Number>
+ <vif:Model_Part_Number>Gothrax</vif:Model_Part_Number>
<vif:Product_Revision>1</vif:Product_Revision>
<vif:TID>0</vif:TID>
<vif:VIF_Product_Type value="0">Port Product</vif:VIF_Product_Type>
diff --git a/zephyr/program/nissa/gothrax/project.conf b/zephyr/program/nissa/gothrax/project.conf index ff87f6e591..e5488a4aff 100644 --- a/zephyr/program/nissa/gothrax/project.conf +++ b/zephyr/program/nissa/gothrax/project.conf @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -CONFIG_BOARD_NEREID=y +CONFIG_BOARD_GOTHRAX=y # Ensure recovery key combination (esc+refresh+power) is reliable: b/236580049 CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2=y diff --git a/zephyr/program/nissa/gothrax/src/usbc.c b/zephyr/program/nissa/gothrax/src/usbc.c index e3e18e0f33..54fea2f663 100644 --- a/zephyr/program/nissa/gothrax/src/usbc.c +++ b/zephyr/program/nissa/gothrax/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/sm5803.h" #include "driver/tcpm/it83xx_pd.h" |