diff options
Diffstat (limited to 'external/poky/meta-yocto-bsp/conf')
7 files changed, 35 insertions, 49 deletions
diff --git a/external/poky/meta-yocto-bsp/conf/layer.conf b/external/poky/meta-yocto-bsp/conf/layer.conf index 53e8722e..64b1248f 100644 --- a/external/poky/meta-yocto-bsp/conf/layer.conf +++ b/external/poky/meta-yocto-bsp/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" LAYERVERSION_yoctobsp = "4" -LAYERSERIES_COMPAT_yoctobsp = "thud" +LAYERSERIES_COMPAT_yoctobsp = "dunfell" diff --git a/external/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/external/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index e911e750..5b481434 100644 --- a/external/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/external/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -18,12 +18,13 @@ IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" EXTRA_IMAGECMD_jffs2 = "-lnp " WKS_FILE ?= "beaglebone-yocto.wks" IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" -SERIAL_CONSOLES = "115200;ttyO0" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" @@ -31,10 +32,27 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" SPL_BINARY = "MLO" UBOOT_SUFFIX = "img" -UBOOT_MACHINE = "am335x_boneblack_config" +UBOOT_MACHINE = "am335x_evm_defconfig" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" MACHINE_FEATURES = "usbgadget usbhost vfat alsa" IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" + +# support runqemu +EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" +IMAGE_CLASSES += "qemuboot" +QB_DEFAULT_FSTYPE = "wic" +QB_FSINFO = "wic:no-kernel-in-fs" +QB_KERNEL_ROOT = "/dev/vda2" +QB_SYSTEM_NAME = "qemu-system-arm" +QB_MACHINE = "-machine virt" +QB_CPU = "-cpu cortex-a15" +QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 systemd.mask=systemd-networkd" +QB_OPT_APPEND = "-device virtio-rng-device" +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" +QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" +QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" +QB_SERIAL_OPT = "" +QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" diff --git a/external/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/external/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index b7a94e9c..d6fd934f 100644 --- a/external/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/external/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Edgerouter -#@DESCRIPTION: Edgerouter +#@DESCRIPTION: Machine configuration for a generic edgerouter require conf/machine/include/tune-mips64.inc @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/external/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf b/external/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf index 12f7c0d2..81ec24e9 100644 --- a/external/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/external/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -1,10 +1,11 @@ #@TYPE: Machine -#@NAME: Generic X86_64. - -#@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. +#@NAME: Generic x86_64 +#@DESCRIPTION: Machine configuration for generic x86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. DEFAULTTUNE ?= "core2-64" require conf/machine/include/tune-core2.inc require conf/machine/include/genericx86-common.inc SERIAL_CONSOLES_CHECK = "ttyS0" +#For runqemu +QB_SYSTEM_NAME = "qemu-system-x86_64" diff --git a/external/poky/meta-yocto-bsp/conf/machine/genericx86.conf b/external/poky/meta-yocto-bsp/conf/machine/genericx86.conf index 798b62ec..1387bde8 100644 --- a/external/poky/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/external/poky/meta-yocto-bsp/conf/machine/genericx86.conf @@ -1,10 +1,11 @@ #@TYPE: Machine -#@NAME: Generic X86. - -#@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. +#@NAME: Generic x86 +#@DESCRIPTION: Machine configuration for generic x86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. DEFAULTTUNE ?= "core2-32" require conf/machine/include/tune-core2.inc require conf/machine/include/genericx86-common.inc MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" +#For runqemu +QB_SYSTEM_NAME = "qemu-system-i386" diff --git a/external/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/external/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index f83ce5c5..a6c396c7 100644 --- a/external/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/external/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -20,6 +20,7 @@ GLIBC_ADDONS = "nptl" EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= "genericx86.wks" +WKS_FILE ?= "genericx86.wks.in" +EFI_PROVIDER ??= "grub-efi" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" diff --git a/external/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/external/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf deleted file mode 100644 index 6f5b9859..00000000 --- a/external/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ /dev/null @@ -1,35 +0,0 @@ -#@TYPE: Machine -#@DESCRIPTION: Machine configuration for running - -TARGET_FPU = "" - -require conf/machine/include/tune-ppce300c3.inc - -KERNEL_IMAGETYPE = "uImage" - -EXTRA_IMAGEDEPENDS += "u-boot" -UBOOT_MACHINE = "MPC8315ERDB_config" - -SERIAL_CONSOLES = "115200;ttyS0" - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" - -PREFERRED_VERSION_linux-yocto ?= "4.18%" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xf86-video-fbdev" - -UBOOT_ENTRYPOINT = "0x00000000" - -KERNEL_DEVICETREE = "mpc8315erdb.dtb" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" - -IMAGE_FSTYPES ?= "jffs2 tar.bz2" -JFFS2_ERASEBLOCK = "0x4000" - -IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= 'mpc8315e-rdb.wks' -IMAGE_BOOT_FILES ?= "u-boot.bin uImage mpc8315erdb.dtb;dtb" |