diff options
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/seabios/configs/bios/config (renamed from projects/seabios/configs/txtmode/config) | 0 | ||||
| -rw-r--r-- | projects/seabios/configs/bios/install (renamed from projects/seabios/configs/txtmode/install) | 0 | ||||
| -rw-r--r-- | projects/seabios/configs/targets | 4 | ||||
| -rw-r--r-- | projects/seabios/configs/vgabios/config (renamed from projects/seabios/configs/vga/config) | 0 | ||||
| -rw-r--r-- | projects/seabios/configs/vgabios/install (renamed from projects/seabios/configs/vga/install) | 0 | ||||
| -rw-r--r-- | projects/seabios/install/bootorder | 1 | ||||
| -rw-r--r-- | projects/seabios/install/install | 1 | ||||
| -rwxr-xr-x | projects/seabios/seabios | 30 |
8 files changed, 13 insertions, 23 deletions
diff --git a/projects/seabios/configs/txtmode/config b/projects/seabios/configs/bios/config index cd13ec77..cd13ec77 100644 --- a/projects/seabios/configs/txtmode/config +++ b/projects/seabios/configs/bios/config diff --git a/projects/seabios/configs/txtmode/install b/projects/seabios/configs/bios/install index 9189ec8f..9189ec8f 100644 --- a/projects/seabios/configs/txtmode/install +++ b/projects/seabios/configs/bios/install diff --git a/projects/seabios/configs/targets b/projects/seabios/configs/targets index ac8e49d0..98a59a61 100644 --- a/projects/seabios/configs/targets +++ b/projects/seabios/configs/targets @@ -1,2 +1,2 @@ -txtmode -vga +bios +vgabios diff --git a/projects/seabios/configs/vga/config b/projects/seabios/configs/vgabios/config index a2725409..a2725409 100644 --- a/projects/seabios/configs/vga/config +++ b/projects/seabios/configs/vgabios/config diff --git a/projects/seabios/configs/vga/install b/projects/seabios/configs/vgabios/install index ddc1571e..ddc1571e 100644 --- a/projects/seabios/configs/vga/install +++ b/projects/seabios/configs/vgabios/install diff --git a/projects/seabios/install/bootorder b/projects/seabios/install/bootorder deleted file mode 100644 index b33e1295..00000000 --- a/projects/seabios/install/bootorder +++ /dev/null @@ -1 +0,0 @@ -/rom@img/grub2 diff --git a/projects/seabios/install/install b/projects/seabios/install/install deleted file mode 100644 index 4830c5f9..00000000 --- a/projects/seabios/install/install +++ /dev/null @@ -1 +0,0 @@ -bootorder:bootorder diff --git a/projects/seabios/seabios b/projects/seabios/seabios index 818ffcfd..6fb21bee 100755 --- a/projects/seabios/seabios +++ b/projects/seabios/seabios @@ -27,8 +27,7 @@ usage() { download() { local repository="${project}" - # Can't clone using TLS until Coreboot's cert lists the domain as a SAN - project_download_git "${project}" "${repository}" 'git://git.seabios.org/seabios.git' "$@" + project_download_git "${project}" "${repository}" 'https://review.coreboot.org/seabios.git' "$@" } download_check() { @@ -58,6 +57,7 @@ update_check() { } build() { + local target="$1" local repository="${project}" project_sources_directory_missing_empty_error "${project}" "${repository}" "$@" @@ -72,27 +72,19 @@ build() { local build_path="$(project_build_path "${project}" "$@")" mkdir -p "${build_path}" + cp "${seabios_config_path}" "${sources_path}/.config" - ( - cd "${sources_path}" + make -C "${sources_path}" -j"${TASKS}" - # Copy the config file for target into working directory - cp "${seabios_config_path}" .config - - # Compile SeaBIOS first - make -j"${TASKS}" + if [[ "${target}" == 'bios' ]]; then + cp "${sources_path}/out/bios.bin.elf" "${build_path}" + elif [[ "${target}" == 'vgabios' ]]; then + cp "${sources_path}/out/vgabios.bin" "${build_path}" + fi - # Copy the ELF to its build directory - if [[ "$1" == 'txtmode' ]]; then - cp out/bios.bin.elf "${build_path}" - elif [[ "$1" == 'vga' ]]; then - cp out/vgabios.bin "${build_path}" - fi + make -C "${sources_path}" distclean - # Tidy up - make distclean - rm -f .config - ) + rm -f "${sources_path}/.config" } build_check() { |