boards: rename external-flash to maximized

linuxboot · Dec 2, 2020 · 23b32b1 · 23b32b1
1 parent 8821894
commit 23b32b1
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 48 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,11 +8,7 @@ jobs:
           name: Install dependencies
           command: |
             apt update
-<<<<<<< HEAD
-            apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract
-=======
             apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract
->>>>>>> 0a21c5f (circleci: add xx20 builds)
       - checkout
 
       - run:
@@ -244,30 +240,19 @@ jobs:
           path: build/x230-nkstorecli
 
       - run:
-<<<<<<< HEAD
-          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)  
+          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
             ./blobs/xx30/download_clean_me.sh
       - run:
           name: x230-maximized
           command: |
             rm -rf build/x230-maximized/* build/log/* && make CPUS=4 V=1 BOARD=x230-maximized || touch /tmp/failed_build
-=======
-          name: Download and neuter xx20 ME (keep generated GBE and extracted IFD in tree)
-          command: |
-            ./blobs/xx20/download_parse_me.sh
-      - run:
-          name: x220-external-flash
-          command: |
-            rm -rf build/x220-external-flash/* build/log/* && make CPUS=4 V=1 BOARD=x220-external-flash || touch /tmp/failed_build
->>>>>>> 0a21c5f (circleci: add xx20 builds)
           no_output_timeout: 3h
       - run:
           name: Output build failing logs
           command: |
             if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi
       - run:
-<<<<<<< HEAD
           name: Output x230-maximized hashes
           command: |
             cat build/x230-maximized/hashes.txt \
@@ -279,40 +264,19 @@ jobs:
           path: build/x230-maximized
 
       - run:
-          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)  
+          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
             ./blobs/xx30/download_clean_me.sh
       - run:
           name: t430-hotp-maximized
           command: |
             rm -rf build/t430-hotp-maximized/* build/log/* && make CPUS=4 V=1 BOARD=t430-hotp-maximized || touch /tmp/failed_build
-=======
-          name: Output x220-external-flash hashes
-          command: |
-            cat build/x220-external-flash/hashes.txt \
-      - run:
-          name: Archiving build logs for x220-external-flash
-          command: |
-            tar zcvf build/x220-external-flash/logs.tar.gz ./build/log/*
-      - store-artifacts:
-          path: build/x220-external-flash
-
-      - run:
-          name: Download and neuter xx20 ME (keep generated GBE and extracted IFD in tree)
-          command: |
-            ./blobs/xx20/download_parse_me.sh
-      - run:
-          name: t420-external-flash
-          command: |
-            rm -rf build/t420-external-flash/* build/log/* && make CPUS=4 V=1 BOARD=t420-external-flash || touch /tmp/failed_build
->>>>>>> 0a21c5f (circleci: add xx20 builds)
           no_output_timeout: 3h
       - run:
           name: Output build failing logs
           command: |
             if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi
       - run:
-<<<<<<< HEAD
           name: Output t430-hotp-maximized hashes
           command: |
             cat build/t430-hotp-maximized/hashes.txt \
@@ -324,7 +288,7 @@ jobs:
           path: build/t430-hotp-maximized
 
       - run:
-          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)  
+          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
             ./blobs/xx30/download_clean_me.sh
       - run:
@@ -348,7 +312,7 @@ jobs:
           path: build/x230-maximized
 
       - run:
-          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)  
+          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
             ./blobs/xx30/download_clean_me.sh
       - run:
@@ -373,7 +337,7 @@ jobs:
 
 
       - run:
-          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)  
+          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
             ./blobs/xx30/download_clean_me.sh
       - run:
@@ -395,17 +359,54 @@ jobs:
             tar zcvf build/t430-maximized/logs.tar.gz ./build/log/*
       - store-artifacts:
           path: build/t430-maximized
-=======
-          name: Output t420-external-flash hashes
+
+      - run:
+          name: Download and neuter xx20 ME (keep generated GBE and extracted IFD in tree)
+          command: |
+            ./blobs/xx20/download_parse_me.sh
+      - run:
+          name: x220-maximized
+          command: |
+            rm -rf build/x220-maximized/* build/log/* && make CPUS=4 V=1 BOARD=x220-maximized || touch /tmp/failed_build
+          no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi \
+      - run:
+          name: Output x220-maximized hashes
+          command: |
+            cat build/x220-maximized/hashes.txt \
+      - run:
+          name: Archiving build logs for x220-maximized
+          command: |
+            tar zcvf build/x220-maximized/logs.tar.gz ./build/log/*
+      - store-artifacts:
+          path: build/x220-maximized
+
+      - run:
+          name: Download and neuter xx20 ME (keep generated GBE and extracted IFD in tree)
+          command: |
+            ./blobs/xx20/download_parse_me.sh
+      - run:
+          name: t420-maximized
+          command: |
+            rm -rf build/t420-maximized/* build/log/* && make CPUS=4 V=1 BOARD=t420-maximized || touch /tmp/failed_build
+          no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi
+      - run:
+          name: Output t420-maximized hashes
           command: |
-            cat build/t420-external-flash/hashes.txt \
+            cat build/t420-maximized/hashes.txt \
       - run:
-          name: Archiving build logs for t420-external-flash
+          name: Archiving build logs for t420-maximized
           command: |
-            tar zcvf build/t420-external-flash/logs.tar.gz ./build/log/*
+            tar zcvf build/t420-maximized/logs.tar.gz ./build/log/*
       - store-artifacts:
-          path: build/t420-external-flash
->>>>>>> 0a21c5f (circleci: add xx20 builds)
+          path: build/t420-maximized
 
       - run:
           name: qemu-coreboot

diff --git a/boards/t420-external-flash/t420.config → boards/t420-maximized/t420-maximized.config b/boards/t420-external-flash/t420.config → boards/t420-maximized/t420-maximized.config
diff --git a/boards/x220-external-flash/x220.config → boards/x220-maximized/x220-maximized.config b/boards/x220-external-flash/x220.config → boards/x220-maximized/x220-maximized.config