In accordance with our other modules supported by U-Boot and as agreed for Apalis/Colibri T30 get rid of the carrier board in the device-tree naming. --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts} | 0 configs/colibri_t20_defconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts} (100%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index cbe5b86..f897e6d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -24,7 +24,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra20-trimslice.dtb \ tegra20-ventana.dtb \ tegra20-whistler.dtb \ - tegra20-colibri_t20_iris.dtb \ + tegra20-colibri.dtb \ tegra30-apalis.dtb \ tegra30-beaver.dtb \ tegra30-cardhu.dtb \ diff --git a/arch/arm/dts/tegra20-colibri_t20_iris.dts b/arch/arm/dts/tegra20-colibri.dts similarity index 100% rename from arch/arm/dts/tegra20-colibri_t20_iris.dts rename to arch/arm/dts/tegra20-colibri.dts diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index a14d55a..af8e435 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -2,4 +2,4 @@ CONFIG_ARM=y CONFIG_TEGRA=y CONFIG_TEGRA20=y CONFIG_TARGET_COLIBRI_T20_IRIS=y -CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris" +CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"