mirror of https://gitee.com/openkylin/linux.git
ARM: ux500: fix devicetree builds
The patch set beginning with commit: "ARM: ux500: Apply a ste-* prefix onto snowball.dts" thru commit: "ARM: ux500: Remove u9540.dts as it's been replaced" altered the names of the ux500 device tree files but forgot to: - Rename the ccu8540-pinctrl.dtsi file - Update #include statements from files using these files, so the build broke. - Update the Makefile for the device trees so the build broke. Fix it up so we can build them all again. Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
This commit is contained in:
parent
2771211ad6
commit
2ce05a14bb
|
@ -176,11 +176,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
|
||||||
am43x-epos-evm.dtb
|
am43x-epos-evm.dtb
|
||||||
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
|
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
|
||||||
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
|
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
|
||||||
dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
|
dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
|
||||||
hrefprev60.dtb \
|
ste-hrefprev60.dtb \
|
||||||
hrefv60plus.dtb \
|
ste-hrefv60plus.dtb \
|
||||||
ccu8540.dtb \
|
ste-ccu8540.dtb \
|
||||||
ccu9540.dtb
|
ste-ccu9540.dtb
|
||||||
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
|
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
|
||||||
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
|
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
|
||||||
r8a7740-armadillo800eva.dtb \
|
r8a7740-armadillo800eva.dtb \
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "dbx5x0.dtsi"
|
#include "ste-dbx5x0.dtsi"
|
||||||
#include "ccu8540-pinctrl.dtsi"
|
#include "ste-ccu8540-pinctrl.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "ST-Ericsson U8540 platform with Device Tree";
|
model = "ST-Ericsson U8540 platform with Device Tree";
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "dbx5x0.dtsi"
|
#include "ste-dbx5x0.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "ST-Ericsson CCU9540 platform with Device Tree";
|
model = "ST-Ericsson CCU9540 platform with Device Tree";
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dt-bindings/interrupt-controller/irq.h>
|
#include <dt-bindings/interrupt-controller/irq.h>
|
||||||
#include "dbx5x0.dtsi"
|
#include "ste-dbx5x0.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
memory {
|
memory {
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "dbx5x0.dtsi"
|
#include "ste-dbx5x0.dtsi"
|
||||||
#include "href.dtsi"
|
#include "ste-href.dtsi"
|
||||||
#include "stuib.dtsi"
|
#include "ste-stuib.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
|
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "dbx5x0.dtsi"
|
#include "ste-dbx5x0.dtsi"
|
||||||
#include "href.dtsi"
|
#include "ste-href.dtsi"
|
||||||
#include "stuib.dtsi"
|
#include "ste-stuib.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "ST-Ericsson HREF (v60+) platform with Device Tree";
|
model = "ST-Ericsson HREF (v60+) platform with Device Tree";
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
#include "dbx5x0.dtsi"
|
#include "ste-dbx5x0.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Calao Systems Snowball platform with device tree";
|
model = "Calao Systems Snowball platform with device tree";
|
||||||
|
|
Loading…
Reference in New Issue