diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.binutils | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 2 | ||||
| -rw-r--r-- | target/x86/Makefile | 10 | ||||
| -rw-r--r-- | target/x86/kernel/qemu-x86 | 1 |
4 files changed, 18 insertions, 1 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/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/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 |