microblaze: migrate to the generic rule for built-in DTB
Subsystems (2)
PATCH 1/1 microblaze: migrate to the generic rule for built-in DTB
Commit 654102df2ac2 ("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.
Select GENERIC_BUILTIN_DTB to use the generic rule.
MicroBlaze is the only architecture that places the built-in DTB to its own section, __fdt_blob, rather than the standard location defined by the KERNEL_DTB() macro.
For backward compatibility, arch/microblaze/boot/dts/system.dtb is still placed in the __fdt_blob section, and possibly overwritten by an externel DTB passed via the r7 register.
---
arch/microblaze/Kbuild | 1 - arch/microblaze/Kconfig | 5 +++++ arch/microblaze/boot/dts/Makefile | 5 ----- arch/microblaze/boot/dts/linked_dtb.S | 2 -- arch/microblaze/kernel/vmlinux.lds.S | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 arch/microblaze/boot/dts/linked_dtb.S
arch/microblaze/Kbuild +0 -1
@@ -2,7 +2,6 @@ obj-y += kernel/ obj-y += mm/ obj-$(CONFIG_PCI) += pci/ -obj-y += boot/dts/ # for cleaning subdir- += boot
arch/microblaze/Kconfig +5 -0
@@ -10,6 +10,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_TABLE_SORT + select GENERIC_BUILTIN_DTB select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK
@@ -47,6 +48,10 @@ config MICROBLAZE select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER +config BUILTIN_DTB_NAME + string + default "system" + # Endianness selection choice prompt "Endianness selection"
arch/microblaze/boot/dts/Makefile +0 -5
@@ -4,11 +4,6 @@ dtb-y := system.dtb ifneq ($(DTB),) -obj-y += linked_dtb.o - -# Ensure system.dtb exists -$(obj)/linked_dtb.o: $(obj)/system.dtb - # Generate system.dtb from $(DTB).dtb ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtb
arch/microblaze/boot/dts/linked_dtb.S deleted +0 -2
@@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/microblaze/boot/dts/system.dtb"
arch/microblaze/kernel/vmlinux.lds.S +1 -1
@@ -47,7 +47,7 @@ SECTIONS { . = ALIGN (8) ; __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) { _fdt_start = . ; /* place for fdt blob */ - *(__fdt_blob) ; /* Any link-placed DTB */ + *(.dtb.init.rodata) ; /* Any link-placed DTB */ . = _fdt_start + 0x10000; /* Pad up to 64kbyte */ _fdt_end = . ; }
Signature · 1 line
2.43.0
Hi Masahiro,
Quoted 88 lines · Masahiro Yamada
Commit
654102df2ac2("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.Select
GENERIC_BUILTIN_DTBto use the generic rule.MicroBlaze is the only architecture that places the built-in DTB to its own section,
__fdt_blob, rather than the standard location defined by theKERNEL_DTB()macro.For backward compatibility,
arch/microblaze/boot/dts/system.dtbis still placed in the__fdt_blobsection, and possibly overwritten by an externel DTB passed via the r7 register.Signed-off-by Masahiro Yamada <[email protected]>---
arch/microblaze/Kbuild | 1 - arch/microblaze/Kconfig | 5 +++++ arch/microblaze/boot/dts/Makefile | 5 ----- arch/microblaze/boot/dts/linked_dtb.S | 2 -- arch/microblaze/kernel/vmlinux.lds.S | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-)delete mode 100644
arch/microblaze/boot/dts/linked_dtb.Sarch/microblaze/Kbuild +0
-1@@ -2,7 +2,6 @@ obj-y += kernel/ obj-y += mm/ obj-$(CONFIG_PCI) += pci/ -obj-y += boot/dts/ # for cleaning subdir- += bootarch/microblaze/Kconfig +5
-0@@ -10,6 +10,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_TABLE_SORT + select GENERIC_BUILTIN_DTB select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK@@ -47,6 +48,10 @@ config MICROBLAZE select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER +config BUILTIN_DTB_NAME + string + default "system" + # Endianness selection choice prompt "Endianness selection"arch/microblaze/boot/dts/Makefile +0
-5@@ -4,11 +4,6 @@ dtb-y := system.dtb ifneq ($(DTB),) -obj-y += linked_dtb.o - -# Ensure system.dtb exists -$(obj)/linked_dtb.o: $(obj)/system.dtb - # Generate system.dtb from $(DTB).dtb ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtbarch/microblaze/boot/dts/linked_dtb.S deleted +0
-2@@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/microblaze/boot/dts/system.dtb"arch/microblaze/kernel/vmlinux.lds.S +0
-0
arch/microblaze/kernel/vmlinux.lds.S SECTIONS { · line 53
Quoted 8 lines
arch/microblaze/kernel/vmlinux.lds.S +1
-1@@ -47,7 +47,7 @@ SECTIONS { . = ALIGN (8) ; __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) { _fdt_start = . ; /* place for fdt blob */ - *(__fdt_blob) ; /* Any link-placed DTB */ + *(.dtb.init.rodata) ; /* Any link-placed DTB */ . = _fdt_start + 0x10000; /* Pad up to 64kbyte */ _fdt_end = . ; }
This patch is better then previous one but still it is changing behavior of build. When this patch is applied linux.bin contains dtb which is not the same behavior as before (which was empty). DTB should be filled when simpleImage.<dt> is built.
Thanks,
Michal
Quoted 97 lines · Michal Simek
Hi Masahiro,
Quoted 93 lines · Masahiro Yamada
Commit
654102df2ac2("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.Select
GENERIC_BUILTIN_DTBto use the generic rule.MicroBlaze is the only architecture that places the built-in DTB to its own section,
__fdt_blob, rather than the standard location defined by theKERNEL_DTB()macro.For backward compatibility,
arch/microblaze/boot/dts/system.dtbis still placed in the__fdt_blobsection, and possibly overwritten by an externel DTB passed via the r7 register.Signed-off-by Masahiro Yamada <[email protected]>---
arch/microblaze/Kbuild | 1 - arch/microblaze/Kconfig | 5 +++++ arch/microblaze/boot/dts/Makefile | 5 ----- arch/microblaze/boot/dts/linked_dtb.S | 2 -- arch/microblaze/kernel/vmlinux.lds.S | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-)delete mode 100644
arch/microblaze/boot/dts/linked_dtb.Sarch/microblaze/Kbuild +0
-1@@ -2,7 +2,6 @@ obj-y += kernel/ obj-y += mm/ obj-$(CONFIG_PCI) += pci/ -obj-y += boot/dts/ # for cleaning subdir- += bootarch/microblaze/Kconfig +5
-0@@ -10,6 +10,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_TABLE_SORT + select GENERIC_BUILTIN_DTB select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK@@ -47,6 +48,10 @@ config MICROBLAZE select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER +config BUILTIN_DTB_NAME + string + default "system" + # Endianness selection choice prompt "Endianness selection"arch/microblaze/boot/dts/Makefile +0
-5@@ -4,11 +4,6 @@ dtb-y := system.dtb ifneq ($(DTB),) -obj-y += linked_dtb.o - -# Ensure system.dtb exists -$(obj)/linked_dtb.o: $(obj)/system.dtb - # Generate system.dtb from $(DTB).dtb ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtbarch/microblaze/boot/dts/linked_dtb.S deleted +0
-2@@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/microblaze/boot/dts/system.dtb"arch/microblaze/kernel/vmlinux.lds.S +1
-1@@ -47,7 +47,7 @@ SECTIONS { . = ALIGN (8) ; __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) { _fdt_start = . ; /* place for fdt blob */ - *(__fdt_blob) ; /* Any link-placed DTB */ + *(.dtb.init.rodata) ; /* Any link-placed DTB */
Quoted 8 lines
arch/microblaze/kernel/vmlinux.lds.S SECTIONS { · line 53
Quoted 3 lines
arch/microblaze/kernel/vmlinux.lds.S +0
-0. = _fdt_start + 0x10000; /* Pad up to 64kbyte */ _fdt_end = . ; }This patch is better then previous one but still it is changing behavior of build. When this patch is applied linux.bin contains dtb which is not the same behavior as before (which was empty).
DTB should be filled when simpleImage.<dt> is built.
Why is it a problem?
Microblaze always keeps 64kbyte space in case
an external DTB is passed from a boot-loader.
Even if the default system.dtb is placed there,
nothing is wasted.
One more thing, Microblaze is only the architecture that determines the built-in DTB by the command line.
I do not think it is a sensible way.
$ make linux.bin simpleImage.foo
--> linux.bin also contains the builtin device tree $ make simpleImage.foo simpleImage.bar
--> does not workAll other architectures determinantes the built-in DTB by CONFIG option.
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 107 lines · Masahiro Yamada
Quoted 97 lines · Michal Simek
Hi Masahiro,
Quoted 93 lines · Masahiro Yamada
Commit
654102df2ac2("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.Select
GENERIC_BUILTIN_DTBto use the generic rule.MicroBlaze is the only architecture that places the built-in DTB to its own section,
__fdt_blob, rather than the standard location defined by theKERNEL_DTB()macro.For backward compatibility,
arch/microblaze/boot/dts/system.dtbis still placed in the__fdt_blobsection, and possibly overwritten by an externel DTB passed via the r7 register.Signed-off-by Masahiro Yamada <[email protected]>---
arch/microblaze/Kbuild | 1 - arch/microblaze/Kconfig | 5 +++++ arch/microblaze/boot/dts/Makefile | 5 ----- arch/microblaze/boot/dts/linked_dtb.S | 2 -- arch/microblaze/kernel/vmlinux.lds.S | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-)delete mode 100644
arch/microblaze/boot/dts/linked_dtb.Sarch/microblaze/Kbuild +0
-1@@ -2,7 +2,6 @@ obj-y += kernel/ obj-y += mm/ obj-$(CONFIG_PCI) += pci/ -obj-y += boot/dts/ # for cleaning subdir- += bootarch/microblaze/Kconfig +5
-0@@ -10,6 +10,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_TABLE_SORT + select GENERIC_BUILTIN_DTB select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK@@ -47,6 +48,10 @@ config MICROBLAZE select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER +config BUILTIN_DTB_NAME + string + default "system" + # Endianness selection choice prompt "Endianness selection"arch/microblaze/boot/dts/Makefile +0
-5@@ -4,11 +4,6 @@ dtb-y := system.dtb ifneq ($(DTB),) -obj-y += linked_dtb.o - -# Ensure system.dtb exists -$(obj)/linked_dtb.o: $(obj)/system.dtb - # Generate system.dtb from $(DTB).dtb ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtbarch/microblaze/boot/dts/linked_dtb.S deleted +0
-2@@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/microblaze/boot/dts/system.dtb"arch/microblaze/kernel/vmlinux.lds.S +1
-1@@ -47,7 +47,7 @@ SECTIONS { . = ALIGN (8) ; __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) { _fdt_start = . ; /* place for fdt blob */ - *(__fdt_blob) ; /* Any link-placed DTB */ + *(.dtb.init.rodata) ; /* Any link-placed DTB */Quoted 8 lines
arch/microblaze/kernel/vmlinux.lds.S SECTIONS { · line 53
Quoted 3 lines
arch/microblaze/kernel/vmlinux.lds.S +0
-0. = _fdt_start + 0x10000; /* Pad up to 64kbyte */ _fdt_end = . ; }This patch is better then previous one but still it is changing behavior of build. When this patch is applied linux.bin contains dtb which is not the same behavior as before (which was empty).
DTB should be filled when simpleImage.<dt> is built.
Quoted 1 line
Why is it a problem?
Firstly that change is not described in commit message.
Second system.dtb is really old dtb more for demonstration purpose and nothing else and likely it is not working on any existing board.
Quoted 6 lines
Microblaze always keeps 64kbyte space in case
an external DTB is passed from a boot-loader.Even if the default system.dtb is placed there,
nothing is wasted.
It is not about wasting of space. It is about information which none is going to use. That's why linux.bin has no dtb inside.
Quoted 2 lines
One more thing, Microblaze is only the architecture that determines the built-in DTB by the command line.
yes and it has been done like this for many years without any complain about it. simpleImage has been taken from PPC in past.
Quoted 8 lines
I do not think it is a sensible way.
$ make linux.bin simpleImage.foo --> linux.bin also contains the builtin device tree$ make simpleImage.foo simpleImage.bar --> does not work
yes because foo.dtb and bar.dtb are not in the Linux tree.
Quoted 2 lines
All other architectures determinantes the built-in DTB by CONFIG option.
Microblaze is soft core and make no sense to start to push other DTSes to the Linux kernel because pretty much every design is unique. That's why only system.dts is there for demonstration purpose.
If users have multiple boards they can just add dts to the source code and build kernel. And linux.bin should be used with U-Boot ITBs where dtb is passed via register.
Thanks,
Michal