ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-02-21 09:31:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make uroot optional

Browse Source
This commit is contained in:
Trammell hudson 2018-02-28 11:12:02 -05:00
parent 495e88f175
commit a4f121b838
No known key found for this signature in database
GPG Key ID: 687A5005935B1533
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
boards/qemu-coreboot.config
View File

@ -5,20 +5,25 @@ CONFIG_COREBOOT=y
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu.config CONFIG_COREBOOT_CONFIG=config/coreboot-qemu.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config CONFIG_LINUX_CONFIG=config/linux-qemu.config
CONFIG_CRYPTSETUP=y ifeq "$(CONFIG_UROOT)" "y"
CONFIG_FLASHROM=y CONFIG_BUSYBOX=n
CONFIG_GPG=y else
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y
CONFIG_PCIUTILS=y
CONFIG_POPT=y
CONFIG_QRENCODE=y CONFIG_QRENCODE=y
CONFIG_TPMTOTP=y CONFIG_TPMTOTP=y
CONFIG_POPT=y
CONFIG_FLASHTOOLS=y
#CONFIG_FLASHROM=y
CONFIG_PCIUTILS=y
CONFIG_UTIL_LINUX=y
CONFIG_CRYPTSETUP=y
CONFIG_GPG=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y
CONFIG_DROPBEAR=y CONFIG_DROPBEAR=y
CONFIG_XEN=y CONFIG_NEWT=y
CONFIG_XEN_VERSION=4.6 CONFIG_SLANG=y
endif
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000=y CONFIG_LINUX_E1000=y
@ -26,8 +31,10 @@ CONFIG_LINUX_E1000=y
CONFIG_BOOTSCRIPT=/bin/generic-init CONFIG_BOOTSCRIPT=/bin/generic-init
CONFIG_TPM=n CONFIG_TPM=n
run: coreboot.intermediate #run: coreboot.intermediate
run: $(build)/$(BOARD)/coreboot.rom run:
qemu-system-x86_64 \ qemu-system-x86_64 \
--machine q35 \ --machine q35 \
--bios $< \ --serial /dev/tty \
--bios $(build)/$(BOARD)/coreboot.rom \
; stty sane

27
boards/qemu-linuxboot.config
View File

@ -4,25 +4,26 @@ CONFIG_LINUXBOOT=y
CONFIG_LINUXBOOT_BOARD=qemu CONFIG_LINUXBOOT_BOARD=qemu
CONFIG_LINUX_CONFIG=config/linux-linuxboot.config CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
#CONFIG_CRYPTSETUP=y ifeq "$(CONFIG_UROOT)" "y"
CONFIG_BUSYBOX=n
endif
CONFIG_CRYPTSETUP=y
#CONFIG_FLASHROM=y #CONFIG_FLASHROM=y
#CONFIG_GPG=y CONFIG_FLASHTOOLS=y
CONFIG_GPG=y
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y CONFIG_UTIL_LINUX=y
#CONFIG_LVM2=y CONFIG_LVM2=y
#CONFIG_MBEDTLS=y CONFIG_MBEDTLS=y
CONFIG_PCIUTILS=y CONFIG_PCIUTILS=y
#CONFIG_POPT=y CONFIG_POPT=y
#CONFIG_QRENCODE=y CONFIG_QRENCODE=y
#CONFIG_TPMTOTP=y CONFIG_TPMTOTP=y
#CONFIG_XEN=y
CONFIG_DROPBEAR=y CONFIG_DROPBEAR=y
CONFIG_FROTZ=y #CONFIG_FROTZ=y
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
#CONFIG_LINUX_IGB=y
#CONFIG_LINUX_MEGARAID=y
#CONFIG_LINUX_E1000E=y
CONFIG_LINUX_E1000=y CONFIG_LINUX_E1000=y
CONFIG_LINUX_SCSI_GDTH=y CONFIG_LINUX_SCSI_GDTH=y
CONFIG_LINUX_ATA=y CONFIG_LINUX_ATA=y
@ -40,7 +41,7 @@ CONFIG_USB_BOOT_DEV="/dev/sdb1"
# The LinuxBoot firmware should set its ip address to 10.0.2.15 # The LinuxBoot firmware should set its ip address to 10.0.2.15
# or run udhcpc to get a qemu address # or run udhcpc to get a qemu address
run: linuxboot.intermediate run:
qemu-system-x86_64 \ qemu-system-x86_64 \
-machine q35,smm=on \ -machine q35,smm=on \
-global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s3=1 \