diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.binutils | 6 | ||||
| -rw-r--r-- | target/config/Config.in.qemuopts | 12 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.virtio | 30 | ||||
| -rw-r--r-- | target/x86/Makefile | 10 | ||||
| -rw-r--r-- | target/x86/kernel/qemu-x86 | 1 | ||||
| -rw-r--r-- | target/x86_64/Makefile | 14 | ||||
| -rw-r--r-- | target/x86_64/kernel/qemu-x86_64 | 1 | ||||
| -rw-r--r-- | target/x86_64/qemu-x86_64/genimage-dual.cfg | 1 | ||||
| -rw-r--r-- | target/x86_64/qemu-x86_64/genimage-efi-dual.cfg | 8 |
10 files changed, 64 insertions, 21 deletions
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index cf11a76c9..3e141d4d6 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,6 +8,7 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64 default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32 +default ADK_TOOLCHAIN_BINUTILS_2_26 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2 default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_X86_64 default ADK_TOOLCHAIN_BINUTILS_2_44 @@ -54,6 +55,11 @@ config ADK_TOOLCHAIN_BINUTILS_2_37 depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_KVX +config ADK_TOOLCHAIN_BINUTILS_2_26 + bool "2.26" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_KVX + config ADK_TOOLCHAIN_BINUTILS_ARC bool "arc-2023.09" depends on ADK_TARGET_ARCH_ARC diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 78c608b49..df7128efa 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -95,20 +95,8 @@ endchoice choice prompt "Qemu Emulation using VirtIO drivers" depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \ - ADK_TARGET_SYSTEM_QEMU_AARCH64 || \ - ADK_TARGET_SYSTEM_QEMU_ARC || \ - ADK_TARGET_SYSTEM_QEMU_CSKY || \ - ADK_TARGET_SYSTEM_QEMU_M68K_VIRT || \ - ADK_TARGET_SYSTEM_QEMU_RISCV32 || \ - ADK_TARGET_SYSTEM_QEMU_RISCV64 || \ ADK_TARGET_SYSTEM_QEMU_X86 || \ ADK_TARGET_SYSTEM_QEMU_X86_64 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_ARC -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_CSKY -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_RISCV32 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_RISCV64 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_M68K_VIRT config ADK_TARGET_QEMU_WITHOUT_VIRTIO bool "disabled" diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index e2b619926..eb9c66abb 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -294,7 +294,7 @@ config ADK_LINUX_KERNEL_NET_NS default n config ADK_LINUX_KERNEL_TIME_NS - bool "Network namespace" + bool "Time namespace" select ADK_LINUX_KERNEL_NAMESPACES select ADK_LINUX_KERNEL_GENERIC_VDSO_TIME_NS default n diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio index 526e2920e..053b2465c 100644 --- a/target/linux/config/Config.in.virtio +++ b/target/linux/config/Config.in.virtio @@ -10,9 +10,6 @@ config ADK_LINUX_KERNEL_VIRTIO_MENU config ADK_LINUX_KERNEL_VIRTIO bool -config ADK_LINUX_KERNEL_VIRTIO_CONSOLE - bool - config ADK_LINUX_KERNEL_VIRTIO_PCI_LEGACY bool @@ -22,6 +19,20 @@ config ADK_LINUX_KERNEL_VIRTIO_PCI config ADK_LINUX_KERNEL_VIRTIO_MMIO bool +config ADK_LINUX_KERNEL_VIRTIO_CONSOLE + bool "Virtio console driver" + select ADK_LINUX_KERNEL_VIRTIO + default y if ADK_TARGET_SYSTEM_QEMU_AARCH64 + default y if ADK_TARGET_SYSTEM_QEMU_ARC + default y if ADK_TARGET_SYSTEM_QEMU_CSKY + default y if ADK_TARGET_SYSTEM_QEMU_M68K_VIRT + default y if ADK_TARGET_SYSTEM_QEMU_RISCV32 + default y if ADK_TARGET_SYSTEM_QEMU_RISCV64 + default y if ADK_TARGET_SYSTEM_QEMU_S390 + default n + help + Enables support for Virtio console driver. + config ADK_LINUX_KERNEL_VIRTIO_NET tristate "Virtio net driver" select ADK_LINUX_KERNEL_VIRTIO @@ -29,6 +40,12 @@ config ADK_LINUX_KERNEL_VIRTIO_NET select ADK_LINUX_KERNEL_VIRTIO_MMIO select ADK_LINUX_KERNEL_VIRTIO_PCI select ADK_LINUX_KERNEL_VIRTIO_PCI_LEGACY + default y if ADK_TARGET_SYSTEM_QEMU_AARCH64 + default y if ADK_TARGET_SYSTEM_QEMU_ARC + default y if ADK_TARGET_SYSTEM_QEMU_CSKY + default y if ADK_TARGET_SYSTEM_QEMU_M68K_VIRT + default y if ADK_TARGET_SYSTEM_QEMU_RISCV32 + default y if ADK_TARGET_SYSTEM_QEMU_RISCV64 default y if ADK_TARGET_SYSTEM_QEMU_S390 default n help @@ -42,6 +59,13 @@ config ADK_LINUX_KERNEL_VIRTIO_BLK select ADK_LINUX_KERNEL_VIRTIO_PCI_LEGACY select ADK_LINUX_KERNEL_VIRTIO_MMIO select ADK_LINUX_KERNEL_BLK_DEV + default y if ADK_TARGET_SYSTEM_QEMU_AARCH64 + default y if ADK_TARGET_SYSTEM_QEMU_ARC + default y if ADK_TARGET_SYSTEM_QEMU_CSKY + default y if ADK_TARGET_SYSTEM_QEMU_M68K_VIRT + default y if ADK_TARGET_SYSTEM_QEMU_RISCV32 + default y if ADK_TARGET_SYSTEM_QEMU_RISCV64 + default y if ADK_TARGET_SYSTEM_QEMU_S390 default n help Enables support for Virtio Block driver. diff --git a/target/x86/Makefile b/target/x86/Makefile index b9bbc72a3..d2283400c 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -10,7 +10,13 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage QEMU_ARCH:=i386 QEMU_ARGS:=-M pc QEMU_ARGS+=${ADK_QEMU_ARGS} + +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) +QEMU_ARGS+=-net nic,model=virtio -net user +QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio +else QEMU_ARGS+=-net user -net nic,model=e1000 +endif ifeq ($(ADK_PACKAGE_GRUB_EFI_X86),y) QEMU_ARGS+=-L . -bios bios-x86.bin @@ -40,7 +46,11 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo "$(CREATE) qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS}' +else @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img' +endif else @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86 index 1049b23d8..bb28f8ec4 100644 --- a/target/x86/kernel/qemu-x86 +++ b/target/x86/kernel/qemu-x86 @@ -1,3 +1,4 @@ CONFIG_X86=y CONFIG_X86_32=y CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE_OVERRIDE=y diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 2c5bcd253..221311091 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -10,11 +10,19 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage QEMU_ARCH:=x86_64 QEMU_ARGS:=-M pc -m 256 +QEMU_ARGS+=${ADK_QEMU_ARGS} + ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y) QEMU_ARGS+=-L . -bios bios-x86_64.bin endif -QEMU_ARGS+=${ADK_QEMU_ARGS} + +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) +QEMU_ARGS+=-net nic,model=virtio -net user +QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio +else QEMU_ARGS+=-net user -net nic,model=e1000 +endif + ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y) QEMU_ARGS+=-device AC97 endif @@ -39,7 +47,11 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo "$(CREATE) qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS}' +else @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img' +endif else @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index 9e9c1197f..073a4c7ca 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -11,3 +11,4 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE_OVERRIDE=y diff --git a/target/x86_64/qemu-x86_64/genimage-dual.cfg b/target/x86_64/qemu-x86_64/genimage-dual.cfg index 647a2bcb5..c9b73170d 100644 --- a/target/x86_64/qemu-x86_64/genimage-dual.cfg +++ b/target/x86_64/qemu-x86_64/genimage-dual.cfg @@ -8,6 +8,7 @@ image disk.img { image = "boot.img" offset = 0 size = 512 + holes = {"(440; 512)"} } partition grub { diff --git a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg index ff3cb08d2..247511d57 100644 --- a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg +++ b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg @@ -22,14 +22,14 @@ image disk.img { partition root1 { partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a - image = "rootfs.ext" - size = 128M + image = "rootfs1.ext" + size = 64M } partition root2 { partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a - image = "rootfs.ext" - size = 128M + image = "rootfs2.ext" + size = 64M } partition cfgfs { |