kgpe-d16 : expressively export CONFIG_TPM=n

linuxboot · Jun 7, 2020 · f22b26a · f22b26a
1 parent b2d4963
commit f22b26a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -64,6 +64,14 @@ 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/*
+    - echo "Building BOARD=t430 board..."
+    - make BOARD=t430 || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "t430 hashes:"
+    - cat ./build/t430/hashes.txt
+    - echo "Archiving t430 logs..."
+    - tar zcvf ./build/t430/logs.tar.gz ./build/log/*
     - echo "Removing old kgpe-d16_workstation artifacts..."
     - rm -rf ./build/kgpe-d16_workstation/*
     - rm -rf ./build/log/*
@@ -82,6 +90,15 @@ build:
     - 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..."
+    - make BOARD=qemu-coreboot || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "qemu-coreboot hashes:"
+    - cat ./build/qemu-coreboot/hashes.txt
+    - echo "Archiving qemu-coreboot logs..."
+    - tar zcvf ./build/qemu-coreboot/logs.tar.gz ./build/log/*
 
   artifacts:
     paths:

diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config
@@ -32,7 +32,7 @@ CONFIG_DROPBEAR=y
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-#export CONFIG_TPM=y
+export CONFIG_TPM=n
 #BOOT SCRIPT SELECTION
 export CONFIG_BOOTSCRIPT=/bin/generic-init
 #export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery

diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
@@ -27,7 +27,7 @@ CONFIG_FBWHIPTAIL=y
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-#export CONFIG_TPM=y
+export CONFIG_TPM=n
 #BOOT SCRIPT SELECTION
 #export CONFIG_BOOTSCRIPT=/bin/generic-init
 export CONFIG_BOOTSCRIPT=/bin/gui-init