14 files changed, 6 insertions, 37 deletions
diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg
index efc10aa4..17576b5f 100644
--- a/config/grub/config/grub.cfg
+++ b/config/grub/config/grub.cfg
@@ -38,10 +38,6 @@ fi
 
 if [ -f (cbfsdisk)/keymap.gkb ]; then
 	keymap (cbfsdisk)/keymap.gkb
-elif [ -f (cbfsdisk)/keymap.cfg ]; then
-	source (cbfsdisk)/keymap.cfg
-else
-	keymap usqwerty
 fi
 
 function try_user_config {
diff --git a/config/grub/keymap/colemak.gkb b/config/grub/keymap/colemak.gkb
index 6756bd73..d357816b 100644
--- a/config/grub/keymap/colemak.gkb
+++ b/config/grub/keymap/colemak.gkb
diff --git a/config/grub/keymap/deqwertz.gkb b/config/grub/keymap/deqwertz.gkb
index a0c8e5ae..4928d026 100644
--- a/config/grub/keymap/deqwertz.gkb
+++ b/config/grub/keymap/deqwertz.gkb
diff --git a/config/grub/keymap/esqwerty.gkb b/config/grub/keymap/esqwerty.gkb
index 18bb537f..6ce76330 100644
--- a/config/grub/keymap/esqwerty.gkb
+++ b/config/grub/keymap/esqwerty.gkb
diff --git a/config/grub/keymap/frazerty.gkb b/config/grub/keymap/frazerty.gkb
index c048cec5..f8455154 100644
--- a/config/grub/keymap/frazerty.gkb
+++ b/config/grub/keymap/frazerty.gkb
diff --git a/config/grub/keymap/frdvbepo.gkb b/config/grub/keymap/frdvbepo.gkb
index c90b37cf..20702607 100644
--- a/config/grub/keymap/frdvbepo.gkb
+++ b/config/grub/keymap/frdvbepo.gkb
diff --git a/config/grub/keymap/itqwerty.gkb b/config/grub/keymap/itqwerty.gkb
index f247cd17..db10a54c 100644
--- a/config/grub/keymap/itqwerty.gkb
+++ b/config/grub/keymap/itqwerty.gkb
diff --git a/config/grub/keymap/svenska.gkb b/config/grub/keymap/svenska.gkb
index ec627db2..75ca762d 100644
--- a/config/grub/keymap/svenska.gkb
+++ b/config/grub/keymap/svenska.gkb
diff --git a/config/grub/keymap/trqwerty.gkb b/config/grub/keymap/trqwerty.gkb
index 090454e9..452100d5 100644
--- a/config/grub/keymap/trqwerty.gkb
+++ b/config/grub/keymap/trqwerty.gkb
diff --git a/config/grub/keymap/ukdvorak.gkb b/config/grub/keymap/ukdvorak.gkb
index c793cae8..76b9e380 100644
--- a/config/grub/keymap/ukdvorak.gkb
+++ b/config/grub/keymap/ukdvorak.gkb
diff --git a/config/grub/keymap/ukqwerty.gkb b/config/grub/keymap/ukqwerty.gkb
index 8e5ff299..5f513d85 100644
--- a/config/grub/keymap/ukqwerty.gkb
+++ b/config/grub/keymap/ukqwerty.gkb
diff --git a/config/grub/keymap/usdvorak.gkb b/config/grub/keymap/usdvorak.gkb
index 41301efd..ef88232c 100644
--- a/config/grub/keymap/usdvorak.gkb
+++ b/config/grub/keymap/usdvorak.gkb
diff --git a/config/grub/keymap/usqwerty.gkb b/config/grub/keymap/usqwerty.gkb
index 5fb78d33..0ea130f2 100644
--- a/config/grub/keymap/usqwerty.gkb
+++ b/config/grub/keymap/usqwerty.gkb
diff --git a/script/build/roms b/script/build/roms
index d1d4e71a..9e7c69ee 100755
--- a/script/build/roms
+++ b/script/build/roms
@@ -147,12 +147,8 @@ build_grub_payload()
 		[ -f "${keymapfile}" ] || continue
 
 		keymaps="${keymaps} ${keymapfile}"
-		keymap="${keymapfile##*/}"
-		keymap="${keymap%.gkb}"
-		[ -f "elf/grub/keymap_$keymap.cfg" ] || printf "keymap %s\n" \
-		    "$keymap" > "elf/grub/keymap_$keymap.cfg" || err "!key"; :
 	done
-	[ -z "$_keyboard" ] || [ -f "$grubcfgsdir/keymap/$_keyboard.gkb" ] && \
+	[ -z "$_keyboard" ] || [ -f "$grubcfgsdir/keymap/$_keyboard.gkb" ] || \
 		err "build_grub_payload: $_keyboard layout not defined"
 	[ -n "$_keyboard" ] && keymaps="${grubcfgsdir}/keymap/${_keyboard}.gkb"
 	[ -f "$grubelf" ] && return 0
@@ -166,18 +162,6 @@ build_grub_payload()
 	    --fonts= --themes= --locales=  \
 	    --modules="${grub_modules}" \
 	    --install-modules="${grub_install_modules}" \
-	    "${layoutdir}/colemak.gkb=${grubcfgsdir}/keymap/colemak.gkb" \
-	    "${layoutdir}/deqwertz.gkb=${grubcfgsdir}/keymap/deqwertz.gkb" \
-	    "${layoutdir}/esqwerty.gkb=${grubcfgsdir}/keymap/esqwerty.gkb" \
-	    "${layoutdir}/frazerty.gkb=${grubcfgsdir}/keymap/frazerty.gkb" \
-	    "${layoutdir}/frdvbepo.gkb=${grubcfgsdir}/keymap/frdvbepo.gkb" \
-	    "${layoutdir}/itqwerty.gkb=${grubcfgsdir}/keymap/itqwerty.gkb" \
-	    "${layoutdir}/svenska.gkb=${grubcfgsdir}/keymap/svenska.gkb" \
-	    "${layoutdir}/trqwerty.gkb=${grubcfgsdir}/keymap/trqwerty.gkb" \
-	    "${layoutdir}/ukdvorak.gkb=${grubcfgsdir}/keymap/ukdvorak.gkb" \
-	    "${layoutdir}/ukqwerty.gkb=${grubcfgsdir}/keymap/ukqwerty.gkb" \
-	    "${layoutdir}/usdvorak.gkb=${grubcfgsdir}/keymap/usdvorak.gkb" \
-	    "${layoutdir}/usqwerty.gkb=${grubcfgsdir}/keymap/usqwerty.gkb" \
 	    "/boot/grub/grub.cfg=${grubcfgsdir}/config/grub_memdisk.cfg" \
 	    "/boot/grub/grub_default.cfg=${grubcfgsdir}/config/grub.cfg" || \
 	    err "could not generate grub.elf"
@@ -310,8 +294,11 @@ build_grub_roms()
 		[ -f "${keymapfile}" ] || continue
 		keymap="${keymapfile##*/}"
 		keymap="${keymap%.gkb}"
-		tmpgrubrom=$(mkGrubRom "${keymap}" "${tmprom}") || \
-		    err "build_grub_roms ${board}: could not create tmprom"
+
+		tmpgrubrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
+		x_ cp "${tmprom}" "${tmpgrubrom}"
+		x_ "$cbfstool" "$tmpgrubrom" add -f "$keymapfile" \
+		    -n keymap.gkb -t raw
 
 		newrom="${romdir}/${payload1}_${board}_${initmode}_"
 		newrom="${newrom}${displaymode}_${keymap}.rom"
@@ -326,20 +313,6 @@ build_grub_roms()
 }
 
 # make a rom in /tmp/ and then print the path of that ROM
-mkGrubRom() {
-	_keymap="${1}"
-	_cbrom="${2}"
-
-	keymapcfg="elf/grub/keymap_${_keymap}.cfg"
-
-	tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
-	x_ cp "${_cbrom}" "${tmprom}"
-	x_ "$cbfstool" "$tmprom" add -f "$keymapcfg" -n keymap.cfg -t raw
-
-	printf "%s\n" "${tmprom}"
-}
-
-# make a rom in /tmp/ and then print the path of that ROM
 mkSeabiosRom() {
 	_cbrom="${1}" # rom to insert seabios in. will not be touched
 		# (a tmpfile will be made instead)