International keyboad keymaps support through Options-> Change configuration Settings -> Change Keyboard Keymap

Makefile

@@ -109,6 +109,12 @@ CONFIG_HEADS	?= y
 # Unless otherwise specified, we are building bash to have non-interactive shell for scripts (arrays and bashisms)
 CONFIG_BASH	?= y
 
+# Unless otherwise specified, we build kbd to have setfont, loadkeys and keymaps
+CONFIG_KBD	?= y
+#loadkeys permits to load .map source files directly
+CONFIG_KBD_LOADKEYS ?= y
+
+
 # USB keyboards can be ignored, optionally supported, or required.
 #
 # To optionally support USB keyboards, export CONFIG_SUPPORT_USB_KEYBOARD=y.  To
@@ -175,9 +181,9 @@ endif
 # Create a temporary directory for the initrd
 initrd_dir	:= $(BOARD)
 initrd_tmp_dir	:= $(shell mktemp -d)
-initrd_data_dir	:= $(initrd_tmp_dir)/etc/terminfo/l
 initrd_lib_dir	:= $(initrd_tmp_dir)/lib
 initrd_bin_dir	:= $(initrd_tmp_dir)/bin
+initrd_data_dir	:= $(initrd_tmp_dir)/data
 modules-y += initrd
 
 $(shell mkdir -p "$(initrd_lib_dir)" "$(initrd_bin_dir)" "$(initrd_data_dir)")
@@ -291,11 +297,23 @@ define map =
 $(foreach _,$2,$(eval $(call $1,$_)))
 endef
 
