From 909a3a8c16f2082bd7f4d3e1d9073fcdace28310 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Fri, 15 Sep 2017 23:38:13 -0400 Subject: Change repository URI in SeaBIOS download action git.seabios.org doesn't have its certificate properly configured, preventing git from taking advantage of TLS certificate verification (git complains and aborts). To side-step the issue, the URI for the SeaBIOS repository at review.coreboot.org/seabios.git is substituted in place of the old. --- projects/seabios/seabios | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'projects') diff --git a/projects/seabios/seabios b/projects/seabios/seabios index 818ffcfd..a0682204 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() { -- cgit v1.2.3-70-g09d2 From 92c06a3ca0d99087e6a51cf672d2cf898bfe4b02 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Fri, 15 Sep 2017 23:42:03 -0400 Subject: Remove unnecessary comments from SeaBIOS script --- projects/seabios/seabios | 4 ---- 1 file changed, 4 deletions(-) (limited to 'projects') diff --git a/projects/seabios/seabios b/projects/seabios/seabios index a0682204..b9e0882a 100755 --- a/projects/seabios/seabios +++ b/projects/seabios/seabios @@ -75,20 +75,16 @@ build() { ( cd "${sources_path}" - # Copy the config file for target into working directory cp "${seabios_config_path}" .config - # Compile SeaBIOS first make -j"${TASKS}" - # 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 - # Tidy up make distclean rm -f .config ) -- cgit v1.2.3-70-g09d2 From e87dba45a59e069b71d2ec994e47443357fe6b39 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Sat, 16 Sep 2017 02:49:36 -0400 Subject: Strip subshell group from SeaBIOS build action Absolute pathnames are used so there's not actually any need to go through the process of setting up a subshell and changing directory as long as the '-C' flag is passed to Make. --- projects/seabios/seabios | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'projects') diff --git a/projects/seabios/seabios b/projects/seabios/seabios index b9e0882a..0819e1ed 100755 --- a/projects/seabios/seabios +++ b/projects/seabios/seabios @@ -57,6 +57,7 @@ update_check() { } build() { + local target="$1" local repository="${project}" project_sources_directory_missing_empty_error "${project}" "${repository}" "$@" @@ -71,23 +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}" - cp "${seabios_config_path}" .config - - make -j"${TASKS}" + if [[ "${target}" == 'txtmode' ]]; then + cp "${sources_path}/out/bios.bin.elf" "${build_path}" + elif [[ "${target}" == 'vga' ]]; then + cp "${sources_path}/out/vgabios.bin" "${build_path}" + fi - 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 - make distclean - rm -f .config - ) + rm -f "${sources_path}/.config" } build_check() { -- cgit v1.2.3-70-g09d2 From 0e034cf65cbd48f6c24759e4f7a3c92256e00869 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Sat, 16 Sep 2017 02:58:54 -0400 Subject: Rename SeaBIOS targets to less confusing names 'txtmode' isn't so much a configuration for textmode as it is a BIOS, simply, and 'vga' is actually the VGABIOS which requires the BIOS being present in order to function; this is contrary to what the original target names may lead one to initially believe. --- projects/seabios/configs/bios/config | 91 ++++++++++++++++++++++++++++++ projects/seabios/configs/bios/install | 1 + projects/seabios/configs/targets | 4 +- projects/seabios/configs/txtmode/config | 91 ------------------------------ projects/seabios/configs/txtmode/install | 1 - projects/seabios/configs/vga/config | 95 -------------------------------- projects/seabios/configs/vga/install | 1 - projects/seabios/configs/vgabios/config | 95 ++++++++++++++++++++++++++++++++ projects/seabios/configs/vgabios/install | 1 + projects/seabios/seabios | 4 +- 10 files changed, 192 insertions(+), 192 deletions(-) create mode 100644 projects/seabios/configs/bios/config create mode 100644 projects/seabios/configs/bios/install delete mode 100644 projects/seabios/configs/txtmode/config delete mode 100644 projects/seabios/configs/txtmode/install delete mode 100644 projects/seabios/configs/vga/config delete mode 100644 projects/seabios/configs/vga/install create mode 100644 projects/seabios/configs/vgabios/config create mode 100644 projects/seabios/configs/vgabios/install (limited to 'projects') diff --git a/projects/seabios/configs/bios/config b/projects/seabios/configs/bios/config new file mode 100644 index 00000000..cd13ec77 --- /dev/null +++ b/projects/seabios/configs/bios/config @@ -0,0 +1,91 @@ +# +# Automatically generated file; DO NOT EDIT. +# SeaBIOS Configuration +# + +# +# General Features +# +CONFIG_COREBOOT=y +# CONFIG_QEMU is not set +# CONFIG_CSM is not set +# CONFIG_QEMU_HARDWARE is not set +CONFIG_THREADS=y +CONFIG_RELOCATE_INIT=y +CONFIG_BOOTMENU=y +CONFIG_BOOTSPLASH=y +CONFIG_BOOTORDER=y +CONFIG_COREBOOT_FLASH=y +CONFIG_LZMA=y +CONFIG_CBFS_LOCATION=0 +CONFIG_MULTIBOOT=y +CONFIG_ENTRY_EXTRASTACK=y +CONFIG_MALLOC_UPPERMEMORY=y +CONFIG_ROM_SIZE=0 + +# +# Hardware support +# +CONFIG_ATA=y +# CONFIG_ATA_DMA is not set +# CONFIG_ATA_PIO32 is not set +CONFIG_AHCI=y +CONFIG_SDCARD=y +CONFIG_MEGASAS=y +CONFIG_FLOPPY=y +CONFIG_FLASH_FLOPPY=y +CONFIG_PS2PORT=y +CONFIG_USB=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_USB_EHCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_MSC=y +CONFIG_USB_UAS=y +CONFIG_USB_HUB=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_MOUSE=y +CONFIG_SERIAL=y +CONFIG_LPT=y +CONFIG_RTC_TIMER=y +CONFIG_HARDWARE_IRQ=y +CONFIG_PMTIMER=y +CONFIG_TSC_TIMER=y + +# +# BIOS interfaces +# +CONFIG_DRIVES=y +CONFIG_CDROM_BOOT=y +CONFIG_CDROM_EMU=y +CONFIG_PCIBIOS=y +CONFIG_APMBIOS=y +CONFIG_PNPBIOS=y +CONFIG_OPTIONROMS=y +CONFIG_PMM=y +CONFIG_BOOT=y +CONFIG_KEYBOARD=y +CONFIG_KBD_CALL_INT15_4F=y +CONFIG_MOUSE=y +CONFIG_S3_RESUME=y +CONFIG_VGAHOOKS=y +# CONFIG_DISABLE_A20 is not set +CONFIG_TCGBIOS=y + +# +# VGA ROM +# +CONFIG_NO_VGABIOS=y +# CONFIG_VGA_GEODEGX2 is not set +# CONFIG_VGA_GEODELX is not set +# CONFIG_VGA_COREBOOT is not set +# CONFIG_BUILD_VGABIOS is not set +CONFIG_VGA_EXTRA_STACK_SIZE=512 + +# +# Debugging +# +CONFIG_DEBUG_LEVEL=1 +# CONFIG_DEBUG_SERIAL is not set +# CONFIG_DEBUG_SERIAL_MMIO is not set +CONFIG_DEBUG_COREBOOT=y diff --git a/projects/seabios/configs/bios/install b/projects/seabios/configs/bios/install new file mode 100644 index 00000000..9189ec8f --- /dev/null +++ b/projects/seabios/configs/bios/install @@ -0,0 +1 @@ +bios.bin.elf:bios.bin.elf 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/txtmode/config b/projects/seabios/configs/txtmode/config deleted file mode 100644 index cd13ec77..00000000 --- a/projects/seabios/configs/txtmode/config +++ /dev/null @@ -1,91 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# SeaBIOS Configuration -# - -# -# General Features -# -CONFIG_COREBOOT=y -# CONFIG_QEMU is not set -# CONFIG_CSM is not set -# CONFIG_QEMU_HARDWARE is not set -CONFIG_THREADS=y -CONFIG_RELOCATE_INIT=y -CONFIG_BOOTMENU=y -CONFIG_BOOTSPLASH=y -CONFIG_BOOTORDER=y -CONFIG_COREBOOT_FLASH=y -CONFIG_LZMA=y -CONFIG_CBFS_LOCATION=0 -CONFIG_MULTIBOOT=y -CONFIG_ENTRY_EXTRASTACK=y -CONFIG_MALLOC_UPPERMEMORY=y -CONFIG_ROM_SIZE=0 - -# -# Hardware support -# -CONFIG_ATA=y -# CONFIG_ATA_DMA is not set -# CONFIG_ATA_PIO32 is not set -CONFIG_AHCI=y -CONFIG_SDCARD=y -CONFIG_MEGASAS=y -CONFIG_FLOPPY=y -CONFIG_FLASH_FLOPPY=y -CONFIG_PS2PORT=y -CONFIG_USB=y -CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y -CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y -CONFIG_USB_MSC=y -CONFIG_USB_UAS=y -CONFIG_USB_HUB=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_MOUSE=y -CONFIG_SERIAL=y -CONFIG_LPT=y -CONFIG_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=y - -# -# BIOS interfaces -# -CONFIG_DRIVES=y -CONFIG_CDROM_BOOT=y -CONFIG_CDROM_EMU=y -CONFIG_PCIBIOS=y -CONFIG_APMBIOS=y -CONFIG_PNPBIOS=y -CONFIG_OPTIONROMS=y -CONFIG_PMM=y -CONFIG_BOOT=y -CONFIG_KEYBOARD=y -CONFIG_KBD_CALL_INT15_4F=y -CONFIG_MOUSE=y -CONFIG_S3_RESUME=y -CONFIG_VGAHOOKS=y -# CONFIG_DISABLE_A20 is not set -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -CONFIG_NO_VGABIOS=y -# CONFIG_VGA_GEODEGX2 is not set -# CONFIG_VGA_GEODELX is not set -# CONFIG_VGA_COREBOOT is not set -# CONFIG_BUILD_VGABIOS is not set -CONFIG_VGA_EXTRA_STACK_SIZE=512 - -# -# Debugging -# -CONFIG_DEBUG_LEVEL=1 -# CONFIG_DEBUG_SERIAL is not set -# CONFIG_DEBUG_SERIAL_MMIO is not set -CONFIG_DEBUG_COREBOOT=y diff --git a/projects/seabios/configs/txtmode/install b/projects/seabios/configs/txtmode/install deleted file mode 100644 index 9189ec8f..00000000 --- a/projects/seabios/configs/txtmode/install +++ /dev/null @@ -1 +0,0 @@ -bios.bin.elf:bios.bin.elf diff --git a/projects/seabios/configs/vga/config b/projects/seabios/configs/vga/config deleted file mode 100644 index a2725409..00000000 --- a/projects/seabios/configs/vga/config +++ /dev/null @@ -1,95 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# SeaBIOS Configuration -# - -# -# General Features -# -CONFIG_COREBOOT=y -# CONFIG_QEMU is not set -# CONFIG_CSM is not set -# CONFIG_QEMU_HARDWARE is not set -CONFIG_THREADS=y -CONFIG_RELOCATE_INIT=y -CONFIG_BOOTMENU=y -CONFIG_BOOTSPLASH=y -CONFIG_BOOTORDER=y -CONFIG_COREBOOT_FLASH=y -CONFIG_LZMA=y -CONFIG_CBFS_LOCATION=0 -CONFIG_MULTIBOOT=y -CONFIG_ENTRY_EXTRASTACK=y -CONFIG_MALLOC_UPPERMEMORY=y -CONFIG_ROM_SIZE=0 - -# -# Hardware support -# -CONFIG_ATA=y -# CONFIG_ATA_DMA is not set -# CONFIG_ATA_PIO32 is not set -CONFIG_AHCI=y -CONFIG_SDCARD=y -CONFIG_MEGASAS=y -CONFIG_FLOPPY=y -CONFIG_FLASH_FLOPPY=y -CONFIG_PS2PORT=y -CONFIG_USB=y -CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y -CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y -CONFIG_USB_MSC=y -CONFIG_USB_UAS=y -CONFIG_USB_HUB=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_MOUSE=y -CONFIG_SERIAL=y -CONFIG_LPT=y -CONFIG_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=y - -# -# BIOS interfaces -# -CONFIG_DRIVES=y -CONFIG_CDROM_BOOT=y -CONFIG_CDROM_EMU=y -CONFIG_PCIBIOS=y -CONFIG_APMBIOS=y -CONFIG_PNPBIOS=y -CONFIG_OPTIONROMS=y -CONFIG_PMM=y -CONFIG_BOOT=y -CONFIG_KEYBOARD=y -CONFIG_KBD_CALL_INT15_4F=y -CONFIG_MOUSE=y -CONFIG_S3_RESUME=y -CONFIG_VGAHOOKS=y -# CONFIG_DISABLE_A20 is not set -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -# CONFIG_NO_VGABIOS is not set -# CONFIG_VGA_GEODEGX2 is not set -# CONFIG_VGA_GEODELX is not set -CONFIG_VGA_COREBOOT=y -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_EMULATE_TEXT=y -CONFIG_VGA_FIXUP_ASM=y -CONFIG_VGA_ALLOCATE_EXTRA_STACK=y -CONFIG_VGA_EXTRA_STACK_SIZE=512 -CONFIG_VGA_VBE=y - -# -# Debugging -# -CONFIG_DEBUG_LEVEL=1 -# CONFIG_DEBUG_SERIAL is not set -# CONFIG_DEBUG_SERIAL_MMIO is not set -CONFIG_DEBUG_COREBOOT=y diff --git a/projects/seabios/configs/vga/install b/projects/seabios/configs/vga/install deleted file mode 100644 index ddc1571e..00000000 --- a/projects/seabios/configs/vga/install +++ /dev/null @@ -1 +0,0 @@ -vgabios.bin:vgabios.bin diff --git a/projects/seabios/configs/vgabios/config b/projects/seabios/configs/vgabios/config new file mode 100644 index 00000000..a2725409 --- /dev/null +++ b/projects/seabios/configs/vgabios/config @@ -0,0 +1,95 @@ +# +# Automatically generated file; DO NOT EDIT. +# SeaBIOS Configuration +# + +# +# General Features +# +CONFIG_COREBOOT=y +# CONFIG_QEMU is not set +# CONFIG_CSM is not set +# CONFIG_QEMU_HARDWARE is not set +CONFIG_THREADS=y +CONFIG_RELOCATE_INIT=y +CONFIG_BOOTMENU=y +CONFIG_BOOTSPLASH=y +CONFIG_BOOTORDER=y +CONFIG_COREBOOT_FLASH=y +CONFIG_LZMA=y +CONFIG_CBFS_LOCATION=0 +CONFIG_MULTIBOOT=y +CONFIG_ENTRY_EXTRASTACK=y +CONFIG_MALLOC_UPPERMEMORY=y +CONFIG_ROM_SIZE=0 + +# +# Hardware support +# +CONFIG_ATA=y +# CONFIG_ATA_DMA is not set +# CONFIG_ATA_PIO32 is not set +CONFIG_AHCI=y +CONFIG_SDCARD=y +CONFIG_MEGASAS=y +CONFIG_FLOPPY=y +CONFIG_FLASH_FLOPPY=y +CONFIG_PS2PORT=y +CONFIG_USB=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_USB_EHCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_MSC=y +CONFIG_USB_UAS=y +CONFIG_USB_HUB=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_MOUSE=y +CONFIG_SERIAL=y +CONFIG_LPT=y +CONFIG_RTC_TIMER=y +CONFIG_HARDWARE_IRQ=y +CONFIG_PMTIMER=y +CONFIG_TSC_TIMER=y + +# +# BIOS interfaces +# +CONFIG_DRIVES=y +CONFIG_CDROM_BOOT=y +CONFIG_CDROM_EMU=y +CONFIG_PCIBIOS=y +CONFIG_APMBIOS=y +CONFIG_PNPBIOS=y +CONFIG_OPTIONROMS=y +CONFIG_PMM=y +CONFIG_BOOT=y +CONFIG_KEYBOARD=y +CONFIG_KBD_CALL_INT15_4F=y +CONFIG_MOUSE=y +CONFIG_S3_RESUME=y +CONFIG_VGAHOOKS=y +# CONFIG_DISABLE_A20 is not set +CONFIG_TCGBIOS=y + +# +# VGA ROM +# +# CONFIG_NO_VGABIOS is not set +# CONFIG_VGA_GEODEGX2 is not set +# CONFIG_VGA_GEODELX is not set +CONFIG_VGA_COREBOOT=y +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_EMULATE_TEXT=y +CONFIG_VGA_FIXUP_ASM=y +CONFIG_VGA_ALLOCATE_EXTRA_STACK=y +CONFIG_VGA_EXTRA_STACK_SIZE=512 +CONFIG_VGA_VBE=y + +# +# Debugging +# +CONFIG_DEBUG_LEVEL=1 +# CONFIG_DEBUG_SERIAL is not set +# CONFIG_DEBUG_SERIAL_MMIO is not set +CONFIG_DEBUG_COREBOOT=y diff --git a/projects/seabios/configs/vgabios/install b/projects/seabios/configs/vgabios/install new file mode 100644 index 00000000..ddc1571e --- /dev/null +++ b/projects/seabios/configs/vgabios/install @@ -0,0 +1 @@ +vgabios.bin:vgabios.bin diff --git a/projects/seabios/seabios b/projects/seabios/seabios index 0819e1ed..6fb21bee 100755 --- a/projects/seabios/seabios +++ b/projects/seabios/seabios @@ -76,9 +76,9 @@ build() { make -C "${sources_path}" -j"${TASKS}" - if [[ "${target}" == 'txtmode' ]]; then + if [[ "${target}" == 'bios' ]]; then cp "${sources_path}/out/bios.bin.elf" "${build_path}" - elif [[ "${target}" == 'vga' ]]; then + elif [[ "${target}" == 'vgabios' ]]; then cp "${sources_path}/out/vgabios.bin" "${build_path}" fi -- cgit v1.2.3-70-g09d2 From 8d63063e564a712e610076b9bf4505d4445d49cc Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Sat, 16 Sep 2017 03:20:20 -0400 Subject: Delete SeaBIOS directory projects/seabios/install The bootorder file should be handled by the Coreboot scripts in projects/coreboot/coreboot* instead for better tailoring to a given target. --- projects/seabios/install/bootorder | 1 - projects/seabios/install/install | 1 - 2 files changed, 2 deletions(-) delete mode 100644 projects/seabios/install/bootorder delete mode 100644 projects/seabios/install/install (limited to 'projects') 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 -- cgit v1.2.3-70-g09d2