Move dtc and libfdt sources from arch/powerpc/boot to scripts/dtc
Subsystems (3)
PATCH 1/1 Move dtc and libfdt sources from arch/powerpc/boot to scripts/dtc
The powerpc kernel always requires an Open Firmware like device tree to supply device information. On systems without OF, this comes from a flattened device tree blob. This blob is usually generated by dtc, a tool which compiles a text description of the device tree into the flattened format used by the kernel. Sometimes, the bootwrapper makes small changes to the pre-compiled device tree blob (e.g. filling in the size of RAM). To do this it uses the libfdt library.
Because these are only used on powerpc, the code for both these tools is included under arch/powerpc/boot (these were imported and are periodically updated from the upstream dtc tree).
However, the microblaze architecture, currently being prepared for merging to mainline also uses dtc to produce device tree blobs. A few other archs have also mentioned some interest in using dtc. Therefore, this patch moves dtc and libfdt from arch/powerpc into scripts, where it can be used by any architecture.
The vast bulk of this patch is a literal move, the rest is adjusting the various Makefiles to use dtc and libfdt correctly from their new locations.
---
arch/powerpc/Kconfig | 4 +
arch/powerpc/boot/Makefile | 67 +++++++-------------
arch/powerpc/boot/simpleboot.c | 2 +-
scripts/Makefile | 1 +
scripts/dtc/Makefile | 54 ++++++++++++++++
.../boot/dtc-src => scripts/dtc}/Makefile.dtc | 0
.../powerpc/boot/dtc-src => scripts/dtc}/checks.c | 0
{arch/powerpc/boot/dtc-src => scripts/dtc}/data.c | 0
.../boot/dtc-src => scripts/dtc}/dtc-lexer.l | 0
.../dtc}/dtc-lexer.lex.c_shipped | 0
.../dtc}/dtc-parser.tab.c_shipped | 0
.../dtc}/dtc-parser.tab.h_shipped | 0
.../boot/dtc-src => scripts/dtc}/dtc-parser.y | 0
{arch/powerpc/boot/dtc-src => scripts/dtc}/dtc.c | 0
{arch/powerpc/boot/dtc-src => scripts/dtc}/dtc.h | 0
.../boot/dtc-src => scripts/dtc}/flattree.c | 0
.../powerpc/boot/dtc-src => scripts/dtc}/fstree.c | 0
.../boot => scripts/dtc}/libfdt/Makefile.libfdt | 0
{arch/powerpc/boot => scripts/dtc}/libfdt/fdt.c | 0
{arch/powerpc/boot => scripts/dtc}/libfdt/fdt.h | 0
{arch/powerpc/boot => scripts/dtc}/libfdt/fdt_ro.c | 0
{arch/powerpc/boot => scripts/dtc}/libfdt/fdt_rw.c | 0
.../boot => scripts/dtc}/libfdt/fdt_strerror.c | 0
{arch/powerpc/boot => scripts/dtc}/libfdt/fdt_sw.c | 0
.../powerpc/boot => scripts/dtc}/libfdt/fdt_wip.c | 0
{arch/powerpc/boot => scripts/dtc}/libfdt/libfdt.h | 0
.../dtc-src => scripts/dtc/libfdt}/libfdt_env.h | 0
.../boot => scripts/dtc}/libfdt/libfdt_internal.h | 0
.../boot/dtc-src => scripts/dtc}/livetree.c | 0
.../powerpc/boot/dtc-src => scripts/dtc}/srcpos.c | 0
.../powerpc/boot/dtc-src => scripts/dtc}/srcpos.h | 0
.../boot/dtc-src => scripts/dtc}/treesource.c | 0
.../boot/dtc-src => scripts/dtc}/version_gen.h | 0
33 files changed, 83 insertions(+), 45 deletions(-)
create mode 100644 scripts/dtc/Makefile
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/Makefile.dtc (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/checks.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/data.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc-lexer.l (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc-lexer.lex.c_shipped (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc-parser.tab.c_shipped (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc-parser.tab.h_shipped (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc-parser.y (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/dtc.h (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/flattree.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/fstree.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/Makefile.libfdt (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt.h (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt_ro.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt_rw.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt_strerror.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt_sw.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/fdt_wip.c (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/libfdt.h (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc/libfdt}/libfdt_env.h (100%)
rename {arch/powerpc/boot => scripts/dtc}/libfdt/libfdt_internal.h (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/livetree.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/srcpos.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/srcpos.h (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/treesource.c (100%)
rename {arch/powerpc/boot/dtc-src => scripts/dtc}/version_gen.h (100%)arch/powerpc/Kconfig +4 -0
@@ -181,6 +181,10 @@ config SYS_SUPPORTS_APM_EMULATION default y if PMAC_APM_EMU bool +config DTC + bool + default y + config DEFAULT_UIMAGE bool help
arch/powerpc/boot/Makefile +23 -44
119 lines not on this page · raw message
arch/powerpc/boot/simpleboot.c +1 -1
@@ -19,7 +19,7 @@#include "types.h" #include "io.h" #include "stdio.h" -#include "libfdt/libfdt.h" +#include <libfdt.h> BSS_STACK (4 *1024 );
scripts/Makefile +1 -0
@@ -21,6 +21,7 @@ hostprogs-y += unifdef subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-y += mod subdir-$(CONFIG_SECURITY_SELINUX) += selinux +subdir-$(CONFIG_DTC) += dtc # Let clean descend into subdirs subdir- += basic kconfig package selinux
scripts/dtc/Makefile new file +54 -0
54 lines not on this page · raw message
scripts/dtc/Makefile.dtc renamed from arch/powerpc/boot/dtc-src/Makefile.dtc +0 -0
scripts/dtc/checks.c renamed from arch/powerpc/boot/dtc-src/checks.c +0 -0
scripts/dtc/data.c renamed from arch/powerpc/boot/dtc-src/data.c +0 -0
scripts/dtc/dtc-lexer.l renamed from arch/powerpc/boot/dtc-src/dtc-lexer.l +0 -0
scripts/dtc/dtc-lexer.lex.c_shipped renamed from arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped +0 -0
scripts/dtc/dtc-parser.tab.c_shipped renamed from arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped +0 -0
scripts/dtc/dtc-parser.tab.h_shipped renamed from arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped +0 -0
scripts/dtc/dtc-parser.y renamed from arch/powerpc/boot/dtc-src/dtc-parser.y +0 -0
scripts/dtc/dtc.c renamed from arch/powerpc/boot/dtc-src/dtc.c +0 -0
scripts/dtc/dtc.h renamed from arch/powerpc/boot/dtc-src/dtc.h +0 -0
scripts/dtc/flattree.c renamed from arch/powerpc/boot/dtc-src/flattree.c +0 -0
scripts/dtc/fstree.c renamed from arch/powerpc/boot/dtc-src/fstree.c +0 -0
scripts/dtc/libfdt/Makefile.libfdt renamed from arch/powerpc/boot/libfdt/Makefile.libfdt +0 -0
scripts/dtc/libfdt/fdt.c renamed from arch/powerpc/boot/libfdt/fdt.c +0 -0
scripts/dtc/libfdt/fdt.h renamed from arch/powerpc/boot/libfdt/fdt.h +0 -0
scripts/dtc/libfdt/fdt_ro.c renamed from arch/powerpc/boot/libfdt/fdt_ro.c +0 -0
scripts/dtc/libfdt/fdt_rw.c renamed from arch/powerpc/boot/libfdt/fdt_rw.c +0 -0
scripts/dtc/libfdt/fdt_strerror.c renamed from arch/powerpc/boot/libfdt/fdt_strerror.c +0 -0
scripts/dtc/libfdt/fdt_sw.c renamed from arch/powerpc/boot/libfdt/fdt_sw.c +0 -0
scripts/dtc/libfdt/fdt_wip.c renamed from arch/powerpc/boot/libfdt/fdt_wip.c +0 -0
scripts/dtc/libfdt/libfdt.h renamed from arch/powerpc/boot/libfdt/libfdt.h +0 -0
scripts/dtc/libfdt/libfdt_env.h renamed from arch/powerpc/boot/dtc-src/libfdt_env.h +0 -0
scripts/dtc/libfdt/libfdt_internal.h renamed from arch/powerpc/boot/libfdt/libfdt_internal.h +0 -0
scripts/dtc/livetree.c renamed from arch/powerpc/boot/dtc-src/livetree.c +0 -0
scripts/dtc/srcpos.c renamed from arch/powerpc/boot/dtc-src/srcpos.c +0 -0
scripts/dtc/srcpos.h renamed from arch/powerpc/boot/dtc-src/srcpos.h +0 -0
scripts/dtc/treesource.c renamed from arch/powerpc/boot/dtc-src/treesource.c +0 -0
scripts/dtc/version_gen.h renamed from arch/powerpc/boot/dtc-src/version_gen.h +0 -0
Signature · 7 lines
1.6.2.3 -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson