linux-aspeed: Move to Linux v6.5

This moves the OpenBMC kernel to a v6.5 base for ASPEED. The 6.5 kernel moved all 32-bit ARM device trees, so our BMC device tress are now under an 'aspeed' subdirectory. This change means systems must describe the KERNEL_DEVICETREE with the aspeed directory prefix. There are 78 patches in the tree, with 40 of those patches not yet queued for merging in v6.6. The remaining out of tree patches include: Andrew Jeffery (6): dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation pmbus (max31785): Add support for devicetree configuration pmbus (core): One-shot retries for failure to set page pmbus (max31785): Wrap all I2C accessors in one-shot failure handlers ARM: dts: aspeed: witherspoon: Update max31785 node ipmi: kcs_bmc: Add a "raw" character device interface Cédric Le Goater (1): /dev/mem: add a devmem kernel parameter to activate the device Eddie James (16): ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log dt-bindings: soc: Add Aspeed XDMA Engine soc: aspeed: Add XDMA Engine Driver soc: aspeed: xdma: Add user interface soc: aspeed: xdma: Add reset ioctl soc: aspeed: xdma: Add trace events i2c: core: Add mux root adapter operations iio: si7020: Lock root adapter to wait for reset eeprom: ee1004: Enable devices on multiple busses dt-bindings: trivial-devices: Add Atmel AT30TSE004A serial eeprom eeprom: ee1004: Add OF matching support leds: pca955x: Refactor with helper functions and renaming leds: pca955x: Use pointers to driver data rather than I2C client leds: pca955x: Optimize probe led selection leds: pca955x: Add HW blink support leds: Ensure hardware blinking turns off when requested Jae Hyun Yoo (1): clk: ast2600: enable BCLK for PCI/PCIe bus always Joel Stanley (14): net: ftgmac100: Ensure tx descriptor updates are visible ARM: aspeed: Add debugfs directory ARM: soc: aspeed: Add secure boot controller support dt-bindings: trivial-devices: Remove Infineon SLB9673 TPM ARM: dts: nuvoton: npmc750-evb: Add default console tpm: tis-i2c: Add more compatible strings leds: pca955x: Revert "Remove the unused function pca95xx_num_led_regs()" arm64: configs: Add Nuvoton NPCM defconfig ARM: configs: aspeed: Add new FSI drivers ARM: config: aspeed_g5: Enable SSIF BMC driver ARM: config: aspeed: Remove FIRMWARE_MEMMAP ARM: config: aspeed: Add Ampere SMPro drivers ARM: config: Add openbmc defconfig ARM: config: openbmc: Add HPE GPX and Nuvoton 7xx Johannes Holland (1): dt-bindings: tpm: Add schema for TIS I2C devices Potin Lai (1): mtd: spi-nor: winbond: Add support for w25q01jvq Change-Id: Ib97af192391af6e71c96fe14e12cfc88c23d7a7d Signed-off-by: Joel Stanley <[email protected]>
makise-homura · Sep 26, 2023 · 77b96cd · 77b96cd
1 parent aec0d64
commit 77b96cd
Show file tree

Hide file tree

Showing 40 changed files with 46 additions and 50 deletions.
diff --git a/meta-amd/meta-daytonax/conf/machine/daytonax.conf b/meta-amd/meta-daytonax/conf/machine/daytonax.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-amd-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"

diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-amd-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"

diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-ampere-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"

diff --git a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-mtmitchell.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-ampere-mtmitchell.dtb"
 UBOOT_DEVICETREE = "ast2600-bletchley"
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"

diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-ast2500-evb.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"

diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-ast2600-evb.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"

diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-6.1"
-LINUX_VERSION ?= "6.1.51"
+KBRANCH ?= "dev-6.5"
+LINUX_VERSION ?= "6.5.4"
 
-SRCREV="6f8bb353a755ae9f4985b3c084d4d1be62782baf"
+SRCREV="12f22df3cc2f6230ac91e574c1b63b872ea1a6a7"
 
 require linux-aspeed.inc
diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"

diff --git a/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf b/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"

diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-bytedance-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-bytedance-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"

diff --git a/meta-delta/meta-ahe50dc/conf/machine/ahe50dc.conf b/meta-delta/meta-ahe50dc/conf/machine/ahe50dc.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-delta-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-delta-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2400_defconfig"
 UBOOT_DEVICETREE = "ast2400-ahe-50dc"

diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-bletchley"

diff --git a/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf b/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf
@@ -1,6 +1,5 @@
 KMACHINE = "aspeed"
-#KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"

diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk"

diff --git a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
@@ -1,6 +1,5 @@
 KMACHINE = "aspeed"
-#KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"

diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk"

diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
@@ -5,10 +5,10 @@ DISTRO_NAME = "IBM eBMC (OpenBMC for IBM Enterprise Systems)"
 # than in the other systems. Otherwise the device driver would truncate the data
 # on that eeprom on a bonnell system.
 KERNEL_DEVICETREE = \
