Skip to content

Commit

Permalink
kgpe-d16_server-whiptail: Add board and dependencies to have gui-init…
Browse files Browse the repository at this point in the history
… in whiptail (console mode, not FbWhiptail based
  • Loading branch information
tlaurion committed Aug 1, 2020
1 parent c001b5f commit fb9c76c
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 0 deletions.
18 changes: 18 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,24 @@ jobs:
- 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 \
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: qemu-coreboot
command: |
Expand Down
9 changes: 9 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,15 @@ build:
- 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/*
Expand Down
72 changes: 72 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,72 @@
# 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
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
16 changes: 16 additions & 0 deletions config/coreboot-kgpe-d16_server-whiptail.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CONFIG_LOCALVERSION="heads"
CONFIG_ANY_TOOLCHAIN=y
CONFIG_USE_OPTION_TABLE=y
# CONFIG_COLLECT_TIMESTAMPS is not set
CONFIG_VENDOR_ASUS=y
CONFIG_UART_FOR_CONSOLE=1
CONFIG_BOARD_ASUS_KGPE_D16=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server-whiptail/bzImage"
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
CONFIG_LINUX_INITRD="../../build/kgpe-d16_server-whiptail/initrd.cpio.xz"

0 comments on commit fb9c76c

Please sign in to comment.