lkml.org 
[lkml]   [2014]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] MIPS: ralink: Move device-trees to arch/mips/boot/dts/
    Date
    Move the Ralink device-trees to arch/mips/boot/dts/ and update the
    Makefiles accordingly. A built-in device-tree is optional, so select
    BUILTIN_DTB when it is requested.

    Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
    ---
    arch/mips/boot/dts/Makefile | 4 ++++
    arch/mips/{ralink => boot}/dts/mt7620a.dtsi | 0
    arch/mips/{ralink => boot}/dts/mt7620a_eval.dts | 0
    arch/mips/{ralink => boot}/dts/rt2880.dtsi | 0
    arch/mips/{ralink => boot}/dts/rt2880_eval.dts | 0
    arch/mips/{ralink => boot}/dts/rt3050.dtsi | 0
    arch/mips/{ralink => boot}/dts/rt3052_eval.dts | 0
    arch/mips/{ralink => boot}/dts/rt3883.dtsi | 0
    arch/mips/{ralink => boot}/dts/rt3883_eval.dts | 0
    arch/mips/ralink/Kconfig | 4 ++++
    arch/mips/ralink/Makefile | 2 --
    arch/mips/ralink/dts/Makefile | 4 ----
    12 files changed, 8 insertions(+), 6 deletions(-)
    rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%)
    rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%)
    rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%)
    rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%)
    rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%)
    rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%)
    rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%)
    rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%)
    delete mode 100644 arch/mips/ralink/dts/Makefile

    diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
    index 1638a38..ca9c90e 100644
    --- a/arch/mips/boot/dts/Makefile
    +++ b/arch/mips/boot/dts/Makefile
    @@ -4,6 +4,10 @@ dtb-$(CONFIG_DT_XLP_EVP) += xlp_evp.dtb
    dtb-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb
    dtb-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb
    dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb
    +dtb-$(CONFIG_DTB_RT2880_EVAL) += rt2880_eval.dtb
    +dtb-$(CONFIG_DTB_RT305X_EVAL) += rt3052_eval.dtb
    +dtb-$(CONFIG_DTB_RT3883_EVAL) += rt3883_eval.dtb
    +dtb-$(CONFIG_DTB_MT7620A_EVAL) += mt7620a_eval.dtb
    dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb

    obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
    diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/boot/dts/mt7620a.dtsi
    similarity index 100%
    rename from arch/mips/ralink/dts/mt7620a.dtsi
    rename to arch/mips/boot/dts/mt7620a.dtsi
    diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/boot/dts/mt7620a_eval.dts
    similarity index 100%
    rename from arch/mips/ralink/dts/mt7620a_eval.dts
    rename to arch/mips/boot/dts/mt7620a_eval.dts
    diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/boot/dts/rt2880.dtsi
    similarity index 100%
    rename from arch/mips/ralink/dts/rt2880.dtsi
    rename to arch/mips/boot/dts/rt2880.dtsi
    diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/boot/dts/rt2880_eval.dts
    similarity index 100%
    rename from arch/mips/ralink/dts/rt2880_eval.dts
    rename to arch/mips/boot/dts/rt2880_eval.dts
    diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/boot/dts/rt3050.dtsi
    similarity index 100%
    rename from arch/mips/ralink/dts/rt3050.dtsi
    rename to arch/mips/boot/dts/rt3050.dtsi
    diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/boot/dts/rt3052_eval.dts
    similarity index 100%
    rename from arch/mips/ralink/dts/rt3052_eval.dts
    rename to arch/mips/boot/dts/rt3052_eval.dts
    diff --git a/arch/mips/ralink/dts/rt3883.dtsi b/arch/mips/boot/dts/rt3883.dtsi
    similarity index 100%
    rename from arch/mips/ralink/dts/rt3883.dtsi
    rename to arch/mips/boot/dts/rt3883.dtsi
    diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/boot/dts/rt3883_eval.dts
    similarity index 100%
    rename from arch/mips/ralink/dts/rt3883_eval.dts
    rename to arch/mips/boot/dts/rt3883_eval.dts
    diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
    index 4a29665..77e8a96 100644
    --- a/arch/mips/ralink/Kconfig
    +++ b/arch/mips/ralink/Kconfig
    @@ -42,18 +42,22 @@ choice
    config DTB_RT2880_EVAL
    bool "RT2880 eval kit"
    depends on SOC_RT288X
    + select BUILTIN_DTB

    config DTB_RT305X_EVAL
    bool "RT305x eval kit"
    depends on SOC_RT305X
    + select BUILTIN_DTB

    config DTB_RT3883_EVAL
    bool "RT3883 eval kit"
    depends on SOC_RT3883
    + select BUILTIN_DTB

    config DTB_MT7620A_EVAL
    bool "MT7620A eval kit"
    depends on SOC_MT7620
    + select BUILTIN_DTB

    endchoice

    diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
    index 98ae349..2c09c8a 100644
    --- a/arch/mips/ralink/Makefile
    +++ b/arch/mips/ralink/Makefile
    @@ -16,5 +16,3 @@ obj-$(CONFIG_SOC_RT3883) += rt3883.o
    obj-$(CONFIG_SOC_MT7620) += mt7620.o

    obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
    -
    -obj-y += dts/
    diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
    deleted file mode 100644
    index 18194fa..0000000
    --- a/arch/mips/ralink/dts/Makefile
    +++ /dev/null
    @@ -1,4 +0,0 @@
    -obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
    -obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
    -obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
    -obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o
    --
    2.1.0.rc2.206.gedb03e5


    \
     
     \ /
      Last update: 2014-08-21 22:21    [W:4.373 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site