diff --git a/Makefile b/Makefile index a93ca20..8fb9722 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ COMMIT=db4b71ff10 SDK_VERSION=2022-12-18_3b32af950d -CONFIG=free-defconfig-$(COMMIT) +CONFIG=nonfree-defconfig-$(COMMIT) BOOTSPLASH=bootsplash.jpg REPO_URL=https://github.com/coreboot/coreboot.git @@ -23,7 +23,7 @@ build/coreboot_top.rom.sha256: build/coreboot_top.rom build/coreboot_top.rom: build/coreboot.rom dd if="$<" of="$@" bs=1M skip=8 -build/coreboot.rom: $(COREBOOT_CONFIG) $(BOOTSPLASH) $(bootorder) +build/coreboot.rom: $(COREBOOT_CONFIG) $(BOOTSPLASH) vgabios.bin mkdir -p build $(BUILDER) make diff --git a/coreboot-sdk.sh b/coreboot-sdk.sh index b54c408..b0e8b75 100755 --- a/coreboot-sdk.sh +++ b/coreboot-sdk.sh @@ -2,29 +2,42 @@ while :; do case "$1" in - --config) - CONFIG="$2" - shift 2;; - --sdk-version) - SDK_VERSION="$2" - shift 2;; - --bootsplash) - BOOTSPLASH="$2" - shift 2;; - *) - break;; + --config) + CONFIG="$2" + shift 2 + ;; + --sdk-version) + SDK_VERSION="$2" + shift 2 + ;; + --bootsplash) + BOOTSPLASH="$2" + shift 2 + ;; + --vgabios) + VGABIOS="$2" + shift 2 + ;; + *) + break + ;; esac done +[ -e "${VGABIOS}" ] && + VGABIOS_MNT="-v $(pwd)/${VGABIOS}:/home/coreboot/cb_build/vgabios.bin:ro" + uid=$(id -u) gid=$(id -g) -docker run --rm -it \ +podman run --rm -it \ + --userns=keep-id \ --user "$uid:$gid" \ --workdir "/home/coreboot/cb_build" \ -v "$(pwd)/coreboot:/home/coreboot/cb_build" \ -v "$(pwd)/build:/home/coreboot/cb_build/build" \ -v "$(pwd)/${CONFIG}:/home/coreboot/cb_build/configs/defconfig:ro" \ -v "$(pwd)/${BOOTSPLASH}:/home/coreboot/cb_build/bootsplash.jpg:ro" \ + $VGABIOS_MNT \ coreboot/coreboot-sdk:"$SDK_VERSION" \ "$@" diff --git a/nonfree-defconfig-db4b71ff10 b/nonfree-defconfig-db4b71ff10 new file mode 100644 index 0000000..2d791af --- /dev/null +++ b/nonfree-defconfig-db4b71ff10 @@ -0,0 +1,30 @@ +CONFIG_BOOTSPLASH_IMAGE=y +CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y +CONFIG_CBFS_SIZE=0x400000 +CONFIG_VGA_BIOS=y +CONFIG_SEABIOS_PS2_TIMEOUT=5000 +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 +CONFIG_PCIEXP_HOTPLUG_BUSES=8 +CONFIG_PCIEXP_HOTPLUG_MEM=0x800000 +CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000 +CONFIG_BOARD_LENOVO_X230=y +# CONFIG_S3_VGA_ROM_RUN is not set +# CONFIG_H8_BEEP_ON_DEATH is not set +CONFIG_H8_SUPPORT_BT_ON_WIFI=y +CONFIG_BOOTBLOCK_NORMAL=y +CONFIG_VGA_ROM_RUN=y +CONFIG_PCI_OPTION_ROM_RUN_YABEL=y +CONFIG_YABEL_VIRTMEM_LOCATION=0x1000000 +CONFIG_YABEL_DIRECTHW=y +CONFIG_FRAMEBUFFER_SET_VESA_MODE=y +CONFIG_VBE_LINEAR_FRAMEBUFFER=y +CONFIG_BOOTSPLASH=y +CONFIG_PCIEXP_HOTPLUG_IO=0x2000 +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y +CONFIG_SEABIOS_DEBUG_LEVEL=-1 +CONFIG_COREINFO_SECONDARY_PAYLOAD=y +CONFIG_NVRAMCUI_SECONDARY_PAYLOAD=y diff --git a/vgabios.bin b/vgabios.bin new file mode 100644 index 0000000..83223da Binary files /dev/null and b/vgabios.bin differ