diff options
Diffstat (limited to 'meta-yocto-bsp/conf')
-rw-r--r-- | meta-yocto-bsp/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 28 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/edgerouter.conf | 26 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/genericarm64.conf | 60 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86-64.conf | 3 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86.conf | 3 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 10 |
7 files changed, 78 insertions, 54 deletions
diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index bf0c1bfece..60902b4de9 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf | |||
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" | |||
9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_yoctobsp = "5" | 10 | BBFILE_PRIORITY_yoctobsp = "5" |
11 | LAYERVERSION_yoctobsp = "4" | 11 | LAYERVERSION_yoctobsp = "4" |
12 | LAYERSERIES_COMPAT_yoctobsp = "gatesgarth" | 12 | LAYERSERIES_COMPAT_yoctobsp = "scarthgap" |
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index f8368ebd0e..459c83f5c2 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | |||
@@ -3,42 +3,38 @@ | |||
3 | #@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards | 3 | #@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards |
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
6 | XSERVER ?= "xserver-xorg \ | ||
7 | xf86-video-modesetting \ | ||
8 | " | ||
9 | 6 | ||
10 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" | 7 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" |
11 | 8 | ||
12 | EXTRA_IMAGEDEPENDS += "u-boot" | 9 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
13 | 10 | ||
14 | DEFAULTTUNE ?= "cortexa8hf-neon" | 11 | DEFAULTTUNE ?= "cortexa8hf-neon" |
15 | include conf/machine/include/tune-cortexa8.inc | 12 | include conf/machine/include/arm/armv7a/tune-cortexa8.inc |
16 | 13 | ||
17 | IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" | 14 | IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" |
18 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 15 | EXTRA_IMAGECMD:jffs2 = "-lnp " |
19 | WKS_FILE ?= "beaglebone-yocto.wks" | 16 | WKS_FILE ?= "beaglebone-yocto.wks" |
20 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" | 17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree" |
21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" | 18 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" |
22 | 19 | ||
23 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" | 20 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" |
24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
25 | 21 | ||
26 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 22 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
27 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | 23 | PREFERRED_VERSION_linux-yocto ?= "6.6%" |
28 | 24 | ||
29 | KERNEL_IMAGETYPE = "zImage" | 25 | KERNEL_IMAGETYPE = "zImage" |
30 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" | 26 | DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" |
31 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | 27 | KERNEL_DEVICETREE = '${@' '.join('ti/omap/%s' % d for d in '${DTB_FILES}'.split())}' |
28 | |||
29 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" | ||
32 | 30 | ||
33 | SPL_BINARY = "MLO" | 31 | SPL_BINARY = "MLO" |
34 | UBOOT_SUFFIX = "img" | 32 | UBOOT_SUFFIX = "img" |
35 | UBOOT_MACHINE = "am335x_evm_defconfig" | 33 | UBOOT_MACHINE = "am335x_evm_defconfig" |
36 | UBOOT_ENTRYPOINT = "0x80008000" | ||
37 | UBOOT_LOADADDRESS = "0x80008000" | ||
38 | 34 | ||
39 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" | 35 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" |
40 | 36 | ||
41 | IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" | 37 | IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${DTB_FILES}" |
42 | 38 | ||
43 | # support runqemu | 39 | # support runqemu |
44 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" | 40 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" |
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf deleted file mode 100644 index fbe33be9d1..0000000000 --- a/meta-yocto-bsp/conf/machine/edgerouter.conf +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: Edgerouter | ||
3 | #@DESCRIPTION: Machine configuration for a generic edgerouter | ||
4 | |||
5 | require conf/machine/include/tune-mips64.inc | ||
6 | |||
7 | MACHINE_FEATURES = "pci ext2 ext3 serial" | ||
8 | |||
9 | KERNEL_IMAGETYPE = "vmlinux" | ||
10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | ||
11 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" | ||
12 | |||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
14 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | ||
15 | |||
16 | SERIAL_CONSOLES = "115200;ttyS0" | ||
17 | USE_VT ?= "0" | ||
18 | |||
19 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | ||
20 | |||
21 | IMAGE_FSTYPES ?= "jffs2 tar.bz2 wic wic.bmap" | ||
22 | JFFS2_ERASEBLOCK = "0x10000" | ||
23 | |||
24 | WKS_FILE ?= "edgerouter.wks" | ||
25 | IMAGE_BOOT_FILES ?= "vmlinux;vmlinux.64" | ||
26 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | ||
diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf new file mode 100644 index 0000000000..4fa9395b31 --- /dev/null +++ b/meta-yocto-bsp/conf/machine/genericarm64.conf | |||
@@ -0,0 +1,60 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: genericarm64 | ||
3 | #@DESCRIPTION: Generic Arm64 machine for typical SystemReady IR/ES platforms, which | ||
4 | #have working firmware and boot via EFI. | ||
5 | |||
6 | require conf/machine/include/arm/arch-armv8a.inc | ||
7 | |||
8 | # Arm Base System Architecture says v8.0+ is allowed, but FEAT_CRC32 is required | ||
9 | DEFAULTTUNE = "armv8a-crc" | ||
10 | |||
11 | MACHINE_FEATURES = "acpi alsa bluetooth efi keyboard pci qemu-usermode rtc screen usbhost vfat wifi" | ||
12 | |||
13 | KERNEL_IMAGETYPE = "Image" | ||
14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
15 | |||
16 | # Install all the kernel modules into the rootfs | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" | ||
18 | # Install selected pieces of firmware | ||
19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx linux-firmware-wl18xx linux-firmware-rtl-nic" | ||
20 | |||
21 | # Use an initramfs and populate it with the kernel modules and key firmware | ||
22 | INITRAMFS_IMAGE ?= "core-image-initramfs-boot" | ||
23 | PACKAGE_INSTALL:append:pn-core-image-initramfs-boot = " ${MACHINE_EXTRA_RRECOMMENDS}" | ||
24 | |||
25 | IMAGE_FSTYPES ?= "wic" | ||
26 | WKS_FILE ?= "genericarm64.wks.in" | ||
27 | |||
28 | EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" | ||
29 | |||
30 | # Try to bring up one physical serial console, or a virtualized serial console | ||
31 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | ||
32 | |||
33 | # Allow u-boot to be built for use with qemu-system-aarch64. | ||
34 | # This u-boot is _not_ suitable for use with real hardware, and the expectation | ||
35 | # of this machine is that real hardware comes with the firmware pre-loaded. | ||
36 | UBOOT_MACHINE = "qemu_arm64_defconfig" | ||
37 | |||
38 | # runqemu configuration to run a genericarm64 image inside a qemu-system-aarch64. You will need | ||
39 | # to build u-boot explicitly. | ||
40 | IMAGE_CLASSES += "qemuboot" | ||
41 | QB_SYSTEM_NAME = "qemu-system-aarch64" | ||
42 | # Boot the virtual machine with either an emulated Cortex-A76, or the host if using KVM | ||
43 | QB_MACHINE = "-machine virt" | ||
44 | QB_CPU = "-cpu cortex-a76" | ||
45 | QB_CPU_KVM = "-cpu host -machine gic-version=3" | ||
46 | QB_SMP = "-smp 4" | ||
47 | # Boot into U-Boot and let that scan the disk for the next step, don't pass any kernel or filesystem hints | ||
48 | QB_DEFAULT_BIOS = "u-boot.bin" | ||
49 | QB_DEFAULT_KERNEL = "none" | ||
50 | QB_DEFAULT_FSTYPE = "wic" | ||
51 | QB_FSINFO = "wic:no-kernel-in-fs" | ||
52 | # Mount the wic rootfs as a virtio block device | ||
53 | QB_ROOTFS_OPT = "-drive id=root,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=root" | ||
54 | # Virtio graphics | ||
55 | QB_GRAPHICS = "-device virtio-gpu-pci" | ||
56 | # Virtio serial consoles | ||
57 | QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | ||
58 | QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" | ||
59 | # Virtio networking | ||
60 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | ||
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 81ec24e971..f19a1c1527 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf | |||
@@ -3,9 +3,8 @@ | |||
3 | #@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. | 3 | #@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. |
4 | 4 | ||
5 | DEFAULTTUNE ?= "core2-64" | 5 | DEFAULTTUNE ?= "core2-64" |
6 | require conf/machine/include/tune-core2.inc | 6 | require conf/machine/include/x86/tune-core2.inc |
7 | require conf/machine/include/genericx86-common.inc | 7 | require conf/machine/include/genericx86-common.inc |
8 | 8 | ||
9 | SERIAL_CONSOLES_CHECK = "ttyS0" | ||
10 | #For runqemu | 9 | #For runqemu |
11 | QB_SYSTEM_NAME = "qemu-system-x86_64" | 10 | QB_SYSTEM_NAME = "qemu-system-x86_64" |
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 1387bde852..34e1448a8c 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf | |||
@@ -3,9 +3,8 @@ | |||
3 | #@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. | 3 | #@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. |
4 | 4 | ||
5 | DEFAULTTUNE ?= "core2-32" | 5 | DEFAULTTUNE ?= "core2-32" |
6 | require conf/machine/include/tune-core2.inc | 6 | require conf/machine/include/x86/tune-core2.inc |
7 | require conf/machine/include/genericx86-common.inc | 7 | require conf/machine/include/genericx86-common.inc |
8 | 8 | ||
9 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" | ||
10 | #For runqemu | 9 | #For runqemu |
11 | QB_SYSTEM_NAME = "qemu-system-i386" | 10 | QB_SYSTEM_NAME = "qemu-system-i386" |
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 1de069011d..50a233dd8f 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
@@ -1,8 +1,8 @@ | |||
1 | include conf/machine/include/x86-base.inc | 1 | include conf/machine/include/x86/x86-base.inc |
2 | require conf/machine/include/qemuboot-x86.inc | 2 | require conf/machine/include/x86/qemuboot-x86.inc |
3 | MACHINE_FEATURES += "wifi efi pcbios" | 3 | MACHINE_FEATURES += "wifi efi pcbios" |
4 | 4 | ||
5 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | 5 | PREFERRED_VERSION_linux-yocto ?= "6.6%" |
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
8 | XSERVER ?= "${XSERVER_X86_BASE} \ | 8 | XSERVER ?= "${XSERVER_X86_BASE} \ |
@@ -16,10 +16,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
16 | 16 | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" | 17 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" |
18 | 18 | ||
19 | GLIBC_ADDONS = "nptl" | ||
20 | |||
21 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | ||
22 | |||
23 | IMAGE_FSTYPES += "wic wic.bmap" | 19 | IMAGE_FSTYPES += "wic wic.bmap" |
24 | WKS_FILE ?= "genericx86.wks.in" | 20 | WKS_FILE ?= "genericx86.wks.in" |
25 | EFI_PROVIDER ??= "grub-efi" | 21 | EFI_PROVIDER ??= "grub-efi" |