diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta-yocto-bsp | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta-yocto-bsp')
-rw-r--r-- | poky/meta-yocto-bsp/README.hardware | 142 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/conf/layer.conf | 2 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/conf/machine/edgerouter.conf | 2 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 3 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 36 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | 15 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend | 27 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend | 27 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend | 23 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/wic/genericx86.wks.in (renamed from poky/meta-yocto-bsp/wic/genericx86.wks) | 2 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks | 4 |
13 files changed, 37 insertions, 250 deletions
diff --git a/poky/meta-yocto-bsp/README.hardware b/poky/meta-yocto-bsp/README.hardware index d8d2a0cac..5996be764 100644 --- a/poky/meta-yocto-bsp/README.hardware +++ b/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/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index c94bb0031..64b1248f5 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 = "zeus" +LAYERSERIES_COMPAT_yoctobsp = "dunfell" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 08dd3a507..5b481434b 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" 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 6331368f8..d6fd934fa 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -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 ?= "5.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" 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 f83ce5c59..a6c396c79 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/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/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf deleted file mode 100644 index 538279628..000000000 --- a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ /dev/null @@ -1,36 +0,0 @@ -#@TYPE: Machine -#@NAME: Freescale MPC8315E-RDB -#@DESCRIPTION: Machine configuration for Freescale MPC8315E-RDB - -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 ?= "5.2%" -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/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index 0a3a2cdc4..57599e19a 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 @@ -30,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) @@ -38,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 @@ -50,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/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend index f044dafb4..6e5a129dd 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/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/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 deleted file mode 100644 index ec269d905..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -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 ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_genericx86-64 ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_edgerouter ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_beaglebone-yocto ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_mpc8315e-rdb ?= "d419f4ca6ba4b097b8ad710a93b89510f5b2998c" - -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.34" -LINUX_VERSION_genericx86-64 = "4.19.34" -LINUX_VERSION_edgerouter = "4.19.34" -LINUX_VERSION_beaglebone-yocto = "4.19.34" -LINUX_VERSION_mpc8315e-rdb = "4.19.34" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend deleted file mode 100644 index f15bccbaf..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v5.2/standard/base" -KBRANCH_genericx86-64 = "v5.2/standard/base" -KBRANCH_edgerouter = "v5.2/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v5.2/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v5.2/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_genericx86-64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_edgerouter ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_beaglebone-yocto ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_mpc8315e-rdb ?= "77f031b182885c177b3a96098ae61271911a7954" - -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.2.17" -LINUX_VERSION_genericx86-64 = "5.2.17" -LINUX_VERSION_edgerouter = "5.2.17" -LINUX_VERSION_beaglebone-yocto = "5.2.17" -LINUX_VERSION_mpc8315e-rdb = "5.2.17" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend new file mode 100644 index 000000000..9734cd571 --- /dev/null +++ b/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 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_genericx86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_edgerouter ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_beaglebone-yocto ?= "f4d7dbafb103e4f782323017c239c548871c1567" + +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.20" +LINUX_VERSION_genericx86-64 = "5.4.20" +LINUX_VERSION_edgerouter = "5.4.20" +LINUX_VERSION_beaglebone-yocto = "5.4.20" diff --git a/poky/meta-yocto-bsp/wic/genericx86.wks b/poky/meta-yocto-bsp/wic/genericx86.wks.in index dab719c58..7c09ad00a 100644 --- a/poky/meta-yocto-bsp/wic/genericx86.wks +++ b/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/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks b/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks deleted file mode 100644 index d0cb607ff..000000000 --- a/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 |