diff options
Diffstat (limited to 'projects/seabios')
-rw-r--r-- | projects/seabios/configs/bios/config | 91 | ||||
-rw-r--r-- | projects/seabios/configs/config (renamed from projects/seabios/configs/vgabios/config) | 2 | ||||
-rw-r--r-- | projects/seabios/configs/install (renamed from projects/seabios/configs/bios/install) | 1 | ||||
-rw-r--r-- | projects/seabios/configs/revision | 2 | ||||
-rw-r--r-- | projects/seabios/configs/targets | 2 | ||||
-rw-r--r-- | projects/seabios/configs/vgabios/install | 1 | ||||
-rwxr-xr-x | projects/seabios/seabios | 12 |
7 files changed, 7 insertions, 104 deletions
diff --git a/projects/seabios/configs/bios/config b/projects/seabios/configs/bios/config deleted file mode 100644 index cd13ec77..00000000 --- a/projects/seabios/configs/bios/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/vgabios/config b/projects/seabios/configs/config index a2725409..5b2d44b6 100644 --- a/projects/seabios/configs/vgabios/config +++ b/projects/seabios/configs/config @@ -34,6 +34,7 @@ CONFIG_SDCARD=y CONFIG_MEGASAS=y CONFIG_FLOPPY=y CONFIG_FLASH_FLOPPY=y +CONFIG_NVME=y CONFIG_PS2PORT=y CONFIG_USB=y CONFIG_USB_UHCI=y @@ -46,6 +47,7 @@ CONFIG_USB_HUB=y CONFIG_USB_KEYBOARD=y CONFIG_USB_MOUSE=y CONFIG_SERIAL=y +CONFIG_SERCON=y CONFIG_LPT=y CONFIG_RTC_TIMER=y CONFIG_HARDWARE_IRQ=y diff --git a/projects/seabios/configs/bios/install b/projects/seabios/configs/install index 9189ec8f..dd4c65c0 100644 --- a/projects/seabios/configs/bios/install +++ b/projects/seabios/configs/install @@ -1 +1,2 @@ bios.bin.elf:bios.bin.elf +vgabios.bin:vgabios.bin diff --git a/projects/seabios/configs/revision b/projects/seabios/configs/revision index 3274dbdb..2c6e65b5 100644 --- a/projects/seabios/configs/revision +++ b/projects/seabios/configs/revision @@ -1 +1 @@ -rel-1.11.0 +rel-1.12.0 diff --git a/projects/seabios/configs/targets b/projects/seabios/configs/targets deleted file mode 100644 index 98a59a61..00000000 --- a/projects/seabios/configs/targets +++ /dev/null @@ -1,2 +0,0 @@ -bios -vgabios diff --git a/projects/seabios/configs/vgabios/install b/projects/seabios/configs/vgabios/install deleted file mode 100644 index ddc1571e..00000000 --- a/projects/seabios/configs/vgabios/install +++ /dev/null @@ -1 +0,0 @@ -vgabios.bin:vgabios.bin diff --git a/projects/seabios/seabios b/projects/seabios/seabios index ce9593b0..8f523f61 100755 --- a/projects/seabios/seabios +++ b/projects/seabios/seabios @@ -27,7 +27,8 @@ usage() { download() { local repository="$project" - project_download_git "$project" "$repository" 'https://review.coreboot.org/seabios.git' "$@" + project_download_git "$project" "$repository" 'https://git.seabios.org/seabios.git' "$@" || \ + project_download_git "$project" "$repository" 'https://review.coreboot.org/cgit/seabios.git/' "$@" } download_check() { @@ -74,14 +75,7 @@ build() { mkdir -p "$build_path" cp "$seabios_config_path" "$sources_path/.config" - make -C "$sources_path" -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 - + make -C "$sources_path" OUT="$build_path/" -j"$TASKS" make -C "$sources_path" distclean rm -f "$sources_path/.config" |