From 48f03072342c49605b8670aa53d3f50731daed9b Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 6 Jan 2022 12:08:13 +0100
Subject: [PATCH] create_builddir: remove 'linux' option

Since unifying the build directories accross architectures, the special
case of the 'linux' platform is no longer needed. Linux can be targeted
from regular CPU-architecture-specific build directories via:

  KERNEL=linux BOARD=linux

Fixes #4366
---
 tool/builddir/build.conf/run_kernel_linux | 11 ---------
 tool/create_builddir                      | 29 ++++++-----------------
 2 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 tool/builddir/build.conf/run_kernel_linux

diff --git a/tool/builddir/build.conf/run_kernel_linux b/tool/builddir/build.conf/run_kernel_linux
deleted file mode 100644
index e9e5bd52cf..0000000000
--- a/tool/builddir/build.conf/run_kernel_linux
+++ /dev/null
@@ -1,11 +0,0 @@
-# kernel to use
-KERNEL ?= linux
-
-
-##
-## Kernel-specific run tool configuration
-##
-
-RUN_OPT = --include boot_dir/linux \
-          --include power_on/linux --include log/linux
-
diff --git a/tool/create_builddir b/tool/create_builddir
index 371db6b9b0..0b2fd37c2d 100755
--- a/tool/create_builddir
+++ b/tool/create_builddir
@@ -10,7 +10,7 @@ MAKEOVERRIDES =
 
 PLATFORM = $(MAKECMDGOALS)
 
-PLATFORMS = arm_v6 arm_v7a arm_v8a riscv x86_32 x86_64 linux
+PLATFORMS = arm_v6 arm_v7a arm_v8a riscv x86_32 x86_64
 
 usage:
 	@echo
@@ -94,7 +94,6 @@ BUILD_CONF(arm_v8a) := run_arm_v8 run_boot_dir repos repos_arm_v8
 BUILD_CONF(riscv)   := run_riscv run_boot_dir repos repos_riscv
 BUILD_CONF(x86_32)  := run_x86_32 $(BUILD_CONF_X86)
 BUILD_CONF(x86_64)  := run_x86_64 $(BUILD_CONF_X86)
-BUILD_CONF(linux)   := run_kernel_linux repos
 
 message: $(BUILD_DIR)/etc/build.conf
 $(BUILD_DIR)/etc/build.conf:
@@ -114,30 +113,16 @@ $(BUILD_DIR)/Makefile:
 $(BUILD_DIR)/etc/build.conf: $(BUILD_DIR)/etc
 $(BUILD_DIR)/etc/specs.conf: $(BUILD_DIR)/etc
 
-#
-# Detect host CPU architecture (needed for creating Linux build directory that
-# matches the host system)
-#
-UNAME_MACHINE := $(shell uname -m)
-
-SPEC_ARCH(i686)   := x86_32
-SPEC_ARCH(x86_64) := x86_64
-SPEC_ARCH(armv6l) := armv_v6
-SPEC_ARCH(armv7l) := armv_v7
-
-HOST_SPEC_ARCH := ${SPEC_ARCH(${UNAME_MACHINE})}
-
 #
 # SPECS definitions
 #
 
-SPECS(arm_v6)          := arm_v6
-SPECS(arm_v7a)         := arm_v7a
-SPECS(arm_v8a)         := arm_v8a
-SPECS(riscv)           := riscv
-SPECS(x86_32)          := x86_32
-SPECS(x86_64)          := x86_64
-SPECS(linux)           := $(HOST_SPEC_ARCH)
+SPECS(arm_v6)  := arm_v6
+SPECS(arm_v7a) := arm_v7a
+SPECS(arm_v8a) := arm_v8a
+SPECS(riscv)   := riscv
+SPECS(x86_32)  := x86_32
+SPECS(x86_64)  := x86_64
 
 ifneq (${SPECS(${PLATFORM})},)
 message: $(BUILD_DIR)/etc/specs.conf