Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(WIP) Kgpe d16 current working #472

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
103ac65
Activate dual console by default and restructure board config
tlaurion Oct 23, 2018
7bd53f4
Changing CONFIG_USB_BOOT_DEV to sdc1, adding back CONFIG_BOOT_STATIC_…
tlaurion Oct 23, 2018
bb79931
Adding dual console to OpenBmc and tty0
tlaurion Oct 23, 2018
aebce27
putting kgpe-d16-coreboot.conf in defconfig format
tlaurion Oct 23, 2018
59f049f
NO_HZ wasn't included in kernel config. Adding it.
tlaurion Oct 23, 2018
672575c
Wasn't able to have both console firing up QubesOS gui installer, com…
tlaurion Oct 23, 2018
6614004
Removing serial configuration and static IP stuff since we have a wor…
tlaurion Oct 23, 2018
7390673
Seperate Workstation and Server board configurations until dual conso…
tlaurion Oct 23, 2018
8ac11b0
Placing files in good directories
tlaurion Oct 23, 2018
39c2e94
Corrrect flashrom options for kgpe-d16 server and workstation boards
tlaurion Jun 1, 2020
68a8198
kgpe-d16 linux: NO_HZ_IDLE instead of NO_HZ
tlaurion Jun 1, 2020
78c896e
kgpe-d16: seperate board for workstation to be AST and gui-init based…
tlaurion Jun 4, 2020
cf55716
kgpe-d16_server: boots, shows ASpeed text on VGA, controllable throug…
tlaurion Jun 5, 2020
5c9c429
kgpe-d16_workstation on ASpeed console. WIP. (Includes CIs configs to…
tlaurion Jun 5, 2020
00f9da5
kgpe-d16_workstation in defconfig format
tlaurion Jun 6, 2020
7cff86f
kgpe-d16 boards: pass from GPG to GPG2 board definitions
tlaurion Jun 6, 2020
579d2ef
kgpe-d16_workstation : Adding Cairo and FbWhpitail in board config fo…
tlaurion Jun 7, 2020
f825459
kgpe-d16: removing plymouth.ignore-serial-consoles to fix server term…
tlaurion Jun 7, 2020
b00d60c
kgpe-d16: bring par with staging branch https://gitlab.com/tlaurion/h…
tlaurion Jun 7, 2020
19c8e25
kgpe-d16 : expressively export CONFIG_TPM=n
tlaurion Jun 7, 2020
da1c04b
kgpe-d16_wokstation gui-init variables were missing
tlaurion Jun 7, 2020
6d81d4f
kgpe-d16 boards: add CONFIG_LINUX_USB_COMPANION_CONTROLLER so that us…
tlaurion Jun 7, 2020
e3f355d
linux-kgpe-d16*: add support for Pike
tlaurion Jun 8, 2020
768d3be
kgpe-d16_workstation-usb_keyboard board support addition
tlaurion Jun 8, 2020
71cbf5f
kgpe-d16_server-whiptail: Add board and dependencies to have gui-init…
tlaurion Jun 15, 2020
8f80e87
GitlabCI: kgpe-d16 fixes and upstream merge of change
tlaurion Aug 1, 2020
19cc3e2
kgpe-d16* board: add statement to fixate coreboot version to 4.8.1 fo…
tlaurion Aug 1, 2020
3eedc5c
kgpe-d16: add missing config/linux-kgpe-d16_server-whiptail.config file
tlaurion Aug 5, 2020
e9895eb
kgpe_d16 boards and CircleCI: bring par with heads upstream requireme…
tlaurion Sep 19, 2020
6b9ad9f
CircleCi: Ok.... lets output dmesg content prior of other logs.... I'…
tlaurion Sep 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 86 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
version: 2
environment:
NODE_ENV: test
NODE_OPTIONS: --max_old_space_size=4096
NPM_CONFIG_LOGLEVEL: error
JOBS: max # https://gist.github.com/ralphtheninja/f7c45bdee00784b41fed

jobs:
build:
docker:
Expand Down Expand Up @@ -61,11 +67,10 @@ jobs:

- run:
name: x230-flash
#We delete build/make-4.2.1/ directory until issue #799 is fixed.
command: |
rm -rf build/x230-flash/* build/log/* && make --load 2 \
V=1 \
BOARD=x230-flash || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=x230-flash || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x230-flash hashes
Expand All @@ -83,7 +88,7 @@ jobs:
command: |
rm -rf build/t430-flash/* build/log/* && make --load 2 \
V=1 \
BOARD=t430-flash || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=t430-flash || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput t430-flash hashes
Expand All @@ -101,7 +106,7 @@ jobs:
command: |
rm -rf build/t430/* build/log/* && make --load 2 \
V=1 \
BOARD=t430 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=t430 || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput t430 hashes
Expand All @@ -119,7 +124,7 @@ jobs:
command: |
rm -rf build/x230/* build/log/* && make --load 2 \
V=1 \
BOARD=x230 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=x230 || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x230 hashes
Expand All @@ -137,7 +142,7 @@ jobs:
command: |
rm -rf build/x230-hotp-verification/* build/log/* && make --load 2 \
V=1 \
BOARD=x230-hotp-verification || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=x230-hotp-verification || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x230-hotp-verification hashes
Expand All @@ -149,13 +154,85 @@ jobs:
tar zcvf build/x230-hotp-verification/logs.tar.gz build/log/*
- store-artifacts:
path: build/x230-hotp-verification

- run:
name: kgpe-d16_workstation
command: |
rm -rf build/kgpe-d16_workstation/* build/log/* && make --load 2 \
V=1 \
BOARD=kgpe-d16_workstation || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput kgpe-d16_workstation hashes
command: |
cat build/kgpe-d16_workstation/hashes.txt \
- run:
name: Archiving build logs for kgpe-d16_workstation
command: |
tar zcvf build/kgpe-d16_workstation/logs.tar.gz build/log/*
- store-artifacts:
path: build/kgpe-d16_workstation

- run:
name: kgpe-d16_workstation-usb_keyboard
command: |
rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && make --load 2 \
V=1 \
BOARD=kgpe-d16_workstation-usb_keyboard || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput kgpe-d16_workstation-usb_keyboard hashes
command: |
cat build/kgpe-d16_workstation-usb_keyboard/hashes.txt \
- run:
name: Archiving build logs for kgpe-d16_workstation-usb_keyboard
command: |
tar zcvf build/kgpe-d16_workstation-usb_keyboard/logs.tar.gz build/log/*
- store-artifacts:
path: build/kgpe-d16_workstation-usb_keyboard

- run:
name: kgpe-d16_server
command: |
rm -rf build/kgpe-d16_server/* build/log/* && make --load 2 \
V=1 \
BOARD=kgpe-d16_server || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput kgpe-d16_server hashes
command: |
cat build/kgpe-d16_server/hashes.txt \
- run:
name: Archiving build logs for kgpe-d16_server
command: |
tar zcvf build/kgpe-d16_server/logs.tar.gz build/log/*
- store-artifacts:
path: build/kgpe-d16_server

- run:
name: kgpe-d16_server-whiptail
command: |
rm -rf build/kgpe-d16_server-whiptail/* build/log/* && make --load 2 \
V=1 \
BOARD=kgpe-d16_server-whiptail || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput kgpe-d16_server-whiptail hashes
command: |
cat build/kgpe-d16_server-whiptail/hashes.txt \
- run:
name: Archiving build logs for kgpe-d16_server-whiptail
command: |
tar zcvf build/kgpe-d16_server-whiptail/logs.tar.gz build/log/*
- store-artifacts:
path: build/kgpe-d16_server-whiptail

- run:
name: librem_mini-NoTPM
command: |
rm -rf build/librem_mini-NoTPM/* build/log/* && make --load 2 \
V=1 \
BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=librem_mini-NoTPM || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput librem_mini-NoTPM hashes
Expand All @@ -173,7 +250,7 @@ jobs:
command: |
rm -rf build/qemu-coreboot/* build/log/* && make --load 2 \
V=1 \
BOARD=qemu-coreboot || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
BOARD=qemu-coreboot || (dmesg; find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Output qemu-coreboot hashes
Expand All @@ -200,6 +277,7 @@ jobs:
- packages
- crossgcc
- build

workflows:
version: 2
build_and_test:
Expand Down
46 changes: 41 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:

build:
stage: build
retry: 1
retry: 2
cache:
paths:
- packages
Expand Down Expand Up @@ -55,7 +55,6 @@ build:
- cat ./build/x230/hashes.txt
- echo "Archiving x230 logs..."
- tar zcvf ./build/x230/logs.tar.gz ./build/log/*

- echo "Removing old t430 artifacts..."
- rm -rf ./build/t430/*
- rm -rf ./build/log/*
Expand All @@ -65,8 +64,43 @@ build:
- cat ./build/t430/hashes.txt
- echo "Archiving t430 logs..."
- tar zcvf ./build/t430/logs.tar.gz ./build/log/*

- echo "Removing old qemu-coreboot artifacts..."
- echo "Removing old kgpe-d16_workstation artifacts..."
- rm -rf ./build/kgpe-d16_workstation/*
- rm -rf ./build/log/*
- echo "Building BOARD=kgpe-d16_workstation board..."
- make BOARD=kgpe-d16_workstation || (find ./build/log/ -cmin 1|xargs tail; exit 1)
- echo "kgpe-d16_workstation hashes:"
- cat ./build/kgpe-d16_workstation/hashes.txt
- echo "Archiving kgpe-d16_workstation logs..."
- tar zcvf ./build/kgpe-d16_workstation/logs.tar.gz ./build/log/*
- echo "Removing old kgpe-d16_workstation-usb_keyboard artifacts..."
- rm -rf ./build/kgpe-d16_workstation-usb_keyboard/*
- rm -rf ./build/log/*
- echo "Building BOARD=kgpe-d16_workstation-usb_keyboard board..."
- make BOARD=kgpe-d16_workstation || (find ./build/log/ -cmin 1|xargs tail; exit 1)
- echo "kgpe-d16_workstation-usb_keyboard hashes:"
- cat ./build/kgpe-d16_workstation-usb_keyboard/hashes.txt
- echo "Archiving kgpe-d16_workstation-usb_keyboard logs..."
- tar zcvf ./build/kgpe-d16_workstation-usb_keyboard/logs.tar.gz ./build/log/*
- echo "Removing old kgpe-d16_server-whiptail artifacts..."
- rm -rf ./build/kgpe-d16_server-whiptail/*
- rm -rf ./build/log/*
- echo "Building BOARD=kgpe-d16_server-whiptail board..."
- make BOARD=kgpe-d16_server-whiptail || (find ./build/log/ -cmin 1|xargs tail; exit 1)
- echo "kgpe-d16_server-whiptail hashes:"
- cat ./build/kgpe-d16_server-whiptail/hashes.txt
- echo "Archiving kgpe-d16_server-whiptail logs..."
- tar zcvf ./build/kgpe-d16_server-whiptail/logs.tar.gz ./build/log/*
- echo "Removing old kgpe-d16_server artifacts..."
- rm -rf ./build/kgpe-d16_server/*
- rm -rf ./build/log/*
- echo "Building BOARD=kgpe-d16_server board..."
- make BOARD=kgpe-d16_server || (find ./build/log/ -cmin 1|xargs tail; exit 1)
- echo "kgpe-d16_server hashes:"
- cat ./build/kgpe-d16_server/hashes.txt
- echo "Archiving kgpe-d16_server logs..."
- tar zcvf ./build/kgpe-d16_server/logs.tar.gz ./build/log/*
- echo "Removing old qemu-coreboot artifacts..."
- rm -rf ./build/qemu-coreboot/*
- rm -rf ./build/log/*
- echo "Building BOARD=qemu-coreboot board..."
Expand All @@ -79,9 +113,11 @@ build:
- du -shc packages crossgcc build
artifacts:
paths:
- ./build/kgpe-d16_workstation
- ./build/kgpe-d16_workstation-usb_keyboard
- ./build/kgpe-d16_server
- ./build/qemu-coreboot
- ./build/x230-flash
- ./build/t430-flash
- ./build/x230-hotp-verification
- ./build/x230
- ./build/t430
36 changes: 0 additions & 36 deletions boards/kgpe-d16/kgpe-d16.config

This file was deleted.

75 changes: 75 additions & 0 deletions boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Configuration for a kgpe-d16_server with whiptail, permitting usage of gui-init on console without FB graphic
# per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads
#
# Tested: ASMBV4 reprogrammed per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php
#
# Status:
# - ASpeed text output given on VGA
# - All console output rerirected to sttyS0
# - No TPM support while 20-1 TPM 1.2 chips can be ordered. Report status in Heads
#
# - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440
# - Please contribute documentation on heads-wiki
# - Please support https://github.com/osresearch/heads/issues/719
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.8.1
export CONFIG_LINUX_VERSION=4.14.62

CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y
CONFIG_PCIUTILS=y
CONFIG_POPT=y
CONFIG_QRENCODE=y
CONFIG_TPMTOTP=y
CONFIG_DROPBEAR=y

#Whiptail
CONFIG_SLANG=y
CONFIG_NEWT=y
#FBWhiptail
#CONFIG_CAIRO=y
#CONFIG_FBWHIPTAIL=y

CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y

export CONFIG_TPM=n
#BOOT SCRIPT SELECTION
#export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_BOOTSCRIPT=/bin/gui-init
#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery
export CONFIG_BOOT_GUI_MENU_NAME="KGPE-D16 Heads Boot Menu"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"

#CONSOLE SELECTION
#Single output to OpenBMC
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "

#Dual output to local console (tty0) and OpenBmc (ttyS1)
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"

#Single output to tty0
#export CONFIG_BOOT_KERNEL_ADD="nohz=on"
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
export CONFIG_BOOT_STATIC_IP=192.168.2.3


export CONFIG_BOOT_REQ_HASH=n
export CONFIG_BOOT_REQ_ROLLBACK=n
export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
export CONFIG_BOOT_DEV="/dev/sda1"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"

export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
#export CONFIG_BOOT_STATIC_IP=192.168.1.2
Loading