diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-06-30 14:28:52 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 14:28:52 +0100 |
| commit | becfc3c86df963491ff1d5ffc6131a06af6bb851 (patch) | |
| tree | 4b60fb962445166025724b84ce13e7f1762df8a1 /scripts/dtc/update-dtc-source.sh | |
| parent | ce32f859646bab2ed724393398b90aa50149bb44 (diff) | |
| parent | 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'scripts/dtc/update-dtc-source.sh')
| -rwxr-xr-x | scripts/dtc/update-dtc-source.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh index feb01ef26be4..f5cde799db03 100755 --- a/scripts/dtc/update-dtc-source.sh +++ b/scripts/dtc/update-dtc-source.sh @@ -34,6 +34,7 @@ DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \ dtc-lexer.l dtc-parser.y" DTC_GENERATED="dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h" +LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_empty_tree.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h" # Build DTC cd $DTC_UPSTREAM_PATH @@ -50,5 +51,13 @@ for f in $DTC_GENERATED; do cp ${DTC_UPSTREAM_PATH}/$f ${f}_shipped git add ${f}_shipped done +for f in $LIBFDT_SOURCE; do + cp ${DTC_UPSTREAM_PATH}/libfdt/${f} libfdt/${f} + git add libfdt/${f} +done + +sed -i -- 's/#include <libfdt_env.h>/#include "libfdt_env.h"/g' ./libfdt/libfdt.h +sed -i -- 's/#include <fdt.h>/#include "fdt.h"/g' ./libfdt/libfdt.h +git add ./libfdt/libfdt.h git commit -e -v -m "scripts/dtc: Update to upstream version [CHANGEME]" |