From 252457d4b21f46889eebad61d4c0a65331919cec Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Thu, 4 Nov 2021 12:11:58 -0600 Subject: ish: Trim down the release branch In the interest of making long-term branch maintenance incur as little technical debt on us as possible, we should not maintain any files on the branch we are not actually using. This has the added effect of making it extremely clear when merging CLs from the main branch when changes have the possibility to affect us. The follow-on CL adds a convenience script to actually pull updates from the main branch and generate a CL for the update. BUG=b:204206272 BRANCH=ish TEST=make BOARD=arcada_ish && make BOARD=drallion_ish Signed-off-by: Jack Rosenthal Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038 Reviewed-by: Jett Rink Reviewed-by: Tom Hughes --- extra/lightbar/programs/bad-decode-32.bin | 1 - extra/lightbar/programs/bad-decode-8.bin | Bin 3 -> 0 bytes extra/lightbar/programs/bad-jump.bin | 1 - extra/lightbar/programs/bad-opcode.bin | 1 - extra/lightbar/programs/green-pulse.bin | Bin 19 -> 0 bytes extra/lightbar/programs/green-pulse.lbs | 8 --- extra/lightbar/programs/infinite-jump.bin | Bin 2 -> 0 bytes extra/lightbar/programs/infinite-jump.lbs | 1 - extra/lightbar/programs/konami.bin | Bin 144 -> 0 bytes extra/lightbar/programs/konami.lbs | 89 ---------------------------- extra/lightbar/programs/rainbow-shift.bin | Bin 31 -> 0 bytes extra/lightbar/programs/rainbow-shift.lbs | 8 --- extra/lightbar/programs/red-green-blink.bin | Bin 29 -> 0 bytes extra/lightbar/programs/red-green-blink.lbs | 14 ----- extra/lightbar/programs/s0.bin | Bin 58 -> 0 bytes extra/lightbar/programs/s0.lbs | 22 ------- extra/lightbar/programs/s0s3.bin | Bin 43 -> 0 bytes extra/lightbar/programs/s0s3.lbs | 16 ----- extra/lightbar/programs/s3.bin | Bin 37 -> 0 bytes extra/lightbar/programs/s3.lbs | 17 ------ extra/lightbar/programs/s3s0.bin | Bin 34 -> 0 bytes extra/lightbar/programs/s3s0.lbs | 11 ---- 22 files changed, 189 deletions(-) delete mode 100644 extra/lightbar/programs/bad-decode-32.bin delete mode 100644 extra/lightbar/programs/bad-decode-8.bin delete mode 100644 extra/lightbar/programs/bad-jump.bin delete mode 100644 extra/lightbar/programs/bad-opcode.bin delete mode 100644 extra/lightbar/programs/green-pulse.bin delete mode 100644 extra/lightbar/programs/green-pulse.lbs delete mode 100644 extra/lightbar/programs/infinite-jump.bin delete mode 100644 extra/lightbar/programs/infinite-jump.lbs delete mode 100644 extra/lightbar/programs/konami.bin delete mode 100644 extra/lightbar/programs/konami.lbs delete mode 100644 extra/lightbar/programs/rainbow-shift.bin delete mode 100644 extra/lightbar/programs/rainbow-shift.lbs delete mode 100644 extra/lightbar/programs/red-green-blink.bin delete mode 100644 extra/lightbar/programs/red-green-blink.lbs delete mode 100644 extra/lightbar/programs/s0.bin delete mode 100644 extra/lightbar/programs/s0.lbs delete mode 100644 extra/lightbar/programs/s0s3.bin delete mode 100644 extra/lightbar/programs/s0s3.lbs delete mode 100644 extra/lightbar/programs/s3.bin delete mode 100644 extra/lightbar/programs/s3.lbs delete mode 100644 extra/lightbar/programs/s3s0.bin delete mode 100644 extra/lightbar/programs/s3s0.lbs (limited to 'extra/lightbar/programs') diff --git a/extra/lightbar/programs/bad-decode-32.bin b/extra/lightbar/programs/bad-decode-32.bin deleted file mode 100644 index 1d5d0c6c75..0000000000 --- a/extra/lightbar/programs/bad-decode-32.bin +++ /dev/null @@ -1 +0,0 @@ -UUU \ No newline at end of file diff --git a/extra/lightbar/programs/bad-decode-8.bin b/extra/lightbar/programs/bad-decode-8.bin deleted file mode 100644 index 8352675d67..0000000000 Binary files a/extra/lightbar/programs/bad-decode-8.bin and /dev/null differ diff --git a/extra/lightbar/programs/bad-jump.bin b/extra/lightbar/programs/bad-jump.bin deleted file mode 100644 index b2c29a0bbf..0000000000 --- a/extra/lightbar/programs/bad-jump.bin +++ /dev/null @@ -1 +0,0 @@ -? \ No newline at end of file diff --git a/extra/lightbar/programs/bad-opcode.bin b/extra/lightbar/programs/bad-opcode.bin deleted file mode 100644 index 6b10f95843..0000000000 --- a/extra/lightbar/programs/bad-opcode.bin +++ /dev/null @@ -1 +0,0 @@ -Ã \ No newline at end of file diff --git a/extra/lightbar/programs/green-pulse.bin b/extra/lightbar/programs/green-pulse.bin deleted file mode 100644 index 0fdab712e9..0000000000 Binary files a/extra/lightbar/programs/green-pulse.bin and /dev/null differ diff --git a/extra/lightbar/programs/green-pulse.lbs b/extra/lightbar/programs/green-pulse.lbs deleted file mode 100644 index bccf3e5c9a..0000000000 --- a/extra/lightbar/programs/green-pulse.lbs +++ /dev/null @@ -1,8 +0,0 @@ - set.1 {0,1,2,3}.end.g 0xff - delay.r 7813 - delay.w 2000000 -L0001: on - cycle.1 - off - wait - jump L0001 diff --git a/extra/lightbar/programs/infinite-jump.bin b/extra/lightbar/programs/infinite-jump.bin deleted file mode 100644 index 5407bf3ddf..0000000000 Binary files a/extra/lightbar/programs/infinite-jump.bin and /dev/null differ diff --git a/extra/lightbar/programs/infinite-jump.lbs b/extra/lightbar/programs/infinite-jump.lbs deleted file mode 100644 index 6174d7ffd4..0000000000 --- a/extra/lightbar/programs/infinite-jump.lbs +++ /dev/null @@ -1 +0,0 @@ -L0001: jump L0001 diff --git a/extra/lightbar/programs/konami.bin b/extra/lightbar/programs/konami.bin deleted file mode 100644 index f7abfdc4ee..0000000000 Binary files a/extra/lightbar/programs/konami.bin and /dev/null differ diff --git a/extra/lightbar/programs/konami.lbs b/extra/lightbar/programs/konami.lbs deleted file mode 100644 index c9fa8d697a..0000000000 --- a/extra/lightbar/programs/konami.lbs +++ /dev/null @@ -1,89 +0,0 @@ -# Konami code easter egg - delay.w 100000 - set.rgb {1,2}.end 0xff 0xff 0x00 - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - set.rgb {1,2}.end 0x00 0x00 0x00 - set.1 {0,3}.end.b 0xff - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - set.1 {0,3}.end.b 0x00 - set.1 {0,1}.end.r 0xff - ramp.1 - wait - cycle.1 - wait - set.1 {0,1}.end.r 0x00 - set.1 {2,3}.end.g 0xff - ramp.1 - wait - cycle.1 - wait - set.1 {2,3}.end.g 0x00 - set.1 {0,1}.end.r 0xff - ramp.1 - wait - cycle.1 - wait - set.1 {0,1}.end.r 0x00 - set.1 {2,3}.end.g 0xff - ramp.1 - wait - cycle.1 - wait - set.1 {2,3}.end.g 0x00 - set.rgb {0,2}.end 0x00 0xff 0xff - ramp.1 - wait - cycle.1 - wait - delay.w 50000 - wait - set.rgb {0,2}.end 0x00 0x00 0x00 - set.rgb {1,3}.end 0xff 0x00 0xff - ramp.1 - wait - wait - cycle.1 - wait - delay.w 100000 - wait - wait - set.rgb {0,1,2,3}.end 0xff 0xff 0xff - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - halt diff --git a/extra/lightbar/programs/rainbow-shift.bin b/extra/lightbar/programs/rainbow-shift.bin deleted file mode 100644 index a72c5b16d6..0000000000 Binary files a/extra/lightbar/programs/rainbow-shift.bin and /dev/null differ diff --git a/extra/lightbar/programs/rainbow-shift.lbs b/extra/lightbar/programs/rainbow-shift.lbs deleted file mode 100644 index e1cbcddc83..0000000000 --- a/extra/lightbar/programs/rainbow-shift.lbs +++ /dev/null @@ -1,8 +0,0 @@ -# The rainbow cycle program. - set.rgb {0,1,2,3}.end 0xff 0xff 0xff - set.rgb {0}.phase 0x00 0x55 0xaa - set.rgb {1}.phase 0x40 0x95 0xea - set.rgb {2}.phase 0x80 0xd5 0x2a - set.rgb {3}.phase 0xc0 0x15 0x6a - delay.r 7813 - cycle diff --git a/extra/lightbar/programs/red-green-blink.bin b/extra/lightbar/programs/red-green-blink.bin deleted file mode 100644 index 6bece444dd..0000000000 Binary files a/extra/lightbar/programs/red-green-blink.bin and /dev/null differ diff --git a/extra/lightbar/programs/red-green-blink.lbs b/extra/lightbar/programs/red-green-blink.lbs deleted file mode 100644 index d520b739bb..0000000000 --- a/extra/lightbar/programs/red-green-blink.lbs +++ /dev/null @@ -1,14 +0,0 @@ -# Blinks red and green with 1 second pauses. - set.rgb {0,1,2,3}.beg 0xff 0x00 0x00 - set.rgb {0,1,2,3}.end 0x00 0xff 0x00 - delay.w 250000 - delay.r 0 - cycle.1 - wait - ramp.1 - wait - cycle.1 - wait - ramp.1 - wait - halt diff --git a/extra/lightbar/programs/s0.bin b/extra/lightbar/programs/s0.bin deleted file mode 100644 index b20cecd8ee..0000000000 Binary files a/extra/lightbar/programs/s0.bin and /dev/null differ diff --git a/extra/lightbar/programs/s0.lbs b/extra/lightbar/programs/s0.lbs deleted file mode 100644 index 364c3d595c..0000000000 --- a/extra/lightbar/programs/s0.lbs +++ /dev/null @@ -1,22 +0,0 @@ -# S0 sequence: Google colors, unless battery is low. - set.rgb {0}.end 0x33 0x69 0xe8 - set.rgb {1}.end 0xd5 0x0f 0x25 - set.rgb {2}.end 0xee 0xb2 0x11 - set.rgb {3}.end 0x00 0x99 0x25 - delay.r 1250 - ramp.1 - set.1 {0,1,2,3}.beg.r 0xff - delay.r 2500 - delay.w 1000000 - wait - jump L0003 -L0001: swap - ramp.1 -L0002: wait -L0003: jbat L0004 L0002 - jump L0002 -L0004: swap - ramp.1 -L0005: wait - jbat L0005 L0001 - jump L0001 diff --git a/extra/lightbar/programs/s0s3.bin b/extra/lightbar/programs/s0s3.bin deleted file mode 100644 index d1cb8a4af1..0000000000 Binary files a/extra/lightbar/programs/s0s3.bin and /dev/null differ diff --git a/extra/lightbar/programs/s0s3.lbs b/extra/lightbar/programs/s0s3.lbs deleted file mode 100644 index ba141f338d..0000000000 --- a/extra/lightbar/programs/s0s3.lbs +++ /dev/null @@ -1,16 +0,0 @@ -# S0S3 sequence: Fade out, Google color ramp up/down. - get - delay.r 2000 - ramp.1 - swap - set.rgb {0}.end 0x33 0x69 0xe8 - set.rgb {1}.end 0xd5 0x0f 0x25 - set.rgb {2}.end 0xee 0xb2 0x11 - set.rgb {3}.end 0x00 0x99 0x25 - delay.r 1250 - ramp.1 - swap - delay.r 10000 - ramp.1 - off - halt diff --git a/extra/lightbar/programs/s3.bin b/extra/lightbar/programs/s3.bin deleted file mode 100644 index 7e487bb8c9..0000000000 Binary files a/extra/lightbar/programs/s3.bin and /dev/null differ diff --git a/extra/lightbar/programs/s3.lbs b/extra/lightbar/programs/s3.lbs deleted file mode 100644 index e8803a06bb..0000000000 --- a/extra/lightbar/programs/s3.lbs +++ /dev/null @@ -1,17 +0,0 @@ -# S3 sequence: Pulse red on low battery. - set.rgb {0,1,2,3}.end 0xff 0x00 0x00 - cycle.1 - delay.w 5000000 -L0001: off - wait - jcharge L0001 - jbat L0002 L0001 - jump L0001 -L0002: on - delay.r 1250 - ramp.1 - swap - delay.r 10000 - ramp.1 - swap - jump L0001 diff --git a/extra/lightbar/programs/s3s0.bin b/extra/lightbar/programs/s3s0.bin deleted file mode 100644 index b277752d25..0000000000 Binary files a/extra/lightbar/programs/s3s0.bin and /dev/null differ diff --git a/extra/lightbar/programs/s3s0.lbs b/extra/lightbar/programs/s3s0.lbs deleted file mode 100644 index 0cac96f208..0000000000 --- a/extra/lightbar/programs/s3s0.lbs +++ /dev/null @@ -1,11 +0,0 @@ -# S3S0 sequence: Google color ramp up/down. - set.rgb {0}.end 0x33 0x69 0xe8 - set.rgb {1}.end 0xd5 0x0f 0x25 - set.rgb {2}.end 0xee 0xb2 0x11 - set.rgb {3}.end 0x00 0x99 0x25 - delay.r 1250 - ramp.1 - swap - delay.r 10000 - ramp.1 - halt -- cgit v1.2.1