diff options
Diffstat (limited to 'poky/meta-yocto-bsp')
12 files changed, 73 insertions, 44 deletions
diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index 53e8722e8..3c8f775bc 100644 --- a/poky/meta-yocto-bsp/conf/layer.conf +++ b/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 = "warrior" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index e911e7500..70d3cfea3 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -20,10 +20,11 @@ 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" -SERIAL_CONSOLES = "115200;ttyO0" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.0%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index b7a94e9cb..88592dbc8 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/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.0%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf b/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf index 12f7c0d20..c489462dc 100644 --- a/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -1,7 +1,6 @@ #@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 diff --git a/poky/meta-yocto-bsp/conf/machine/genericx86.conf b/poky/meta-yocto-bsp/conf/machine/genericx86.conf index 798b62ec2..9929d2788 100644 --- a/poky/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/poky/meta-yocto-bsp/conf/machine/genericx86.conf @@ -1,7 +1,6 @@ #@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 diff --git a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 6f5b9859d..e2dce5673 100644 --- a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -1,5 +1,6 @@ #@TYPE: Machine -#@DESCRIPTION: Machine configuration for running +#@NAME: Freescale MPC8315E-RDB +#@DESCRIPTION: Machine configuration for Freescale MPC8315E-RDB TARGET_FPU = "" @@ -14,7 +15,7 @@ SERIAL_CONSOLES = "115200;ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.0%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" diff --git a/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf b/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf index 2f40dae15..5da15888d 100644 --- a/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf +++ b/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf @@ -5,6 +5,7 @@ EndSection Section "Device" Identifier "Builtin Default fbdev Device 0" Driver "modesetting" + Option "AccelMethod" "none" EndSection Section "Screen" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend deleted file mode 100644 index 502485a94..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v4.14/standard/base" -KBRANCH_genericx86-64 = "v4.14/standard/base" -KBRANCH_edgerouter = "v4.14/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v4.14/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v4.14/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_machine_genericx86-64 ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_machine_edgerouter ?= "e06bfa18c727bd0e6e10cf26d9f161e4c791f52b" -SRCREV_machine_beaglebone-yocto ?= "b8805de77dcf8f59d8368fee4921c146c1300a6a" -SRCREV_machine_mpc8315e-rdb ?= "f88e87360b10f8fbd853a7d412982e6620f3f96d" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" - -LINUX_VERSION_genericx86 = "4.14.76" -LINUX_VERSION_genericx86-64 = "4.14.76" -LINUX_VERSION_edgerouter = "4.14.71" -LINUX_VERSION_beaglebone-yocto = "4.14.71" -LINUX_VERSION_mpc8315e-rdb = "4.14.71" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend index 7f15843f3..e53bb51f2 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend @@ -8,8 +8,8 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "db2d813869a0501782469ecdb17e277a501c9f57" -SRCREV_machine_genericx86-64 ?= "db2d813869a0501782469ecdb17e277a501c9f57" +SRCREV_machine_genericx86 ?= "62f0a3acffffd555f68ed97d5e4faade2b28f3c0" +SRCREV_machine_genericx86-64 ?= "62f0a3acffffd555f68ed97d5e4faade2b28f3c0" SRCREV_machine_edgerouter ?= "28e7781d57a59227bf1c08c7f3dbdfee16aa0dc2" SRCREV_machine_beaglebone-yocto ?= "28e7781d57a59227bf1c08c7f3dbdfee16aa0dc2" SRCREV_machine_mpc8315e-rdb ?= "99071a599d8650b069fb8135866fca203f375350" @@ -20,8 +20,8 @@ COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" -LINUX_VERSION_genericx86 = "4.18.22" -LINUX_VERSION_genericx86-64 = "4.18.22" +LINUX_VERSION_genericx86 = "4.18.27" +LINUX_VERSION_genericx86-64 = "4.18.27" LINUX_VERSION_edgerouter = "4.18.25" LINUX_VERSION_beaglebone-yocto = "4.18.25" LINUX_VERSION_mpc8315e-rdb = "4.18.25" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend new file mode 100644 index 000000000..8e708cb66 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v4.19/standard/base" +KBRANCH_genericx86-64 = "v4.19/standard/base" +KBRANCH_edgerouter = "v4.19/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.19/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.19/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_genericx86-64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_edgerouter ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_beaglebone-yocto ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_mpc8315e-rdb ?= "8b60f968823256f5d2889c4520d70299ca21411b" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" + +LINUX_VERSION_genericx86 = "4.19.14" +LINUX_VERSION_genericx86-64 = "4.19.14" +LINUX_VERSION_edgerouter = "4.19.14" +LINUX_VERSION_beaglebone-yocto = "4.19.14" +LINUX_VERSION_mpc8315e-rdb = "4.19.14" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend new file mode 100644 index 000000000..5cf6e1f06 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v5.0/standard/base" +KBRANCH_genericx86-64 = "v5.0/standard/base" +KBRANCH_edgerouter = "v5.0/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.0/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v5.0/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_mpc8315e-rdb ?= "8b62af7f252af10588276802c4c6d7c502e875be" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" + +LINUX_VERSION_genericx86 = "5.0.3" +LINUX_VERSION_genericx86-64 = "5.0.3" +LINUX_VERSION_edgerouter = "5.0.3" +LINUX_VERSION_beaglebone-yocto = "5.0.3" +LINUX_VERSION_mpc8315e-rdb = "5.0.3" diff --git a/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks index b75f238df..97bd480a0 100644 --- a/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks +++ b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks @@ -4,3 +4,4 @@ part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 --sourceparams="loader=u-boot" --use-uuid part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4 --use-uuid +bootloader --append="console=ttyS0,115200" |
