lkml.org 
[lkml]   [2014]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/7] MIPS: sead3: Move device-trees to arch/mips/boot/dts/mti/
    Date
    Move the SEAD-3 device-tree to arch/mips/boot/dts/mti/ and update the
    Makefiles accordingly. Since SEAD-3 requires the device-tree to be
    built into the kernel, select BUILTIN_DTB when building for SEAD-3.

    Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
    ---
    arch/mips/Kconfig | 1 +
    arch/mips/boot/dts/Makefile | 1 +
    arch/mips/boot/dts/mti/Makefile | 1 +
    arch/mips/{mti-sead3 => boot/dts/mti}/sead3.dts | 0
    arch/mips/mti-sead3/Makefile | 4 ----
    5 files changed, 3 insertions(+), 4 deletions(-)
    create mode 100644 arch/mips/boot/dts/mti/Makefile
    rename arch/mips/{mti-sead3 => boot/dts/mti}/sead3.dts (100%)

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index dbfcf35..a72c7c9 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -353,6 +353,7 @@ config MIPS_SEAD3
    bool "MIPS SEAD3 board"
    select BOOT_ELF32
    select BOOT_RAW
    + select BUILTIN_DTB
    select CEVT_R4K
    select CSRC_R4K
    select CSRC_GIC
    diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
    index 0f16e92..e32cc0f 100644
    --- a/arch/mips/boot/dts/Makefile
    +++ b/arch/mips/boot/dts/Makefile
    @@ -1,5 +1,6 @@
    include arch/mips/boot/dts/cavium-octeon/Makefile
    include arch/mips/boot/dts/lantiq/Makefile
    +include arch/mips/boot/dts/mti/Makefile

    obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))

    diff --git a/arch/mips/boot/dts/mti/Makefile b/arch/mips/boot/dts/mti/Makefile
    new file mode 100644
    index 0000000..913fac9
    --- /dev/null
    +++ b/arch/mips/boot/dts/mti/Makefile
    @@ -0,0 +1 @@
    +dtb-$(CONFIG_MIPS_SEAD3) += mti/sead3.dtb
    diff --git a/arch/mips/mti-sead3/sead3.dts b/arch/mips/boot/dts/mti/sead3.dts
    similarity index 100%
    rename from arch/mips/mti-sead3/sead3.dts
    rename to arch/mips/boot/dts/mti/sead3.dts
    diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile
    index 071786f..febf433 100644
    --- a/arch/mips/mti-sead3/Makefile
    +++ b/arch/mips/mti-sead3/Makefile
    @@ -19,9 +19,5 @@ obj-y += sead3-i2c-dev.o sead3-i2c.o \

    obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o
    obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o
    -obj-$(CONFIG_OF) += sead3.dtb.o

    CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt
    -
    -$(obj)/%.dtb: $(obj)/%.dts
    - $(call if_changed,dtc)
    --
    2.1.0.rc2.206.gedb03e5


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