From e866980b744e99c9254ebd529b26a0e461c81b84 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 2 Feb 2017 04:36:53 +0000 Subject: conf/machine: set KERNEL_DEVICETREE dtb list per machine Signed-off-by: Denys Dmytriyenko --- conf/machine/am3517-evm.conf | 2 ++ conf/machine/am37x-evm.conf | 2 ++ conf/machine/am57xx-evm.conf | 5 +++++ conf/machine/beagleboard.conf | 2 ++ conf/machine/beaglebone.conf | 2 ++ conf/machine/dra7xx-evm.conf | 5 +++++ conf/machine/include/omap3.inc | 2 ++ conf/machine/include/ti33x.inc | 2 ++ conf/machine/include/ti43x.inc | 2 ++ conf/machine/k2e-evm.conf | 2 ++ conf/machine/k2g-evm.conf | 2 ++ conf/machine/k2hk-evm.conf | 2 ++ conf/machine/k2l-evm.conf | 2 ++ conf/machine/omap5-evm.conf | 2 ++ conf/machine/pandaboard.conf | 2 ++ 15 files changed, 36 insertions(+) (limited to 'conf') diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index 4fef6343..883e9a44 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf @@ -15,6 +15,8 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLE = "115200 ttyO2" USE_VT = "2" +KERNEL_DEVICETREE = "am3517-evm.dtb" + UBOOT_MACHINE = "am3517_evm_config" XLOAD_MACHINE = "am3517evm_config" diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf index 99adb086..c1776df6 100644 --- a/conf/machine/am37x-evm.conf +++ b/conf/machine/am37x-evm.conf @@ -12,6 +12,8 @@ MACHINE_FEATURES += "touchscreen ethernet" IMAGE_FSTYPES += "ubi tar.gz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" +KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" + SERIAL_CONSOLE = "115200 ttyO0" # NOTE: there are NAND and OneNAND versions of this board... diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index 98698e6d..ec634187 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf @@ -12,6 +12,11 @@ SERIAL_CONSOLE = "" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \ + am57xx-evm.dtb am57xx-evm-reva3.dtb \ + am571x-idk.dtb \ + am572x-idk.dtb" + UBOOT_MACHINE = "am57xx_evm_config" # UBI information. Note that this is board and kernel specific. Changes diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 955961f7..4f05a0e3 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -10,6 +10,8 @@ MACHINE_GUI_CLASS = "bigscreen" IMAGE_FSTYPES += "tar.gz ubi" EXTRA_IMAGECMD_jffs2 = "-lnp" +KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb" + SERIAL_CONSOLE = "115200 ttyO2" UBOOT_MACHINE = "omap3_beagle_config" diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index e1685601..72f3ba53 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf @@ -5,6 +5,8 @@ require conf/machine/include/ti33x.inc require conf/machine/include/beaglebone.inc +KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" + # Only has DVI connector for external screen MACHINE_GUI_CLASS = "bigscreen" diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index 09f758d5..6049914a 100644 --- a/conf/machine/dra7xx-evm.conf +++ b/conf/machine/dra7xx-evm.conf @@ -12,6 +12,11 @@ SERIAL_CONSOLE = "" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE = "dra7-evm.dtb \ + dra72-evm.dtb \ + dra72-evm-revc.dtb \ + dra71-evm.dtb" + UBOOT_MACHINE = "dra7xx_evm_config" # UBI information. Note that this is board and kernel specific. Changes diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 4fe4cb3a..8c6423da 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -26,6 +26,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb" + UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_evm_config" XLOAD_MACHINE = "omap3evm_config" diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 6d1a45bb..73d9aa49 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc @@ -26,6 +26,8 @@ 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" + UBOOT_ARCH = "arm" UBOOT_MACHINE = "am335x_evm_config" diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index 807a42e5..8f2e11f1 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc @@ -26,6 +26,8 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE = "am43x-epos-evm.dtb am437x-gp-evm.dtb am437x-sk-evm.dtb am437x-idk-evm.dtb" + UBOOT_ARCH = "arm" UBOOT_MACHINE = "am43xx_evm_config" diff --git a/conf/machine/k2e-evm.conf b/conf/machine/k2e-evm.conf index 43362dd5..530e6dcb 100644 --- a/conf/machine/k2e-evm.conf +++ b/conf/machine/k2e-evm.conf @@ -6,6 +6,8 @@ require conf/machine/include/k2e.inc MACHINE_FEATURES += "opencl" +KERNEL_DEVICETREE = "keystone-k2e-evm.dtb" + UBOOT_MACHINE = "k2e_evm_config" BOOT_MONITOR_MAKE_TARGET = "k2e" diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf index 4d03f870..b8e55e40 100644 --- a/conf/machine/k2g-evm.conf +++ b/conf/machine/k2g-evm.conf @@ -6,6 +6,8 @@ require conf/machine/include/k2g.inc MACHINE_FEATURES += "alsa opencl" +KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-ice.dtb" + UBOOT_MACHINE = "k2g_evm_config" BOOT_MONITOR_MAKE_TARGET = "k2g" diff --git a/conf/machine/k2hk-evm.conf b/conf/machine/k2hk-evm.conf index 220f7fc5..c753e688 100644 --- a/conf/machine/k2hk-evm.conf +++ b/conf/machine/k2hk-evm.conf @@ -6,6 +6,8 @@ require conf/machine/include/keystone.inc MACHINE_FEATURES += "opencl" +KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb" + UBOOT_MACHINE = "k2hk_evm_config" BOOT_MONITOR_MAKE_TARGET = "k2hk" diff --git a/conf/machine/k2l-evm.conf b/conf/machine/k2l-evm.conf index 54931e2b..7a544923 100644 --- a/conf/machine/k2l-evm.conf +++ b/conf/machine/k2l-evm.conf @@ -6,6 +6,8 @@ require conf/machine/include/keystone.inc MACHINE_FEATURES += "opencl" +KERNEL_DEVICETREE = "keystone-k2l-evm.dtb" + UBOOT_MACHINE = "k2l_evm_config" BOOT_MONITOR_MAKE_TARGET = "k2l" diff --git a/conf/machine/omap5-evm.conf b/conf/machine/omap5-evm.conf index 2a19e775..7a71accd 100644 --- a/conf/machine/omap5-evm.conf +++ b/conf/machine/omap5-evm.conf @@ -6,6 +6,8 @@ require conf/machine/include/omap-a15.inc IMAGE_FSTYPES += "ubi tar.gz" +KERNEL_DEVICETREE = "omap5-uevm.dtb" + SERIAL_CONSOLE = "115200 ttyO2" # UBI information. Note that this is board and kernel specific. Changes diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf index 99497c13..920cd1e6 100644 --- a/conf/machine/pandaboard.conf +++ b/conf/machine/pandaboard.conf @@ -8,6 +8,8 @@ MACHINE_GUI_CLASS = "bigscreen" IMAGE_FSTYPES += "tar.gz" +KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" + SERIAL_CONSOLE = "115200 ttyO2" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -- cgit v1.2.3-54-g00ecf