diff options
-rw-r--r-- | meta-yocto-bsp/conf/machine/beaglebone.conf | 3 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/edgerouter.conf | 3 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 1 | ||||
-rw-r--r-- | meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 5 |
4 files changed, 1 insertions, 11 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf index 4019e25a1e0..63d383bb1d1 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone.conf @@ -22,9 +22,6 @@ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do SERIAL_CONSOLE = "115200 ttyO0" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.10%" - KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf index a9cb1f55d93..8e288d53bb9 100644 --- a/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -10,9 +10,6 @@ KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.10%" - SERIAL_CONSOLE = "115200 ttyS0" USE_VT ?= "0" diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index e35685cb22b..37e4c8b2860 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -2,7 +2,6 @@ include conf/machine/include/x86-base.inc require conf/machine/include/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index ce5015256a2..664526ecd3f 100644 --- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/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 = "" @@ -14,9 +14,6 @@ SERIAL_CONSOLE = "115200 ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "4.10%" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" - PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xf86-video-fbdev" |