diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-02-19 12:36:59 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-20 08:57:52 +0100 |
commit | 856d979f9a940c6094e3fe5b122989d6bdf8840c (patch) | |
tree | eac7a9fb07d148bcc986e33471017e6985fed7bb /scripts/dtc | |
parent | 3c2dee2e7d62a32ba85f7bf94bb7abf5b4f09dab (diff) | |
download | barebox-856d979f9a940c6094e3fe5b122989d6bdf8840c.tar.gz barebox-856d979f9a940c6094e3fe5b122989d6bdf8840c.tar.xz |
scripts/dtc: fix update-dtc-source.sh for barebox use
Unlike Linux:
- barebox' scripts/gen-dtb-s has a dependency on fdget,
thus change the script to copy fdget.c as part of the update.
- has the libfdt source files in the same directory as the rest
- we don't have/need Makefile.libfdt
Adjust the update-dtc-source.sh script to account for this, so
it can be used to update the scripts/dtc directory. To do so, run
the script while its directory is otherwise empty.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts/dtc')
-rwxr-xr-x | scripts/dtc/update-dtc-source.sh | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh index 1a009fd195..e29f5af00f 100755 --- a/scripts/dtc/update-dtc-source.sh +++ b/scripts/dtc/update-dtc-source.sh @@ -4,15 +4,14 @@ # # This script assumes that the dtc and the linux git trees are in the # same directory. After building dtc in the dtc directory, it copies the -# source files and generated source file(s) into the scripts/dtc directory -# in the kernel and creates a git commit updating them to the new -# version. +# source files into the scripts/dtc directory in barebox and creates a git +# commit updating them to the new version. # -# Usage: from the top level Linux source tree, run: +# Usage: from the top level barebox source tree, run: # $ ./scripts/dtc/update-dtc-source.sh # # The script will change into the dtc tree, build and test dtc, copy the -# relevant files into the kernel tree and create a git commit. The commit +# relevant files into the barebox tree and create a git commit. The commit # message will need to be modified to reflect the version of DTC being # imported # @@ -33,8 +32,8 @@ DTC_LINUX_PATH=`pwd`/scripts/dtc 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" -LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \ + dtc-lexer.l dtc-parser.y fdtget.c" +LIBFDT_SOURCE="fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \ fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \ fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h" @@ -59,13 +58,13 @@ for f in $DTC_SOURCE; do git add ${f} done for f in $LIBFDT_SOURCE; do - cp ${DTC_UPSTREAM_PATH}/libfdt/${f} libfdt/${f} - git add libfdt/${f} + cp ${DTC_UPSTREAM_PATH}/libfdt/${f} ${f} + git add ${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 +sed -i -- 's/#include <libfdt_env.h>/#include "libfdt_env.h"/g' ./libfdt.h +sed -i -- 's/#include <fdt.h>/#include "fdt.h"/g' ./libfdt.h +git add ./libfdt.h commit_msg=$(cat << EOF scripts/dtc: Update to upstream version ${dtc_version} |