diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-11-21 19:57:46 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-11-21 19:57:46 +0000 |
| commit | 1a4829c92dde3bde267530fdb28ce5265355568b (patch) | |
| tree | 03fbf880815c073e9fd7a478508c2340742f406a /buildrom-withgrub | |
| parent | 3e1712768172e53ed02da96e1bb392edaa219de7 (diff) | |
Revert "buildrom-withgrub: Only include 1 keymap file in GRUB memdisk."
This reverts commit 3e1712768172e53ed02da96e1bb392edaa219de7.
Diffstat (limited to 'buildrom-withgrub')
| -rwxr-xr-x | buildrom-withgrub | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/buildrom-withgrub b/buildrom-withgrub index c5d12d0..b86bbe9 100755 --- a/buildrom-withgrub +++ b/buildrom-withgrub @@ -38,6 +38,14 @@ cd coreboot for romtype in txtmode vesafb do + # Build the GRUB payload (ELF executable) + # and add it to coreboot directory: + cd ../resources/utilities/grub-assemble + ./gen."$romtype".sh + rm -rf ../../../coreboot/grub.elf + mv grub.elf ../../../coreboot/ + cd ../../../coreboot + # Build coreboot ROM image rm -rf .config make clean @@ -53,22 +61,12 @@ do # .config no longer needed rm -rf .config - # Build the correct GRUB payload for this type of ROM image # Generate each type of GRUB configuration for this type of ROM image for keymap in $(ls ../resources/utilities/grub-assemble/keymap/original) do # copy the images based on the keymap cp "$1"_"$romtype".rom "$1"_"$keymap"_"$romtype".rom - # Build the GRUB payload (ELF executable) and add it to the ROM - # Has to be done here to get the right keymap for this image. - cd ../resources/utilities/grub-assemble - ./gen."$romtype".sh $keymap - rm -rf ../../../coreboot/grub_"$romtype".elf - mv grub_"$romtype".elf ../../../coreboot/ - cd ../../../coreboot - ./util/cbfstool/cbfstool "$1"_"$keymap"_"$romtype".rom add-payload -f grub_"$romtype".elf -n fallback/payload -c lzma - # generate the correct grub config touch grub_"$keymap"_"$romtype".cfg # generate contents: |