+# Data files can be specified in modules/* to be added into data.cpio.
+# Each module should set <modulename>_data += src|dst
+# Example (in modules/ncurses):
+#   ncurses_data += $(INSTALL)/usr/lib/terminfo/l/linux|etc/terminfo/l/linux
+#
+# The main Makefile will collect all data files from enabled modules:
+#   $(call data,$(modules-y))
+
 # Bring in all of the module definitions;
 # these are the external pieces that will be downloaded and built
 # as part of creating the Heads firmware image.
 include modules/*
 
+# Collect all data files from enabled modules
+data_files :=
+$(foreach m,$(modules-y),$(eval data_files += $($(m)_data)))
+
 define bins =
 $(foreach m,$1,$(call prefix,$(build)/$($m_dir)/,$($m_output)))
 endef
@@ -309,7 +327,6 @@ endef
 define outputs =
 $(foreach m,$1,\
 	$(call bins,$m)\
-	$(call data,$m)\
 	$(call libs,$m)\
 )
 endef
@@ -567,7 +584,8 @@ define define_module =
 	stat $(call outputs,$1) >/dev/null 2>/dev/null || echo FORCE \
   ))
 
-  $(build)/$($1_dir)/.build: $($1.force) \
+  #TODO: something better then removing .build: $($1.force) so that newt/ncurses are not rebuilt inconditionally?
+  $(build)/$($1_dir)/.build: \
 		$(foreach d,$($1_depends),$(build)/$($d_dir)/.build) \
 		$(dir $($1_config_file_path)).configured \
 
@@ -618,7 +636,7 @@ endef
 
 #
 # Files that should be copied into the initrd
-# THis should probably be done in a more scalable manner
+# This should probably be done in a more scalable manner
 #
 define initrd_bin_add =
 $(initrd_bin_dir)/$(notdir $1): $1
@@ -628,11 +646,20 @@ initrd_bins += $(initrd_bin_dir)/$(notdir $1)
 endef
 
 define initrd_data_add =
-$(initrd_data_dir)/$(notdir $1): $1
-	$(call do,INSTALL-DATA,$$(<:$(pwd)/%=%),cp -a --remove-destination "$$<" "$$@")
-initrd_data += $(initrd_data_dir)/$(notdir $1)
+$(initrd_data_dir)/$(2): $(1)
+	$(call do,INSTALL-DATA,$(1:$(pwd)/%=%) => $(2),\
+		mkdir -p "$(dir $(initrd_data_dir)/$(2))"; \
+		cp -a --remove-destination "$(1)" "$(initrd_data_dir)/$(2)"; \
+	)
 endef
 
+# Register all data_files for installation
+$(foreach entry,$(data_files),\
+  $(eval src := $(word 1,$(subst |, ,$(entry)))) \
+  $(eval dst := $(word 2,$(subst |, ,$(entry)))) \
+  $(eval $(call initrd_data_add,$(src),$(dst))) \
+)
+
 define initrd_lib_add =
 $(initrd_lib_dir)/$(notdir $1): $1
 	$(call do,INSTALL-LIB,$(1:$(pwd)/%=%),\
@@ -735,7 +762,21 @@ initrd-y += $(build)/$(initrd_dir)/tools.cpio
 initrd-y += $(build)/$(initrd_dir)/board.cpio
 initrd-$(CONFIG_HEADS) += $(build)/$(initrd_dir)/heads.cpio
 
-#$(build)/$(initrd_dir)/.build: $(build)/$(initrd_dir)/initrd.cpio.xz
+# Only build data.cpio if there are data files
+ifneq ($(strip $(data_files)),)
+
+# Build data.cpio for data files only
+$(build)/$(initrd_dir)/data.cpio: $(data_initrd_files) FORCE
+	@mkdir -p "$(initrd_data_dir)"
+	$(call do-cpio,$@,$(initrd_data_dir))
+
+# Ensure data.cpio is included in initrd.cpio.xz
+initrd-y += $(build)/$(initrd_dir)/data.cpio
+
+# Ensure data.cpio is always built as part of the main build
+all: $(build)/$(initrd_dir)/data.cpio
+
+endif
 
 $(build)/$(initrd_dir)/initrd.cpio.xz: $(initrd-y)
 	$(call do,CPIO-XZ  ,$@,\
@@ -765,11 +806,10 @@ all: $(bundle-y)
 # The board.cpio is built from the board's initrd/ directory.  It contains
 # board-specific support scripts.
 
+$(build)/$(initrd_dir)/board.cpio: FORCE
 ifeq ($(wildcard $(pwd)/boards/$(BOARD)/initrd),)
-$(build)/$(initrd_dir)/board.cpio:
 	cpio -H newc -o </dev/null >"$@"
 else
-$(build)/$(initrd_dir)/board.cpio: FORCE
 	$(call do-cpio,$@,$(pwd)/boards/$(BOARD)/initrd)
 endif
 
@@ -784,14 +824,12 @@ $(build)/$(initrd_dir)/heads.cpio: FORCE
 #
 # The tools initrd is made from all of the things that we've
 # created during the submodule build.
-#
 $(build)/$(initrd_dir)/tools.cpio: \
 	$(initrd_bins) \
-	$(initrd_data) \
 	$(initrd_libs) \
 	$(initrd_tmp_dir)/etc/config \
+	FORCE
 
-	$(info Used **BINS**: $(initrd_bins))
 	$(call do-cpio,$@,$(initrd_tmp_dir))
 	@$(RM) -rf "$(initrd_tmp_dir)"
 
@@ -815,6 +853,25 @@ $(initrd_tmp_dir)/etc/config: FORCE
 		>> $@ ; \
 	)
 
+# List of all installed DATA files (for cpio input and hash logging)
+data_initrd_files := $(foreach entry,$(data_files),$(initrd_data_dir)/$(word 2,$(subst |, ,$(entry))))
+
+# Only build data.cpio if there are data files
+ifneq ($(strip $(data_files)),)
+
+# Build data.cpio for data files only
+$(build)/$(initrd_dir)/data.cpio: $(data_initrd_files) FORCE
+	@mkdir -p "$(initrd_data_dir)"
+	$(call do-cpio,$@,$(initrd_data_dir))
+
+# Ensure data.cpio is included in initrd.cpio.xz
+initrd-y += $(build)/$(initrd_dir)/data.cpio
+
+# Ensure data.cpio is always built as part of the main build
+all: $(build)/$(initrd_dir)/data.cpio
+
+endif
+
 # Ensure that the initrd depends on all of the modules that produce
 # binaries for it
 $(build)/$(initrd_dir)/tools.cpio: $(foreach d,$(bin_modules-y),$(build)/$($d_dir)/.build)

boards/UNTESTED_talos-2/UNTESTED_talos-2.config

@@ -6,6 +6,9 @@ export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=talos_2
 export CONFIG_LINUX_VERSION=6.6.16-openpower
 
+#EXPLICITELY DEACTIVATE KBD + loadkeys + keymap support since doesn't build for now and nobody known to use talos-2
+CONFIG_KBD=n
+
 CONFIG_COREBOOT_CONFIG=config/coreboot-talos-2.config
 CONFIG_COREBOOT_ROM=coreboot.rom.signed.ecc
 CONFIG_COREBOOT_BOOTBLOCK=bootblock.signed.ecc

boards/qemu-coreboot-fbwhiptail-tpm1-hotp-prod/qemu-coreboot-fbwhiptail-tpm1-hotp-prod.config

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-fbwhiptail-tpm1-hotp-prod_quiet/qemu-coreboot-fbwhiptail-tpm1-hotp-prod_quiet.config

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

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

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

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

@@ -92,4 +92,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

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

@@ -92,4 +92,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-fbwhiptail-tpm2-hotp-prod/qemu-coreboot-fbwhiptail-tpm2-hotp-prod.config

@@ -93,4 +93,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-fbwhiptail-tpm2-hotp-prod_quiet/qemu-coreboot-fbwhiptail-tpm2-hotp-prod_quiet.config

@@ -93,4 +93,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

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

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

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

@@ -92,4 +92,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

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

@@ -93,4 +93,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm1-hotp-prod/qemu-coreboot-whiptail-tpm1-hotp-prod.config

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm1-prod/qemu-coreboot-whiptail-tpm1-prod.config

@@ -92,4 +92,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config

@@ -92,4 +92,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm2-hotp-prod/qemu-coreboot-whiptail-tpm2-hotp-prod.config

@@ -93,4 +93,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config

@@ -94,4 +94,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2-hotp"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm2-prod/qemu-coreboot-whiptail-tpm2-prod.config

@@ -92,4 +92,6 @@ export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config

@@ -94,4 +94,6 @@ export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2"
 #export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_AUTO_BOOT_TIMEOUT=5
 
+export CONFIG_KEYBOARD_KEYMAP="/usr/lib/kbd/keymaps/i386/qwerty/us.map"
+
 BOARD_TARGETS := qemu

boards/t420-hotp-maximized/t420-hotp-maximized.config

@@ -15,6 +15,9 @@ export CONFIG_LINUX_VERSION=6.1.8
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
 
+#EXPLICITELY DEACTIVATE KBD + loadkeys + keymap support since sandy bridge based laptops with 8Mb SPI is not big enough
+CONFIG_KBD=n
+
 #Additional hardware support
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y

boards/t420-maximized/t420-maximized.config

@@ -14,6 +14,9 @@ export CONFIG_LINUX_VERSION=6.1.8
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
 
+#EXPLICITELY DEACTIVATE KBD + loadkeys + keymap support since sandy bridge based laptops with 8Mb SPI is not big enough
+CONFIG_KBD=n
+
 #Additional hardware support
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y

boards/x220-hotp-maximized/x220-hotp-maximized.config

@@ -15,6 +15,9 @@ export CONFIG_LINUX_VERSION=6.1.8
 CONFIG_COREBOOT_CONFIG=config/coreboot-x220-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
 
+#EXPLICITELY DEACTIVATE KBD + loadkeys + keymap support since sandy bridge based laptops with 8Mb SPI is not big enough
+CONFIG_KBD=n
+
 #Additional hardware support
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y

boards/x220-maximized/x220-maximized.config

@@ -15,6 +15,9 @@ export CONFIG_LINUX_VERSION=6.1.8
 CONFIG_COREBOOT_CONFIG=config/coreboot-x220-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
 
+#EXPLICITELY DEACTIVATE KBD + loadkeys + keymap support since sandy bridge based laptops with 8Mb SPI is not big enough
+CONFIG_KBD=n
+
 #Additional hardware support
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y