[U-Boot] [PATCH v1 01/18] MIPS: Prepare device-tree support.
Signed-off-by: Purna Chandra Mandal purna.mandal@microchip.com ---
arch/Kconfig | 1 + arch/mips/config.mk | 3 +++ arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++++++++++++++++ arch/mips/dts/include/dt-bindings | 1 + arch/mips/dts/skeleton.dtsi | 21 +++++++++++++++++++++ dts/Makefile | 2 +- 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 120000 arch/mips/dts/include/dt-bindings create mode 100644 arch/mips/dts/skeleton.dtsi
diff --git a/arch/Kconfig b/arch/Kconfig index 6489cc9..589fc47 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -54,6 +54,7 @@ config MIPS select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD + select SUPPORT_OF_CONTROL
config NDS32 bool "NDS32 architecture" diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 52e28f2..d4d688e 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -70,3 +70,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections -pie OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .got OBJCOPYFLAGS += -j .u_boot_list -j .rel.dyn -j .padding +ifdef CONFIG_OF_EMBED +OBJCOPYFLAGS += -j .dtb.init.rodata +endif diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore new file mode 100644 index 0000000..b60ed20 --- /dev/null +++ b/arch/mips/dts/.gitignore @@ -0,0 +1 @@ +*.dtb diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile new file mode 100644 index 0000000..724b5d2 --- /dev/null +++ b/arch/mips/dts/Makefile @@ -0,0 +1,16 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + +#dtb-$(CONFIG_XXX) += xxx.dtb + +targets += $(dtb-y) + +# Add any required device tree compiler flags here +DTC_FLAGS += + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb diff --git a/arch/mips/dts/include/dt-bindings b/arch/mips/dts/include/dt-bindings new file mode 120000 index 0000000..0cecb3d --- /dev/null +++ b/arch/mips/dts/include/dt-bindings @@ -0,0 +1 @@ +../../../../include/dt-bindings \ No newline at end of file diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi new file mode 100644 index 0000000..ad41546 --- /dev/null +++ b/arch/mips/dts/skeleton.dtsi @@ -0,0 +1,21 @@ +/* + * Skeleton device tree; the bare minimum needed to boot; just include and + * add a compatible value. The bootloader will typically populate the memory + * node. + */ + +/ { + #address-cells = <1>; + #size-cells = <1>; + + chosen { + }; + + aliases { + }; + + memory { + device_type = "memory"; + reg = <0 0>; + }; +}; diff --git a/dts/Makefile b/dts/Makefile index d3122aa..5c3a01f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -45,4 +45,4 @@ dtbs: $(obj)/dt.dtb clean-files := dt.dtb.S
# Let clean descend into dts directories -subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts +subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/mips/dts
On Thursday, December 17, 2015 at 06:28:08 PM, Purna Chandra Mandal wrote:
Signed-off-by: Purna Chandra Mandal purna.mandal@microchip.com
arch/Kconfig | 1 + arch/mips/config.mk | 3 +++ arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++++++++++++++++ arch/mips/dts/include/dt-bindings | 1 + arch/mips/dts/skeleton.dtsi | 21 +++++++++++++++++++++ dts/Makefile | 2 +- 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 120000 arch/mips/dts/include/dt-bindings create mode 100644 arch/mips/dts/skeleton.dtsi
diff --git a/arch/Kconfig b/arch/Kconfig index 6489cc9..589fc47 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -54,6 +54,7 @@ config MIPS select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD
- select SUPPORT_OF_CONTROL
config NDS32 bool "NDS32 architecture" diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 52e28f2..d4d688e 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -70,3 +70,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections -pie OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .got OBJCOPYFLAGS += -j .u_boot_list -j .rel.dyn -j .padding +ifdef CONFIG_OF_EMBED +OBJCOPYFLAGS += -j .dtb.init.rodata +endif diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore new file mode 100644 index 0000000..b60ed20 --- /dev/null +++ b/arch/mips/dts/.gitignore @@ -0,0 +1 @@ +*.dtb diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile new file mode 100644 index 0000000..724b5d2 --- /dev/null +++ b/arch/mips/dts/Makefile @@ -0,0 +1,16 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +#
+#dtb-$(CONFIG_XXX) += xxx.dtb
XXX ?
+targets += $(dtb-y)
+# Add any required device tree compiler flags here +DTC_FLAGS +=
+PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y))
- @:
+clean-files := *.dtb diff --git a/arch/mips/dts/include/dt-bindings b/arch/mips/dts/include/dt-bindings new file mode 120000 index 0000000..0cecb3d --- /dev/null +++ b/arch/mips/dts/include/dt-bindings @@ -0,0 +1 @@ +../../../../include/dt-bindings \ No newline at end of file diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi new file mode 100644 index 0000000..ad41546 --- /dev/null +++ b/arch/mips/dts/skeleton.dtsi @@ -0,0 +1,21 @@ +/*
- Skeleton device tree; the bare minimum needed to boot; just include and
- add a compatible value. The bootloader will typically populate the
memory + * node.
- */
+/ {
- #address-cells = <1>;
- #size-cells = <1>;
- chosen {
- };
- aliases {
- };
- memory {
device_type = "memory";reg = <0 0>;- };
You don't need any of these nodes, do you ?
+}; diff --git a/dts/Makefile b/dts/Makefile index d3122aa..5c3a01f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -45,4 +45,4 @@ dtbs: $(obj)/dt.dtb clean-files := dt.dtb.S
# Let clean descend into dts directories -subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts +subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/mips/dts
On 12/17/2015 11:17 PM, Marek Vasut wrote:
On Thursday, December 17, 2015 at 06:28:08 PM, Purna Chandra Mandal wrote:
Signed-off-by: Purna Chandra Mandal purna.mandal@microchip.com
arch/Kconfig | 1 + arch/mips/config.mk | 3 +++ arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++++++++++++++++ arch/mips/dts/include/dt-bindings | 1 + arch/mips/dts/skeleton.dtsi | 21 +++++++++++++++++++++ dts/Makefile | 2 +- 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 120000 arch/mips/dts/include/dt-bindings create mode 100644 arch/mips/dts/skeleton.dtsi
diff --git a/arch/Kconfig b/arch/Kconfig index 6489cc9..589fc47 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -54,6 +54,7 @@ config MIPS select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD
- select SUPPORT_OF_CONTROL
config NDS32 bool "NDS32 architecture" diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 52e28f2..d4d688e 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -70,3 +70,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections -pie OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .got OBJCOPYFLAGS += -j .u_boot_list -j .rel.dyn -j .padding +ifdef CONFIG_OF_EMBED +OBJCOPYFLAGS += -j .dtb.init.rodata +endif diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore new file mode 100644 index 0000000..b60ed20 --- /dev/null +++ b/arch/mips/dts/.gitignore @@ -0,0 +1 @@ +*.dtb diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile new file mode 100644 index 0000000..724b5d2 --- /dev/null +++ b/arch/mips/dts/Makefile @@ -0,0 +1,16 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +#
+#dtb-$(CONFIG_XXX) += xxx.dtb
XXX ?
ack. will remove.
+targets += $(dtb-y)
+# Add any required device tree compiler flags here +DTC_FLAGS +=
+PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y))
- @:
+clean-files := *.dtb diff --git a/arch/mips/dts/include/dt-bindings b/arch/mips/dts/include/dt-bindings new file mode 120000 index 0000000..0cecb3d --- /dev/null +++ b/arch/mips/dts/include/dt-bindings @@ -0,0 +1 @@ +../../../../include/dt-bindings \ No newline at end of file diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi new file mode 100644 index 0000000..ad41546 --- /dev/null +++ b/arch/mips/dts/skeleton.dtsi @@ -0,0 +1,21 @@ +/*
- Skeleton device tree; the bare minimum needed to boot; just include and
- add a compatible value. The bootloader will typically populate the
memory + * node.
- */
+/ {
- #address-cells = <1>;
- #size-cells = <1>;
- chosen {
- };
- aliases {
- };
- memory {
device_type = "memory";reg = <0 0>;- };
You don't need any of these nodes, do you ?
ack. This is skeleton code copied from arm, might be needed by others. will remove as not needed by me.
+}; diff --git a/dts/Makefile b/dts/Makefile index d3122aa..5c3a01f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -45,4 +45,4 @@ dtbs: $(obj)/dt.dtb clean-files := dt.dtb.S
# Let clean descend into dts directories -subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts +subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/mips/dts
Am 17.12.2015 um 18:28 schrieb Purna Chandra Mandal:
Signed-off-by: Purna Chandra Mandal purna.mandal@microchip.com
if you send patches from other people, you should not remove their Author or Signed-off-by. I already prepared a cleaned up version of that patch some days ago for submission. But I see you did some modifications which I missed. I will add those to my patch and you can drop this one in your next patch series. You should rebase your patches against the next branch in u-boot-mips tree [1]
[1] http://git.denx.de/?p=u-boot/u-boot-mips.git;a=summary
arch/Kconfig | 1 + arch/mips/config.mk | 3 +++ arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++++++++++++++++ arch/mips/dts/include/dt-bindings | 1 + arch/mips/dts/skeleton.dtsi | 21 +++++++++++++++++++++ dts/Makefile | 2 +- 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 120000 arch/mips/dts/include/dt-bindings create mode 100644 arch/mips/dts/skeleton.dtsi
diff --git a/arch/Kconfig b/arch/Kconfig index 6489cc9..589fc47 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -54,6 +54,7 @@ config MIPS select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD
- select SUPPORT_OF_CONTROL
config NDS32 bool "NDS32 architecture" diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 52e28f2..d4d688e 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -70,3 +70,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections -pie OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .got OBJCOPYFLAGS += -j .u_boot_list -j .rel.dyn -j .padding +ifdef CONFIG_OF_EMBED +OBJCOPYFLAGS += -j .dtb.init.rodata +endif diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore new file mode 100644 index 0000000..b60ed20 --- /dev/null +++ b/arch/mips/dts/.gitignore @@ -0,0 +1 @@ +*.dtb diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile new file mode 100644 index 0000000..724b5d2 --- /dev/null +++ b/arch/mips/dts/Makefile @@ -0,0 +1,16 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +#
+#dtb-$(CONFIG_XXX) += xxx.dtb
+targets += $(dtb-y)
+# Add any required device tree compiler flags here +DTC_FLAGS +=
+PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y))
- @:
+clean-files := *.dtb diff --git a/arch/mips/dts/include/dt-bindings b/arch/mips/dts/include/dt-bindings new file mode 120000 index 0000000..0cecb3d --- /dev/null +++ b/arch/mips/dts/include/dt-bindings @@ -0,0 +1 @@ +../../../../include/dt-bindings \ No newline at end of file diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi new file mode 100644 index 0000000..ad41546 --- /dev/null +++ b/arch/mips/dts/skeleton.dtsi @@ -0,0 +1,21 @@ +/*
- Skeleton device tree; the bare minimum needed to boot; just include and
- add a compatible value. The bootloader will typically populate the memory
- node.
- */
+/ {
- #address-cells = <1>;
- #size-cells = <1>;
- chosen {
- };
- aliases {
- };
- memory {
device_type = "memory";reg = <0 0>;- };
+}; diff --git a/dts/Makefile b/dts/Makefile index d3122aa..5c3a01f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -45,4 +45,4 @@ dtbs: $(obj)/dt.dtb clean-files := dt.dtb.S
# Let clean descend into dts directories -subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts +subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/mips/dts
On 12/20/2015 03:52 AM, Daniel Schwierzeck wrote:
Am 17.12.2015 um 18:28 schrieb Purna Chandra Mandal:
Signed-off-by: Purna Chandra Mandal purna.mandal@microchip.com
if you send patches from other people, you should not remove their Author or Signed-off-by. I already prepared a cleaned up version of that patch some days ago for submission. But I see you did some modifications which I missed. I will add those to my patch and you can drop this one in your next patch series. You should rebase your patches against the next branch in u-boot-mips tree [1]
ack. I'll drop in next version.
arch/Kconfig | 1 + arch/mips/config.mk | 3 +++ arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++++++++++++++++ arch/mips/dts/include/dt-bindings | 1 + arch/mips/dts/skeleton.dtsi | 21 +++++++++++++++++++++ dts/Makefile | 2 +- 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 120000 arch/mips/dts/include/dt-bindings create mode 100644 arch/mips/dts/skeleton.dtsi
diff --git a/arch/Kconfig b/arch/Kconfig index 6489cc9..589fc47 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -54,6 +54,7 @@ config MIPS select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD
- select SUPPORT_OF_CONTROL
config NDS32 bool "NDS32 architecture" diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 52e28f2..d4d688e 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -70,3 +70,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections -pie OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .got OBJCOPYFLAGS += -j .u_boot_list -j .rel.dyn -j .padding +ifdef CONFIG_OF_EMBED +OBJCOPYFLAGS += -j .dtb.init.rodata +endif diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore new file mode 100644 index 0000000..b60ed20 --- /dev/null +++ b/arch/mips/dts/.gitignore @@ -0,0 +1 @@ +*.dtb diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile new file mode 100644 index 0000000..724b5d2 --- /dev/null +++ b/arch/mips/dts/Makefile @@ -0,0 +1,16 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +#
+#dtb-$(CONFIG_XXX) += xxx.dtb
+targets += $(dtb-y)
+# Add any required device tree compiler flags here +DTC_FLAGS +=
+PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y))
- @:
+clean-files := *.dtb diff --git a/arch/mips/dts/include/dt-bindings b/arch/mips/dts/include/dt-bindings new file mode 120000 index 0000000..0cecb3d --- /dev/null +++ b/arch/mips/dts/include/dt-bindings @@ -0,0 +1 @@ +../../../../include/dt-bindings \ No newline at end of file diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi new file mode 100644 index 0000000..ad41546 --- /dev/null +++ b/arch/mips/dts/skeleton.dtsi @@ -0,0 +1,21 @@ +/*
- Skeleton device tree; the bare minimum needed to boot; just include and
- add a compatible value. The bootloader will typically populate the memory
- node.
- */
+/ {
- #address-cells = <1>;
- #size-cells = <1>;
- chosen {
- };
- aliases {
- };
- memory {
device_type = "memory";reg = <0 0>;- };
+}; diff --git a/dts/Makefile b/dts/Makefile index d3122aa..5c3a01f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -45,4 +45,4 @@ dtbs: $(obj)/dt.dtb clean-files := dt.dtb.S
# Let clean descend into dts directories -subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts +subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/mips/dts
participants (3)
-
Daniel Schwierzeck -
Marek Vasut -
Purna Chandra Mandal