From 2499f8265cc4fdcd2c051e44417b06a735ad0400 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 1 Mar 2018 06:02:04 +0000 Subject: machines: update DTBs and other cleanups Signed-off-by: Denys Dmytriyenko --- conf/machine/am57xx-evm.conf | 5 +++-- conf/machine/beagle-x15.conf | 12 ++++++++---- conf/machine/beaglebone.conf | 12 +++++++----- conf/machine/dra7xx-evm.conf | 2 +- conf/machine/include/ti33x.inc | 7 ++++++- conf/machine/include/ti43x.inc | 6 +++++- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index e763abad..172b515a 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf @@ -14,8 +14,9 @@ KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-be ti/am57xx-evm.dtbo ti/mt9t111.dtbo ti/ov10635.dtbo ti/am57xx-evm.itb \ am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \ am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \ - am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb \ - ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" + am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb" + +KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" UBOOT_MACHINE = "am57xx_evm_config" diff --git a/conf/machine/beagle-x15.conf b/conf/machine/beagle-x15.conf index e4552cd7..da275ad6 100644 --- a/conf/machine/beagle-x15.conf +++ b/conf/machine/beagle-x15.conf @@ -4,16 +4,20 @@ require conf/machine/include/dra7xx.inc -MACHINE_GUI_CLASS = "bigscreen" +KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" -IMAGE_FSTYPES += "tar.xz" +MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLE = "115200 ttyS2" -KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb" - UBOOT_MACHINE = "am57xx_evm_config" +WKS_FILE = "sdimage-bootpart.wks" +IMAGE_BOOT_FILES = "MLO u-boot.img" +IMAGE_FSTYPES += "tar.xz wic.xz" + +do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" + # UBI information. Note that this is board and kernel specific. Changes # in your kernel port may require changes in these variables. For more # details about this board please see diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index a73bf224..49edfd61 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf @@ -4,19 +4,21 @@ require conf/machine/include/ti33x.inc -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" +KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \ + am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ + am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" # Only has DVI connector for external screen MACHINE_GUI_CLASS = "bigscreen" -WKS_FILE = "sdimage-bootpart.wks" -IMAGE_BOOT_FILES = "MLO u-boot.img" -IMAGE_FSTYPES += "tar.xz wic.xz" - SERIAL_CONSOLE = "115200 ttyS0" UBOOT_MACHINE = "am335x_boneblack_config" +WKS_FILE = "sdimage-bootpart.wks" +IMAGE_BOOT_FILES = "MLO u-boot.img" +IMAGE_FSTYPES += "tar.xz wic.xz" + do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" # Refine the list of device targets for ti-pdk class recipes diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index e0717c5f..9a65a271 100644 --- a/conf/machine/dra7xx-evm.conf +++ b/conf/machine/dra7xx-evm.conf @@ -13,7 +13,7 @@ SERIAL_CONSOLE = "115200 ttyS0" KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \ - dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb \ + dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb dra71-lcard.dtb \ dra76-evm.dtb dra76-evm-tfp410.dtb" UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 4c62fb9d..570953b9 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc @@ -26,7 +26,12 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb am335x-icev2.dtb ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" +KERNEL_DEVICETREE = "am335x-evm.dtb am335x-evmsk.dtb am335x-icev2.dtb \ + am335x-bone.dtb am335x-boneblue.dtb \ + am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ + am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" + +KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" UBOOT_ARCH = "arm" UBOOT_MACHINE = "am335x_evm_config" diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index 87dcf55a..ddc270ae 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc @@ -26,7 +26,11 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am43x-epos-evm.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb am437x-idk-evm.dtb ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" +KERNEL_DEVICETREE = "am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \ + am437x-sk-evm.dtb am437x-idk-evm.dtb \ + am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb" + +KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" UBOOT_ARCH = "arm" UBOOT_MACHINE = "am43xx_evm_config" -- cgit v1.2.3-54-g00ecf