Merge pull request #1339 from tlaurion/single_talos_2_board

Talos II - Have single board config
linuxboot · Mar 20, 2023 · 2995376 · 2995376
2 parents 96440b9 + 445ca05
commit 2995376
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 897 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -227,9 +227,9 @@ workflows:
 
       # Coreboot for Talos (PPC)
       - build_and_persist:
-          name: talos-2_server
+          name: talos-2
           arch: ppc64
-          target: talos-2_server
+          target: talos-2
           subcommand: ""
           requires:
             - prep_env
@@ -238,7 +238,7 @@ workflows:
       - save_cache:
           requires:
             - librem_14
-            - talos-2_server
+            - talos-2
 
 #
 #
@@ -547,14 +547,6 @@ workflows:
 #          requires:
 #            - librem_14
 
-      - build:
-          name: talos-2_workstation
-          arch: ppc64
-          target: talos-2_workstation
-          subcommand: ""
-          requires:
-            - talos-2_server
-
 ########################
 ########################
 ###    OLD STUFF     ###

diff --git a/boards/talos-2_server/talos-2_server.config → boards/talos-2/talos-2.config b/boards/talos-2_server/talos-2_server.config → boards/talos-2/talos-2.config
@@ -9,7 +9,7 @@ export CONFIG_LINUX_VERSION=5.5-openpower
 CONFIG_COREBOOT_CONFIG=config/coreboot-talos-2.config
 CONFIG_COREBOOT_ROM=coreboot.rom.signed.ecc
 CONFIG_COREBOOT_BOOTBLOCK=bootblock.signed.ecc
-CONFIG_LINUX_CONFIG=config/linux-talos-2_server.config
+CONFIG_LINUX_CONFIG=config/linux-talos-2.config
 
 CONFIG_CRYPTSETUP2=y
 CONFIG_LVM2=y
@@ -46,7 +46,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_REMOVE="quiet"
 export CONFIG_BOOT_KERNEL_ADD="console=tty0 console=hvc0 rootdelay=3 rootwait panic=10"
 export CONFIG_BOOT_DEV="/dev/sda1"
-export CONFIG_BOARD_NAME="Talos 2 Server"
+export CONFIG_BOARD_NAME="Talos 2"
 export CONFIG_FLASHROM_OPTIONS="--noverify-all -p linux_mtd"
 
 OUTPUT_PREFIX	:= heads-$(BOARD)-$(HEADS_GIT_VERSION)

diff --git a/boards/talos-2_workstation/talos-2_workstation.config b/boards/talos-2_workstation/talos-2_workstation.config
diff --git a/config/linux-talos-2_server.config → config/linux-talos-2.config b/config/linux-talos-2_server.config → config/linux-talos-2.config
@@ -1,4 +1,4 @@
-CONFIG_INITRAMFS_SOURCE="../../talos-2_server/initrd.cpio"
+CONFIG_INITRAMFS_SOURCE="../../talos-2/initrd.cpio"
 CONFIG_PPC64=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_EXPERT=y