diff options
Diffstat (limited to 'poky/meta-yocto-bsp')
12 files changed, 84 insertions, 122 deletions
diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index 6472238e6..53e8722e8 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 = "sumo" +LAYERSERIES_COMPAT_yoctobsp = "thud" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index ae682a47d..e911e7500 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -20,10 +20,10 @@ 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_CONSOLE = "115200 ttyO0" +SERIAL_CONSOLES = "115200;ttyO0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.15%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" @@ -37,4 +37,4 @@ UBOOT_LOADADDRESS = "0x80008000" MACHINE_FEATURES = "usbgadget usbhost vfat alsa" -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO" +IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage 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 61f2145fd..b7a94e9cb 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,9 +11,9 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.15%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" -SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" diff --git a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index e35685cb2..f83ce5c59 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -13,7 +13,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_MODESETTING} \ " -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware eee-acpi-scripts" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" GLIBC_ADDONS = "nptl" diff --git a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 34f12303a..6f5b9859d 100644 --- a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@DESCRIPTION: Machine configuration for running +#@DESCRIPTION: Machine configuration for running TARGET_FPU = "" @@ -10,12 +10,12 @@ KERNEL_IMAGETYPE = "uImage" EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE = "MPC8315ERDB_config" -SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLES = "115200;ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "4.15%" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ @@ -32,4 +32,4 @@ JFFS2_ERASEBLOCK = "0x4000" IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= 'mpc8315e-rdb.wks' -IMAGE_BOOT_FILES ?= "u-boot.bin uImage uImage-mpc8315erdb.dtb;dtb" +IMAGE_BOOT_FILES ?= "u-boot.bin uImage mpc8315erdb.dtb;dtb" diff --git a/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index 26c775c09..dfd739ae7 100644 --- a/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py @@ -6,26 +6,9 @@ from oeqa.core.decorator.depends import OETestDepends from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu class Systemdboot(OESelftestTestCase): - def _common_setup(self): - """ - Common setup for test cases: 1445, 1528 - """ - - # Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in conf/local.conf - features = 'EFI_PROVIDER = "systemd-boot"\n' - features += 'MACHINE = "genericx86-64"' - self.append_config(features) - - def _common_build(self): - """ - Common build for test cases: 1445 , 1528 - """ - - # Build a genericx86-64/efi systemdboot image - bitbake('mtools-native core-image-minimal') - @OETestID(1445) + @OETestID(1528) def test_efi_systemdboot_images_can_be_built(self): """ Summary: Check if systemd-boot images can be built correctly @@ -36,26 +19,25 @@ class Systemdboot(OESelftestTestCase): AutomatedBy: Jose Perez Carranza <jose.perez.carranza@intel.com> """ - # We'd use DEPLOY_DIR_IMAGE here, except that we need its value for - # MACHINE="genericx86-64 which is probably not the one configured - systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'systemd-bootx64.efi') + # Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in conf/local.conf + features = 'EFI_PROVIDER = "systemd-boot"\n' + features += 'MACHINE = "genericx86-64"' + self.append_config(features) - self._common_setup() + deploydir = get_bb_var('DEPLOY_DIR_IMAGE', "core-image-minimal") + systemdbootfile = os.path.join(deploydir, 'systemd-bootx64.efi') # Ensure we're actually testing that this gets built and not that # it was around from an earlier build bitbake('-c clean systemd-boot') runCmd('rm -f %s' % systemdbootfile) - self._common_build() + # Build a genericx86-64/efi systemdboot image + bitbake('mtools-native core-image-minimal') found = os.path.isfile(systemdbootfile) self.assertTrue(found, 'Systemd-Boot file %s not found' % systemdbootfile) - @OETestID(1528) - @OETestDepends(['systemd_boot.Systemdboot.test_efi_systemdboot_images_can_be_built']) - def test_image_efi_file(self): - """ Summary: Check if EFI bootloader for systemd is correctly build Dependencies: Image was built correctly on testcase 1445 @@ -71,28 +53,21 @@ class Systemdboot(OESelftestTestCase): AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> """ - systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', - 'systemd-bootx64.efi') - systemdbootimage = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', - 'core-image-minimal-genericx86-64.hddimg') - imagebootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', - 'bootx64.efi') - mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE'), 'mcopy') + systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.hddimg') + imagebootfile = os.path.join(deploydir, 'bootx64.efi') + mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE', "core-image-minimal"), 'mcopy') - #Clean environment before start the test + # Clean environment before start the test if os.path.isfile(imagebootfile): runCmd('rm -f %s' % imagebootfile) - #Step 1 - runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, + runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, imagebootfile)) - #Step 2 - found = os.path.isfile(imagebootfile) - self.assertTrue(found, 'bootx64.efi file %s was not copied from image' + found = os.path.isfile(imagebootfile) + self.assertTrue(found, 'bootx64.efi file %s was not copied from image' % imagebootfile) - #Step 3 - result = runCmd('md5sum %s %s' % (systemdbootfile, imagebootfile)) - self.assertEqual(result.output.split()[0], result.output.split()[2], + result = runCmd('md5sum %s %s' % (systemdbootfile, imagebootfile)) + self.assertEqual(result.output.split()[0], result.output.split()[2], '%s was not correclty generated' % imagebootfile) diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 000000000..f044dafb4 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,15 @@ +KBRANCH_genericx86 = "standard/base" +KBRANCH_genericx86-64 = "standard/base" +KBRANCH_edgerouter = "standard/edgerouter" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +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" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend deleted file mode 100644 index 642809a38..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -KBRANCH_genericx86 = "standard/base" -KBRANCH_genericx86-64 = "standard/base" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone-yocto = "standard/beaglebone" -KMACHINE_beaglebone-yocto = "beaglebone" -KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" - -SRCREV_machine_genericx86 ?= "7e7ac3f0fda9707e94b3311a4510ae080cd86238" -SRCREV_machine_genericx86-64 ?= "7e7ac3f0fda9707e94b3311a4510ae080cd86238" -SRCREV_machine_edgerouter ?= "89e003746eee54e86bc78e1170e7029d6597b583" -SRCREV_machine_beaglebone-yocto ?= "89e003746eee54e86bc78e1170e7029d6597b583" -SRCREV_machine_mpc8315e-rdb ?= "7080a5fe6af338576207fff999ea2ca35e689997" - - -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.12.24" -LINUX_VERSION_genericx86-64 = "4.12.24" -LINUX_VERSION_edgerouter = "4.12.24" -LINUX_VERSION_beaglebone-yocto = "4.12.24" -LINUX_VERSION_mpc8315e-rdb = "4.12.24" 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 index feb8d2e49..502485a94 100644 --- 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 @@ -8,11 +8,11 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" -SRCREV_machine_genericx86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" -SRCREV_machine_edgerouter ?= "65d1c849534179bbfa494f77947f8be615e9871a" -SRCREV_machine_beaglebone-yocto ?= "d62ddfa26a59c83f6128790b7aa2baadc04d2960" -SRCREV_machine_mpc8315e-rdb ?= "80a106ecf737b69864e07b955eccb62f809cf120" +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" @@ -20,8 +20,8 @@ COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" -LINUX_VERSION_genericx86 = "4.14.67" -LINUX_VERSION_genericx86-64 = "4.14.67" -LINUX_VERSION_edgerouter = "4.14.48" -LINUX_VERSION_beaglebone-yocto = "4.14.48" -LINUX_VERSION_mpc8315e-rdb = "4.14.48" +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.15.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend deleted file mode 100644 index 461daa050..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v4.15/standard/base" -KBRANCH_genericx86-64 = "v4.15/standard/base" -KBRANCH_edgerouter = "v4.15/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v4.15/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v4.15/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "51273ff79f4ad930f4a788257f58e1266cb236e3" -SRCREV_machine_genericx86-64 ?= "51273ff79f4ad930f4a788257f58e1266cb236e3" -SRCREV_machine_edgerouter ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" -SRCREV_machine_beaglebone-yocto ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" -SRCREV_machine_mpc8315e-rdb ?= "0b32edc46dfe7c40bf5451e9b7533c823bb2c6c4" - -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.15.18" -LINUX_VERSION_genericx86-64 = "4.15.18" -LINUX_VERSION_edgerouter = "4.15.18" -LINUX_VERSION_beaglebone-yocto = "4.15.18" -LINUX_VERSION_mpc8315e-rdb = "4.15.18" 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 new file mode 100644 index 000000000..bb599d8c5 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v4.18/standard/base" +KBRANCH_genericx86-64 = "v4.18/standard/base" +KBRANCH_edgerouter = "v4.18/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.18/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.18/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" +SRCREV_machine_genericx86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" +SRCREV_machine_edgerouter ?= "0cdc8564c61958a39704d97e008120bd7c762f60" +SRCREV_machine_beaglebone-yocto ?= "0cdc8564c61958a39704d97e008120bd7c762f60" +SRCREV_machine_mpc8315e-rdb ?= "20be2231bb047b02248d7f965c1c3af0c6be3a5e" + +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.18.14" +LINUX_VERSION_genericx86-64 = "4.18.14" +LINUX_VERSION_edgerouter = "4.18.9" +LINUX_VERSION_beaglebone-yocto = "4.18.9" +LINUX_VERSION_mpc8315e-rdb = "4.18.9" diff --git a/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks index 967cad78b..b75f238df 100644 --- a/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks +++ b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks @@ -2,5 +2,5 @@ # long-description: Creates a partitioned SD card image for Beaglebone. # Boot files are located in the first vfat partition. -part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 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 |