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/README.hardware | 6 ++-- meta-yocto-bsp/conf/layer.conf | 2 +- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 40 ++++++++++++++++++++++ meta-yocto-bsp/conf/machine/beaglebone.conf | 40 ---------------------- .../formfactor/beaglebone-yocto/machconfig | 3 ++ .../formfactor/formfactor/beaglebone/machconfig | 3 -- .../xserver-xf86-config/beaglebone-yocto/xorg.conf | 20 +++++++++++ .../xserver-xf86-config/beaglebone/xorg.conf | 20 ----------- .../recipes-kernel/linux/linux-yocto_4.10.bbappend | 9 ++--- .../recipes-kernel/linux/linux-yocto_4.12.bbappend | 9 ++--- .../recipes-kernel/linux/linux-yocto_4.4.bbappend | 9 ++--- .../recipes-kernel/linux/linux-yocto_4.9.bbappend | 9 ++--- meta-yocto-bsp/wic/beaglebone-yocto.wks | 6 ++++ meta-yocto-bsp/wic/beaglebone.wks | 6 ---- 14 files changed, 93 insertions(+), 89 deletions(-) create mode 100644 meta-yocto-bsp/conf/machine/beaglebone-yocto.conf delete mode 100644 meta-yocto-bsp/conf/machine/beaglebone.conf create mode 100644 meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig delete mode 100644 meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone/machconfig create mode 100644 meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf delete mode 100644 meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone/xorg.conf create mode 100644 meta-yocto-bsp/wic/beaglebone-yocto.wks delete mode 100644 meta-yocto-bsp/wic/beaglebone.wks (limited to 'meta-yocto-bsp') diff --git a/meta-yocto-bsp/README.hardware b/meta-yocto-bsp/README.hardware index 84c5afa909..d8d2a0cac6 100644 --- a/meta-yocto-bsp/README.hardware +++ b/meta-yocto-bsp/README.hardware @@ -27,7 +27,7 @@ Hardware Reference Boards The following boards are supported by the meta-yocto-bsp layer: - * Texas Instruments Beaglebone (beaglebone) + * Texas Instruments Beaglebone (beaglebone-yocto) * Freescale MPC8315E-RDB (mpc8315e-rdb) * Ubiquiti Networks EdgeRouter Lite (edgerouter) * General IA platforms (genericx86 and genericx86-64) @@ -120,7 +120,7 @@ USB Device: dd command to write the image to a USB stick. -Texas Instruments Beaglebone (beaglebone) +Texas Instruments Beaglebone (beaglebone-yocto) ========================================= The Beaglebone is an ARM Cortex-A8 development board with USB, Ethernet, 2D/3D @@ -151,7 +151,7 @@ From a Linux system with access to the image files perform the following steps: 2. Use the "dd" utility to write the image to the SD card. For example: - # dd core-image-minimal-beaglebone.wic of=/dev/sdb + # dd core-image-minimal-beaglebone-yocto.wic of=/dev/sdb 3. Insert the SD card into the Beaglebone and boot the board. diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index 7b565f222a..e10056e046 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf @@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" -LAYERVERSION_yoctobsp = "3" +LAYERVERSION_yoctobsp = "4" LAYERSERIES_COMPAT_yoctobsp = "rocko" 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" diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig new file mode 100644 index 0000000000..ffce012270 --- /dev/null +++ b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig @@ -0,0 +1,3 @@ +# Assume a USB mouse and keyboard are connected +HAVE_TOUCHSCREEN=0 +HAVE_KEYBOARD=1 diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone/machconfig b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone/machconfig deleted file mode 100644 index ffce012270..0000000000 --- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone/machconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Assume a USB mouse and keyboard are connected -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=1 diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf new file mode 100644 index 0000000000..2f40dae157 --- /dev/null +++ b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf @@ -0,0 +1,20 @@ +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "modesetting" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + DefaultDepth 16 + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone/xorg.conf b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone/xorg.conf deleted file mode 100644 index 2f40dae157..0000000000 --- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone/xorg.conf +++ /dev/null @@ -1,20 +0,0 @@ -Section "Monitor" - Identifier "Builtin Default Monitor" -EndSection - -Section "Device" - Identifier "Builtin Default fbdev Device 0" - Driver "modesetting" -EndSection - -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - DefaultDepth 16 - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection - -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend index e1f359c9e8..346a1c7935 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend @@ -4,23 +4,24 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_genericx86-64 ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_edgerouter ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" -SRCREV_machine_beaglebone ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" +SRCREV_machine_beaglebone-yocto ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_mpc8315e-rdb ?= "c388fdfc9a1e06b22ca3533a023f4d67a6fc1e9b" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.10.17" LINUX_VERSION_genericx86-64 = "4.10.17" LINUX_VERSION_edgerouter = "4.10.17" -LINUX_VERSION_beaglebone = "4.10.17" +LINUX_VERSION_beaglebone-yocto = "4.10.17" LINUX_VERSION_mpc8315e-rdb = "4.10.17" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend index 06ea8f89c3..2609129e3c 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend @@ -4,24 +4,25 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_machine_genericx86-64 ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_machine_edgerouter ?= "16de0149674ed12d983b77a453852ac2e64584b4" -SRCREV_machine_beaglebone ?= "16de0149674ed12d983b77a453852ac2e64584b4" +SRCREV_machine_beaglebone-yocto ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_machine_mpc8315e-rdb ?= "8c360c7c3eebeb9251ddd8e9cde39908677f5850" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.12.12" LINUX_VERSION_genericx86-64 = "4.12.12" LINUX_VERSION_edgerouter = "4.12.12" -LINUX_VERSION_beaglebone = "4.12.12" +LINUX_VERSION_beaglebone-yocto = "4.12.12" LINUX_VERSION_mpc8315e-rdb = "4.12.12" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend index 427af4c4cf..5725c879df 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -4,23 +4,24 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" SRCREV_machine_genericx86-64 ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" SRCREV_machine_edgerouter ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" -SRCREV_machine_beaglebone ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" +SRCREV_machine_beaglebone-yocto ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" SRCREV_machine_mpc8315e-rdb ?= "b4daa4e9d68862e559d726b0b66b7be605889b9e" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.4.87" LINUX_VERSION_genericx86-64 = "4.4.87" LINUX_VERSION_edgerouter = "4.4.87" -LINUX_VERSION_beaglebone = "4.4.87" +LINUX_VERSION_beaglebone-yocto = "4.4.87" LINUX_VERSION_mpc8315e-rdb = "4.4.87" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend index b3b5cd546c..63538de735 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend @@ -4,23 +4,24 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" SRCREV_machine_genericx86-64 ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" SRCREV_machine_edgerouter ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" -SRCREV_machine_beaglebone ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" +SRCREV_machine_beaglebone-yocto ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" SRCREV_machine_mpc8315e-rdb ?= "88a703b15a7564704c3dc5d3c1237e0859897655" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.9.49" LINUX_VERSION_genericx86-64 = "4.9.49" LINUX_VERSION_edgerouter = "4.9.49" -LINUX_VERSION_beaglebone = "4.9.49" +LINUX_VERSION_beaglebone-yocto = "4.9.49" LINUX_VERSION_mpc8315e-rdb = "4.9.49" diff --git a/meta-yocto-bsp/wic/beaglebone-yocto.wks b/meta-yocto-bsp/wic/beaglebone-yocto.wks new file mode 100644 index 0000000000..967cad78b8 --- /dev/null +++ b/meta-yocto-bsp/wic/beaglebone-yocto.wks @@ -0,0 +1,6 @@ +# short-description: Create SD card image for Beaglebone +# 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 diff --git a/meta-yocto-bsp/wic/beaglebone.wks b/meta-yocto-bsp/wic/beaglebone.wks deleted file mode 100644 index 967cad78b8..0000000000 --- a/meta-yocto-bsp/wic/beaglebone.wks +++ /dev/null @@ -1,6 +0,0 @@ -# short-description: Create SD card image for Beaglebone -# 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 -- cgit v1.2.3-54-g00ecf