Skip to content

Commit 36d85b4

Browse files
authored
Merge pull request #527 from FrameworkComputer/fwk-baseboard
fwk: Add baseboard to unify hx20 and hx30
2 parents b2b7fc2 + 337724e commit 36d85b4

26 files changed

+43
-2233
lines changed

.github/workflows/hx30.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ on:
44
push:
55
branches:
66
- hx3*
7+
- hx20-hx30*
78
pull_request:
89
branches:
9-
- hx30
10+
- hx20-hx30
1011
workflow_dispatch:
1112

1213
jobs:

baseboard/fwk/baseboard.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* Copyright 2022 The Chromium OS Authors. All rights reserved.
2+
* Use of this source code is governed by a BSD-style license that can be
3+
* found in the LICENSE file.
4+
*/
5+
6+
/* Framework Laptop family-specific configuration */
7+
8+
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
9+
#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
10+

baseboard/fwk/baseboard.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* Copyright 2022 The Chromium OS Authors. All rights reserved.
2+
* Use of this source code is governed by a BSD-style license that can be
3+
* found in the LICENSE file.
4+
*/
5+
6+
/* Framework Laptop family-specific configuration */
7+
8+
#ifndef __CROS_EC_BASEBOARD_H
9+
#define __CROS_EC_BASEBOARD_H
10+
11+
12+
#endif /* __CROS_EC_BASEBOARD_H */

baseboard/fwk/build.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# -*- makefile -*-
2+
# Copyright 2022 The Chromium OS Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
#
6+
# Baseboard specific files build
7+
#
8+
9+
baseboard-y=baseboard.o diagnostics.o flash_storage.o
10+
baseboard-$(CONFIG_BATTERY_SMART)+=battery.o
11+
baseboard-$(CONFIG_FANS)+=fan.o
12+
baseboard-$(CONFIG_SYSTEMSERIAL_DEBUG) += system_serial.o
13+
baseboard-$(CONFIG_8042_AUX) += ps2mouse.o
File renamed without changes.

0 commit comments

Comments
 (0)