Fix x230-libremkey build against musl-cross-make and CircleCI config

linuxboot · Mar 7, 2020 · b4c9f94 · b4c9f94
1 parent 3afc312
commit b4c9f94
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -58,12 +58,12 @@ jobs:
                 CROSS=/cross/bin/x86_64-linux-musl- \
                 --load 2 \
                 V=1 \
-                BOARD=x230 \
+                BOARD=x230-libremkey \
 
       - store-artifacts:
-          path: build/x230/coreboot.rom
+          path: build/x230-libremkey/coreboot.rom
       - store-artifacts:
-          path: build/x230/hashes.txt
+          path: build/x230-libremkey/hashes.txt
 
 
 workflows:

diff --git a/boards/x230-libremkey/x230-libremkey.config b/boards/x230-libremkey/x230-libremkey.config
@@ -37,7 +37,6 @@ export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOOT_GUI_MENU_NAME="Thinkpad X230 Heads Boot Menu"
-export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 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"
 

diff --git a/config/coreboot-x230-libremkey.config b/config/coreboot-x230-libremkey.config
@@ -1,4 +1,5 @@
 CONFIG_LOCALVERSION="heads"
+CONFIG_ANY_TOOLCHAIN=y
 # CONFIG_INCLUDE_CONFIG_FILE is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 CONFIG_USE_BLOBS=y