From 31550fa3c614115b6becc424eff822a1611fa0cb Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Jan 2020 15:14:58 -0700 Subject: [PATCH 1/2] Fix remapping of alt and super in galp3-c jeremy layout --- src/board/system76/galp3-c/keymap/jeremy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/board/system76/galp3-c/keymap/jeremy.c b/src/board/system76/galp3-c/keymap/jeremy.c index 9046c14..8401fb0 100644 --- a/src/board/system76/galp3-c/keymap/jeremy.c +++ b/src/board/system76/galp3-c/keymap/jeremy.c @@ -9,7 +9,7 @@ LAYOUT( K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_PGUP, KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_PGDN, K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_END, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT + K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT ), LAYOUT( K_ESC, K_TOUCHPAD, K_F2, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_F7, KT_SCI | SCI_BRIGHTNESS_DOWN, KT_SCI | SCI_BRIGHTNESS_UP, K_F10, KT_SCI | SCI_AIRPLANE_MODE, KT_SCI | SCI_SUSPEND, 0 /*prtsc*/, 0 /*pause*/, K_INSERT, K_DEL, From bfc6b10aa7376da9db3e0570a5e2adf30933ecf7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Jan 2020 15:16:22 -0700 Subject: [PATCH 2/2] Use ISP example to flash --- src/board/system76/darp5/board.mk | 4 ++-- src/board/system76/galp3-c/board.mk | 4 ++-- src/board/system76/lemp9/board.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk index 5446927..7820e8d 100644 --- a/src/board/system76/darp5/board.mk +++ b/src/board/system76/darp5/board.mk @@ -28,8 +28,8 @@ CFLAGS+=-I$(BUILD)/include INCLUDE+=$(BUILD)/include/scratch.h flash: $(BUILD)/ec.rom - cargo build --manifest-path ecflash/Cargo.toml --example flash --release - sudo ecflash/target/release/examples/flash $< + cargo build --manifest-path ecflash/Cargo.toml --example isp --release + sudo ecflash/target/release/examples/isp --internal $< isp: $(BUILD)/ec.rom cargo build --manifest-path ecflash/Cargo.toml --example isp --release diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk index 5446927..7820e8d 100644 --- a/src/board/system76/galp3-c/board.mk +++ b/src/board/system76/galp3-c/board.mk @@ -28,8 +28,8 @@ CFLAGS+=-I$(BUILD)/include INCLUDE+=$(BUILD)/include/scratch.h flash: $(BUILD)/ec.rom - cargo build --manifest-path ecflash/Cargo.toml --example flash --release - sudo ecflash/target/release/examples/flash $< + cargo build --manifest-path ecflash/Cargo.toml --example isp --release + sudo ecflash/target/release/examples/isp --internal $< isp: $(BUILD)/ec.rom cargo build --manifest-path ecflash/Cargo.toml --example isp --release diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk index 9e6d1e6..bb19bee 100644 --- a/src/board/system76/lemp9/board.mk +++ b/src/board/system76/lemp9/board.mk @@ -28,8 +28,8 @@ CFLAGS+=-I$(BUILD)/include INCLUDE+=$(BUILD)/include/scratch.h flash: $(BUILD)/ec.rom - cargo build --manifest-path ecflash/Cargo.toml --example flash --release - sudo ecflash/target/release/examples/flash $< + cargo build --manifest-path ecflash/Cargo.toml --example isp --release + sudo ecflash/target/release/examples/isp --internal $< isp: $(BUILD)/ec.rom cargo build --manifest-path ecflash/Cargo.toml --example isp --release