diff options
Diffstat (limited to 'external/poky/meta-yocto-bsp')
17 files changed, 69 insertions, 262 deletions
diff --git a/external/poky/meta-yocto-bsp/README.hardware b/external/poky/meta-yocto-bsp/README.hardware index d8d2a0ca..5996be76 100644 --- a/external/poky/meta-yocto-bsp/README.hardware +++ b/external/poky/meta-yocto-bsp/README.hardware @@ -28,7 +28,6 @@ Hardware Reference Boards The following boards are supported by the meta-yocto-bsp layer: * Texas Instruments Beaglebone (beaglebone-yocto) - * Freescale MPC8315E-RDB (mpc8315e-rdb) * Ubiquiti Networks EdgeRouter Lite (edgerouter) * General IA platforms (genericx86 and genericx86-64) @@ -155,147 +154,6 @@ From a Linux system with access to the image files perform the following steps: 3. Insert the SD card into the Beaglebone and boot the board. -Freescale MPC8315E-RDB (mpc8315e-rdb) -===================================== - -The MPC8315 PowerPC reference platform (MPC8315E-RDB) is aimed at hardware and -software development of network attached storage (NAS) and digital media server -applications. The MPC8315E-RDB features the PowerQUICC II Pro processor, which -includes a built-in security accelerator. - -(Note: you may find it easier to order MPC8315E-RDBA; this appears to be the -same board in an enclosure with accessories. In any case it is fully -compatible with the instructions given here.) - -Setup instructions ------------------- - -You will need the following: -* NFS root setup on your workstation -* TFTP server installed on your workstation -* Straight-thru 9-conductor serial cable (DB9, M/F) connected from your - PC to UART1 -* Ethernet connected to the first ethernet port on the board - ---- Preparation --- - -Note: if you have altered your board's ethernet MAC address(es) from the -defaults, or you need to do so because you want multiple boards on the same -network, then you will need to change the values in the dts file (patch -linux/arch/powerpc/boot/dts/mpc8315erdb.dts within the kernel source). If -you have left them at the factory default then you shouldn't need to do -anything here. - -Note: To boot from USB disk you need u-boot that supports 'ext2load usb' -command. You need to setup TFTP server, load u-boot from there and -flash it to NOR flash. - -Beware! Flashing bootloader is potentially dangerous operation that can -brick your device if done incorrectly. Please, make sure you understand -what below commands mean before executing them. - -Load the new u-boot.bin from TFTP server to memory address 200000 -=> tftp 200000 u-boot.bin - -Disable flash protection -=> protect off all - -Erase the old u-boot from fe000000 to fe06ffff in NOR flash. -The size is 0x70000 (458752 bytes) -=> erase fe000000 fe06ffff - -Copy the new u-boot from address 200000 to fe000000 -the size is 0x70000. It has to be greater or equal to u-boot.bin size -=> cp.b 200000 fe000000 70000 - -Enable flash protection again -=> protect on all - -Reset the board -=> reset - ---- Booting from USB disk --- - - 1. Flash partitioned image to the USB disk - - # dd if=core-image-minimal-mpc8315e-rdb.wic of=/dev/sdb - - 2. Plug USB disk into the MPC8315 board - - 3. Connect the board's first serial port to your workstation and then start up - your favourite serial terminal so that you will be able to interact with - the serial console. If you don't have a favourite, picocom is suggested: - - $ picocom /dev/ttyUSB0 -b 115200 - - 4. Power up or reset the board and press a key on the terminal when prompted - to get to the U-Boot command line - - 5. Optional. Load the u-boot.bin from the USB disk: - - => usb start - => ext2load usb 0:1 200000 u-boot.bin - - and flash it to NOR flash as described above. - - 6. Load the kernel and dtb from the first partition of the USB disk: - - => usb start - => ext2load usb 0:1 1000000 uImage - => ext2load usb 0:1 2000000 dtb - - 7. Set bootargs and boot up the device - - => setenv bootargs root=/dev/sdb2 rw rootwait console=ttyS0,115200 - => bootm 1000000 - 2000000 - - ---- Booting from NFS root --- - -Load the kernel and dtb (device tree blob), and boot the system as follows: - - 1. Get the kernel (uImage-mpc8315e-rdb.bin) and dtb (uImage-mpc8315e-rdb.dtb) - files from the tmp/deploy directory, and make them available on your TFTP - server. - - 2. Connect the board's first serial port to your workstation and then start up - your favourite serial terminal so that you will be able to interact with - the serial console. If you don't have a favourite, picocom is suggested: - - $ picocom /dev/ttyUSB0 -b 115200 - - 3. Power up or reset the board and press a key on the terminal when prompted - to get to the U-Boot command line - - 4. Set up the environment in U-Boot: - - => setenv ipaddr <board ip> - => setenv serverip <tftp server ip> - => setenv bootargs root=/dev/nfs rw nfsroot=<nfsroot ip>:<rootfs path> ip=<board ip>:<server ip>:<gateway ip>:255.255.255.0:mpc8315e:eth0:off console=ttyS0,115200 - - 5. Download the kernel and dtb, and boot: - - => tftp 1000000 uImage-mpc8315e-rdb.bin - => tftp 2000000 uImage-mpc8315e-rdb.dtb - => bootm 1000000 - 2000000 - ---- Booting from JFFS2 root --- - - 1. First boot the board with NFS root. - - 2. Erase the MTD partition which will be used as root: - - $ flash_eraseall /dev/mtd3 - - 3. Copy the JFFS2 image to the MTD partition: - - $ flashcp core-image-minimal-mpc8315e-rdb.jffs2 /dev/mtd3 - - 4. Then reboot the board and set up the environment in U-Boot: - - => setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,115200 - - Ubiquiti Networks EdgeRouter Lite (edgerouter) ============================================== 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" diff --git a/external/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/external/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index dfd739ae..57599e19 100644 --- a/external/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/external/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py @@ -1,14 +1,11 @@ import os from oeqa.selftest.case import OESelftestTestCase -from oeqa.core.decorator.oeid import OETestID from oeqa.core.decorator.depends import OETestDepends from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu class Systemdboot(OESelftestTestCase): - @OETestID(1445) - @OETestID(1528) def test_efi_systemdboot_images_can_be_built(self): """ Summary: Check if systemd-boot images can be built correctly @@ -33,7 +30,7 @@ class Systemdboot(OESelftestTestCase): runCmd('rm -f %s' % systemdbootfile) # Build a genericx86-64/efi systemdboot image - bitbake('mtools-native core-image-minimal') + bitbake('mtools-native core-image-minimal wic-tools') found = os.path.isfile(systemdbootfile) self.assertTrue(found, 'Systemd-Boot file %s not found' % systemdbootfile) @@ -41,9 +38,9 @@ class Systemdboot(OESelftestTestCase): """ Summary: Check if EFI bootloader for systemd is correctly build Dependencies: Image was built correctly on testcase 1445 - Steps: 1. Copy bootx64.efi file form the hddimg created + Steps: 1. Copy bootx64.efi file from the wic created under build/tmp/deploy/images/genericx86-64 - 2. Check bootx64.efi was copied form hddimg + 2. Check bootx64.efi was copied from wic 3. Verify the checksums from the copied and previously created file are equal. Expected : Systemd-bootx64.efi and bootx64.efi should be the same @@ -53,16 +50,17 @@ class Systemdboot(OESelftestTestCase): AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> """ - systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.hddimg') + systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic') 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 if os.path.isfile(imagebootfile): runCmd('rm -f %s' % imagebootfile) - runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, - imagebootfile)) + sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') + + runCmd('wic cp %s:1/EFI/BOOT/bootx64.efi %s -n %s' % (systemdbootimage, + imagebootfile, sysroot)) found = os.path.isfile(imagebootfile) self.assertTrue(found, 'bootx64.efi file %s was not copied from image' diff --git a/external/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf b/external/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf index 2f40dae1..5da15888 100644 --- a/external/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf +++ b/external/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/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend index f044dafb..6e5a129d 100644 --- a/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -2,7 +2,6 @@ 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" @@ -12,4 +11,3 @@ 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/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend b/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend deleted file mode 100644 index bbe6eae5..00000000 --- a/external/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 ?= "57278e88a6b0f7c6230f7429cab7e74229f2b7ce" -SRCREV_machine_genericx86-64 ?= "57278e88a6b0f7c6230f7429cab7e74229f2b7ce" -SRCREV_machine_edgerouter ?= "16d624ede7ca9f71331b626685435ffee022dd32" -SRCREV_machine_beaglebone-yocto ?= "2e7b9777f352f70e2e9a82d8c403d3ea88d0bde3" -SRCREV_machine_mpc8315e-rdb ?= "9ff346785bdf42767b4002c41f5692f0a98b7480" - -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.154" -LINUX_VERSION_genericx86-64 = "4.14.154" -LINUX_VERSION_edgerouter = "4.14.154" -LINUX_VERSION_beaglebone-yocto = "4.14.154" -LINUX_VERSION_mpc8315e-rdb = "4.14.154" diff --git a/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend b/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend deleted file mode 100644 index 11b35cc1..00000000 --- a/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -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 ?= "b24d9d2146d4ce4ef3ad7251b936f35c69dcf0c4" -SRCREV_machine_genericx86-64 ?= "b24d9d2146d4ce4ef3ad7251b936f35c69dcf0c4" -SRCREV_machine_edgerouter ?= "b24d9d2146d4ce4ef3ad7251b936f35c69dcf0c4" -SRCREV_machine_beaglebone-yocto ?= "b24d9d2146d4ce4ef3ad7251b936f35c69dcf0c4" -SRCREV_machine_mpc8315e-rdb ?= "0802dc980cbc8bdb156d6fe305e7b88e6b602634" - -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.35" -LINUX_VERSION_genericx86-64 = "4.18.35" -LINUX_VERSION_edgerouter = "4.18.35" -LINUX_VERSION_beaglebone-yocto = "4.18.35" -LINUX_VERSION_mpc8315e-rdb = "4.18.35" diff --git a/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend new file mode 100644 index 00000000..62674854 --- /dev/null +++ b/external/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -0,0 +1,23 @@ +KBRANCH_genericx86 = "v5.4/standard/base" +KBRANCH_genericx86-64 = "v5.4/standard/base" +KBRANCH_edgerouter = "v5.4/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.4/standard/beaglebone" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb" +SRCREV_machine_genericx86-64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb" +SRCREV_machine_edgerouter ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb" +SRCREV_machine_beaglebone-yocto ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION_genericx86 = "5.4.49" +LINUX_VERSION_genericx86-64 = "5.4.49" +LINUX_VERSION_edgerouter = "5.4.49" +LINUX_VERSION_beaglebone-yocto = "5.4.49" diff --git a/external/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks b/external/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks index b75f238d..97bd480a 100644 --- a/external/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks +++ b/external/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" diff --git a/external/poky/meta-yocto-bsp/wic/genericx86.wks b/external/poky/meta-yocto-bsp/wic/genericx86.wks.in index dab719c5..7c09ad00 100644 --- a/external/poky/meta-yocto-bsp/wic/genericx86.wks +++ b/external/poky/meta-yocto-bsp/wic/genericx86.wks.in @@ -1,6 +1,6 @@ # short-description: Create an EFI disk image for genericx86* # long-description: Creates a partitioned EFI disk image for genericx86* machines -part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024 +part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid part swap --ondisk sda --size 44 --label swap1 --fstype=swap diff --git a/external/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks b/external/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks deleted file mode 100644 index d0cb607f..00000000 --- a/external/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks +++ /dev/null @@ -1,4 +0,0 @@ -# short-description: Create SD card image for MPC8315E-RDB -# long-description: Create a partitioned SD card image for Freescale MPC8315E-RDB reference hardware. -part /boot --source bootimg-partition --ondisk sdb --fstype=ext3 --label boot -part / --source rootfs --ondisk sdb --fstype=ext3 --label root |