From 87df4e002f6e5ad5499bbeaf22877bbfc08efdd7 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 9 Nov 2017 14:59:06 +0000 Subject: beaglebone-yocto: rename beaglebone machine to beaglebone-yocto The beaglebone BSP provided in this layer is a reference implementation usingonly mainline components available in core Yocto Project layers, whereas Texas Instruments maintain a full-featured BSP in the meta-ti layer. Rename the reference machine to prevent namespace collisions with the version maintained by the SoC vendor. [YOCTO #12326] (From meta-yocto rev: e32882938eca7f50548deab84dab78b4aef31b95) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 40 +++++++++++++++++++++++ meta-yocto-bsp/conf/machine/beaglebone.conf | 40 ----------------------- 2 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 meta-yocto-bsp/conf/machine/beaglebone-yocto.conf delete mode 100644 meta-yocto-bsp/conf/machine/beaglebone.conf (limited to 'meta-yocto-bsp/conf/machine') diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf new file mode 100644 index 0000000000..990c967416 --- /dev/null +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -0,0 +1,40 @@ +#@TYPE: Machine +#@NAME: Beaglebone-yocto machine +#@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards + +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +XSERVER ?= "xserver-xorg \ + xf86-video-modesetting \ + " + +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" + +EXTRA_IMAGEDEPENDS += "u-boot" + +DEFAULTTUNE ?= "cortexa8hf-neon" +include conf/machine/include/tune-cortexa8.inc + +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" + +SERIAL_CONSOLE = "115200 ttyO0" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "4.12%" + +KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" + +SPL_BINARY = "MLO" +UBOOT_SUFFIX = "img" +UBOOT_MACHINE = "am335x_boneblack_config" +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +MACHINE_FEATURES = "usbgadget usbhost vfat alsa" + +IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO" diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf deleted file mode 100644 index 1bdd4dfb70..0000000000 --- a/meta-yocto-bsp/conf/machine/beaglebone.conf +++ /dev/null @@ -1,40 +0,0 @@ -#@TYPE: Machine -#@NAME: Beaglebone machine -#@DESCRIPTION: Machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xf86-video-modesetting \ - " - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" - -EXTRA_IMAGEDEPENDS += "u-boot" - -DEFAULTTUNE ?= "cortexa8hf-neon" -include conf/machine/include/tune-cortexa8.inc - -IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" -EXTRA_IMAGECMD_jffs2 = "-lnp " -WKS_FILE ?= "beaglebone.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" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.12%" - -KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" - -SPL_BINARY = "MLO" -UBOOT_SUFFIX = "img" -UBOOT_MACHINE = "am335x_boneblack_config" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" - -MACHINE_FEATURES = "usbgadget usbhost vfat alsa" - -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO" -- cgit v1.2.3-54-g00ecf