Support ppc64 arch

.circleci/config.yml

@@ -3,6 +3,8 @@ version: 2.1
 commands:
   build_board:
     parameters:
+      arch:
+        type: string
       target:
         type: string
       subcommand:
@@ -17,22 +19,22 @@ commands:
       - run:
           name: Make Board
           command: |
-            rm -rf build/<<parameters.target>>/* build/log/* && make V=1 BOARD=<<parameters.target>> <<parameters.subcommand>> || touch ./tmpDir/failed_build
+            rm -rf build/<<parameters.arch>>/<<parameters.target>>/* build/<<parameters.arch>>/log/* && make V=1 BOARD=<<parameters.target>> <<parameters.subcommand>> || touch ./tmpDir/failed_build
           no_output_timeout: 3h
       - run:
           name: Output hashes
           command: |
-            cat build/<<parameters.target>>/hashes.txt || echo "No hashes for this build step..."\
+            cat build/<<parameters.arch>>/<<parameters.target>>/hashes.txt || echo "No hashes for this build step..."\
       - run:
           name: Archiving build logs.
           command: |
-             tar zcvf build/<<parameters.target>>/logs.tar.gz $(find build/ -name "*.log")
+             tar zcvf build/<<parameters.arch>>/<<parameters.target>>/logs.tar.gz $(find build/ -name "*.log")
       - run:
           name: Output build failing logs
           command: |
-            if [[ -f ./tmpDir/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 "Step hasn't failed. Continuing with next step..."; fi \
+            if [[ -f ./tmpDir/failed_build ]]; then find ./build/<<parameters.arch>>/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Step hasn't failed. Continuing with next step..."; fi \
       - store_artifacts:
-          path: build/<<parameters.target>>
+          path: build/<<parameters.arch>>/<<parameters.target>>
 
 jobs:
   prep_env:
@@ -115,6 +117,9 @@ jobs:
       - image: debian:11
     resource_class: large
     parameters:
+      arch:
+        type: string
+        default: x86
       target:
         type: string
       subcommand:
@@ -123,6 +128,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - build_board:
+          arch: <<parameters.arch>>
           target: <<parameters.target>> 
           subcommand: <<parameters.subcommand>>
       - persist_to_workspace:
@@ -135,6 +141,9 @@ jobs:
       - image: debian:11
     resource_class: large
     parameters:
+      arch:
+        type: string
+        default: x86
       target:
         type: string
       subcommand:
@@ -143,6 +152,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - build_board:
+          arch: <<parameters.arch>>
           target: <<parameters.target>> 
           subcommand: <<parameters.subcommand>>
 
@@ -159,20 +169,20 @@ jobs:
           key: heads-musl-cross-{{ checksum "./tmpDir/musl-cross.sha256sums" }}{{ .Environment.CACHE_VERSION }}
           paths:
             - crossgcc
-            - build/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
+            - build/x86/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
             - packages
       - save_cache:
           #Generate cache for the same coreboot mnd musl-cross-make modules definition if hash is not previously existing
           #CircleCI removed their wildcard support, so we have to list precise versions to cache in directory names
           key: heads-coreboot-musl-cross-{{ checksum "./tmpDir/coreboot_musl-cross.sha256sums" }}{{ .Environment.CACHE_VERSION }}
           paths:
             - crossgcc
-            - build/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
+            - build/x86/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
             - packages
-            - build/coreboot-4.11
-            - build/coreboot-4.13
-            - build/coreboot-4.14
-            - build/coreboot-4.15
+            - build/x86/coreboot-4.11
+            - build/x86/coreboot-4.13
+            - build/x86/coreboot-4.14
+            - build/x86/coreboot-4.15
       - save_cache:
           #Generate cache for the exact same modules definitions if hash is not previously existing
           key: heads-modules-and-patches-{{ checksum "./tmpDir/all_modules_and_patches.sha256sums" }}{{ .Environment.CACHE_VERSION }}

Makefile

@@ -18,27 +18,20 @@ LB_OUTPUT_FILE		:= linuxboot-$(BOARD)-$(HEADS_GIT_VERSION).rom
 all:
 -include .config
 
-ifneq "$(TOOLCHAIN)" ""
-$(info Using $(TOOLCHAIN) for cross compiler and packages)
-packages	?= $(TOOLCHAIN)/packages
-CROSS		:= $(TOOLCHAIN)/crossgcc/x86_64-linux-musl/bin/x86_64-linux-musl-
-endif
-
 modules-y 	:=
 pwd 		:= $(shell pwd)
-packages 	?= $(pwd)/packages
-build		:= $(pwd)/build
 config		:= $(pwd)/config
-INSTALL		:= $(pwd)/install
-log_dir		:= $(build)/log
+# These are dynamic, must not expand right here
+build		= $(pwd)/build/$(CONFIG_TARGET_ARCH)
+packages 	= $(pwd)/packages/$(CONFIG_TARGET_ARCH)
+INSTALL		= $(pwd)/install/$(CONFIG_TARGET_ARCH)
+log_dir		= $(build)/log
+board_build	= $(build)/$(BOARD)
 
 # Controls how many parallel jobs are invoked in subshells
 CPUS		?= $(shell nproc)
 MAKE_JOBS	?= -j$(CPUS) --max-load 16
 
-# Create the log directory if it doesn't already exist
-BUILD_LOG := $(shell mkdir -p "$(log_dir)" )
-
 WGET ?= wget
 
 # Timestamps should be in ISO format
@@ -51,23 +44,39 @@ ifneq "y" "$(shell [ -r '$(CONFIG)' ] && echo y)"
 $(error $(CONFIG): board configuration does not exist)
 endif
 
+# By default, we are building for x86, up to a board to change this variable
+CONFIG_TARGET_ARCH := x86
+
 include $(CONFIG)
 
 # Unless otherwise specified, we are building for heads
 CONFIG_HEADS	?= y
 
+# Determine arch part for a host triplet
+ifeq "$(CONFIG_TARGET_ARCH)" "x86"
+MUSL_ARCH := x86_64
+else ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
+MUSL_ARCH := powerpc64le
+else
+$(error "Unexpected value of $$(CONFIG_TARGET_ARCH): $(CONFIG_TARGET_ARCH)")
+endif
+
+# Create directories if they don't already exist
+BUILD_LOG	:= $(shell mkdir -p "$(log_dir)")
+PACKAGES	:= $(shell mkdir -p "$(packages)")
+
 # record the build date / git hashes and other files here
-HASHES		:= $(build)/$(BOARD)/hashes.txt
+HASHES		:= $(board_build)/hashes.txt
 
 # Create the board output directory if it doesn't already exist
 BOARD_LOG	:= $(shell \
-	mkdir -p "$(build)/$(BOARD)" ; \
+	mkdir -p "$(board_build)" ; \
 	echo "$(DATE) $(GIT_HASH) $(GIT_STATUS)" > "$(HASHES)" ; \
 )
 
 ifeq "y" "$(CONFIG_LINUX_BUNDLED)"
 # Create empty initrd for initial kernel "without" initrd.
-$(shell cpio -o < /dev/null > $(build)/$(BOARD)/initrd.cpio)
+$(shell cpio -o < /dev/null > $(board_build)/initrd.cpio)
 endif
 
 # If V is set in the environment, do not redirect the tee
@@ -134,13 +143,13 @@ CROSS_TOOLS := \
 
 ifeq ($(CONFIG_COREBOOT), y)
 
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 ifneq ($(CONFIG_COREBOOT_BOOTBLOCK),)
-all: $(build)/$(BOARD)/$(CB_BOOTBLOCK_FILE)
+all: $(board_build)/$(CB_BOOTBLOCK_FILE)
 endif
 
 else ifeq ($(CONFIG_LINUXBOOT), y)
-all: $(build)/$(BOARD)/$(LB_OUTPUT_FILE)
+all: $(board_build)/$(LB_OUTPUT_FILE)
 else
 $(error "$(BOARD): neither CONFIG_COREBOOT nor CONFIG_LINUXBOOT is set?")
 endif
@@ -153,6 +162,13 @@ all:
 .SUFFIXES:
 FORCE:
 
+# Copies config while replacing predefined placeholders with actual values
+define install_config =
+	sed -e 's!@BOARD_BUILD_DIR@!$(board_build)!g' \
+	    -e 's!@BLOB_DIR@!$(pwd)/blobs!g' \
+	    "$1" > "$2"
+endef
+
 # Make helpers to operate on lists of things
 # Prefix is "smart" and doesn't add the prefix for absolute file paths
 define prefix =
@@ -522,7 +538,7 @@ $(build)/$(initrd_dir)/initrd.cpio.xz: $(initrd-y)
 #
 # At the moment PowerPC can only load initrd bundled with the kernel.
 #
-bundle-$(CONFIG_LINUX_BUNDLED)	+= $(build)/$(BOARD)/$(LINUX_IMAGE_FILE).bundled
+bundle-$(CONFIG_LINUX_BUNDLED)	+= $(board_build)/$(LINUX_IMAGE_FILE).bundled
 all: $(bundle-y)
 
 #
@@ -586,13 +602,13 @@ modules.clean:
 # since we can't reflash the firmware in qemu to update the keychain.  Instead,
 # inject the public key ahead of time.  Specify the location of the key with
 # PUBKEY_ASC.
-inject_gpg: $(build)/$(BOARD)/$(CB_OUTPUT_FILE_GPG_INJ)
+inject_gpg: $(board_build)/$(CB_OUTPUT_FILE_GPG_INJ)
 
-$(build)/$(BOARD)/$(CB_OUTPUT_BASENAME)-gpg-injected.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
-	cp "$(build)/$(BOARD)/$(CB_OUTPUT_FILE)" \
-		"$(build)/$(BOARD)/$(CB_OUTPUT_FILE_GPG_INJ)"
+$(board_build)/$(CB_OUTPUT_BASENAME)-gpg-injected.rom: $(board_build)/$(CB_OUTPUT_FILE)
+	cp "$(board_build)/$(CB_OUTPUT_FILE)" \
+		"$(board_build)/$(CB_OUTPUT_FILE_GPG_INJ)"
 	./bin/inject_gpg_key.sh --cbfstool "$(build)/$(coreboot_dir)/cbfstool" \
-		"$(build)/$(BOARD)/$(CB_OUTPUT_FILE_GPG_INJ)" "$(PUBKEY_ASC)"
+		"$(board_build)/$(CB_OUTPUT_FILE_GPG_INJ)" "$(PUBKEY_ASC)"
 
 real.clean:
 	for dir in \

boards/leopard/leopard.config

@@ -43,5 +43,5 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_DEV="/dev/sda1"
 
-$(build)/$(BOARD)/linuxboot.rom: linuxboot.intermediate
+$(board_build)/linuxboot.rom: linuxboot.intermediate
 

boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config

@@ -58,7 +58,7 @@ export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail"
 run:
 	qemu-system-x86_64 \
 		--machine q35 \
-		--bios $(build)/$(BOARD)/$(CB_OUTPUT_FILE) \
+		--bios $(board_build)/$(CB_OUTPUT_FILE) \
 		-object rng-random,filename=/dev/urandom,id=rng0 \
 		-device virtio-rng-pci,rng=rng0 \
 		-netdev user,id=u1 -device e1000,netdev=u1 \

boards/qemu-coreboot/qemu-coreboot.config

@@ -60,7 +60,7 @@ run:
 	qemu-system-x86_64 \
 		--machine q35 \
 		--serial /dev/tty \
-		--bios $(build)/$(BOARD)/$(CB_OUTPUT_FILE) \
+		--bios $(board_build)/$(CB_OUTPUT_FILE) \
 		-object rng-random,filename=/dev/urandom,id=rng0 \
 		-device virtio-rng-pci,rng=rng0 \
 		-netdev user,id=u1 -device e1000,netdev=u1 \

boards/qemu-linuxboot/qemu-linuxboot.config

@@ -52,6 +52,6 @@ run:
 		-global driver=cfi.pflash01,property=secure,value=on \
 		-redir tcp:5555::22 \
 		--serial $(or $(SERIAL),/dev/tty) \
-		-drive if=pflash,format=raw,unit=0,file=$(build)/$(BOARD)/linuxboot.rom
+		-drive if=pflash,format=raw,unit=0,file=$(board_build)/linuxboot.rom
 	stty sane
 

boards/t430-flash/t430-flash.config

@@ -33,7 +33,7 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
 # per CONFIG_BOOTSCRIPT script above.
 #
 # Below, we just move produced ROM with a name appended with -top.rom for clarity.
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,MV 4MB top ROM,$@, mv $< $@)
 	@sha256sum $@

boards/t430-hotp-maximized/t430-hotp-maximized.config

@@ -78,15 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"

boards/t430-maximized/t430-maximized.config

@@ -78,15 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"

boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config

@@ -79,15 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"

boards/t530-dgpu-maximized/t530-dgpu-maximized.config

@@ -79,15 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"

boards/t530-hotp-maximized/t530-hotp-maximized.config

@@ -79,15 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
 
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"