-    "aspeed-bmc-ibm-bonnell.dtb \
-     aspeed-bmc-ibm-rainier.dtb \
-     aspeed-bmc-ibm-rainier-4u.dtb \
-     aspeed-bmc-ibm-everest.dtb"
+    "aspeed/aspeed-bmc-ibm-bonnell.dtb \
+     aspeed/aspeed-bmc-ibm-rainier.dtb \
+     aspeed/aspeed-bmc-ibm-rainier-4u.dtb \
+     aspeed/aspeed-bmc-ibm-everest.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-p10bmc"
 SPL_BINARY = "spl/u-boot-spl.bin"
@@ -79,7 +79,7 @@ IMAGE_FSTYPES +=" wic.qcow2 "
 
 QB_ROOTFS_OPT:p10bmc="-drive file=@ROOTFS@,if=sd,format=qcow2,index=2"
 QB_MACHINE:p10bmc="-machine rainier-bmc"
-QB_DTB:p10bmc="aspeed-bmc-ibm-rainier.dtb"
+QB_DTB:p10bmc="aspeed/aspeed-bmc-ibm-rainier.dtb"
 QB_MEM:p10bmc="-m 1024"
 QB_DEFAULT_FSTYPE:p10bmc="wic.qcow2"
 QB_FSINFO = "wic:no-kernel-in-fs"

diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
@@ -2,7 +2,7 @@ require conf/machine/witherspoon.conf
 
 IMAGE_FSTYPES += "ext4 mmc-ext4-tar"
 
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PHOSPHOR_MRW_LICENSE = "Apache-2.0"
 PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"

diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-opp-tacoma.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-tacoma"
 SPL_BINARY = "spl/u-boot-spl.bin"

diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"

diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-romulus"

diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"

diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"

diff --git a/meta-inspur/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-inspur/meta-nf5280m7/conf/machine/nf5280m7.conf
@@ -1,6 +1,6 @@
 # Add a device tree for nf5280m7
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UMACHINE = "ast2600"

diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-s2600wf.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-intel-s2600wf.dtb"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-inventec/meta-transformers/conf/machine/transformers.conf b/meta-inventec/meta-transformers/conf/machine/transformers.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inventec-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inventec-${MACHINE}.dtb"
 
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "aspeed-bmc-qcom-dc-scm-v1.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-qcom-dc-scm-v1.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-qcom-dc-scm-v1"
 SPL_BINARY = "spl/u-boot-spl.bin"

diff --git a/meta-quanta/meta-f0b/conf/machine/f0b.conf b/meta-quanta/meta-f0b/conf/machine/f0b.conf
@@ -1,7 +1,7 @@
 KMACHINE = "aspeed"
 
 # The device tree of F0B is not ready yet, temporarily replace it with aspeed-ast2500-evb.dtb
-KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-ast2500-evb.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"

diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-${MACHINE}.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-quanta/meta-s6q/conf/machine/s6q.conf b/meta-quanta/meta-s6q/conf/machine/s6q.conf
@@ -1,6 +1,5 @@
 # KMACHINE = "aspeed"
-# KERNEL_DEVICETREE = "${KMACHINE}-bmc-quanta-${MACHINE}.dtb"
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-quanta-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_defconfig"
 UBOOT_DEVICETREE = "ast2600a1-evb"

diff --git a/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "aspeed-bmc-supermicro-x11spi.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-supermicro-x11spi.dtb"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-tyan/meta-s7106/conf/machine/s7106.conf b/meta-tyan/meta-s7106/conf/machine/s7106.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"

diff --git a/meta-tyan/meta-s8036/conf/machine/s8036.conf b/meta-tyan/meta-s8036/conf/machine/s8036.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"

diff --git a/meta-ufispace/meta-ncplite/conf/machine/ncplite.conf b/meta-ufispace/meta-ncplite/conf/machine/ncplite.conf
@@ -1,6 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-ufispace-${MACHINE}.dtb"
-#KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-ufispace-${MACHINE}.dtb"
 
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-wistron/meta-lannister/conf/machine/lannister.conf b/meta-wistron/meta-lannister/conf/machine/lannister.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-wistron-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-wistron-${MACHINE}.dtb"
 
 require conf/machine/include/wistron.inc
 require conf/machine/include/ast2600.inc

diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"

diff --git a/meta-yadro/meta-vegman/conf/machine/include/vegman.inc b/meta-yadro/meta-vegman/conf/machine/include/vegman.inc
@@ -1,6 +1,6 @@
 OVERRIDES .= ":vegman"
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-${MACHINE}.dtb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"
 

diff --git a/meta-yadro/meta-vegman/conf/machine/tatlin-archive-x86.conf b/meta-yadro/meta-vegman/conf/machine/tatlin-archive-x86.conf
@@ -2,4 +2,4 @@ require conf/machine/include/vegman.inc
 # Apply all the machine override from the VEGMAN Sx20, because
 # the TATLIN.ARCHIVE.xS have an exactly same hardware as the VEGMAN Sx20
 MACHINEOVERRIDES .= ":vegman-sx20"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-vegman-sx20.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-vegman-sx20.dtb"