mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
![Gaurav Minocha](/assets/img/avatar_default.png)
The following script is used to import dtc upstream into kernel. It was missing import of dtc/libfdt, with this commit it will include the same. Also, currently in arch and driver code that needs early access to the flattened device tree it is necessary to add specific CFLAGS so that when scripts/dtc/libfdt/libfdt.h is included the C preprocessor is able to locate the libfdt versions of libfdt_env.h and fdt.h without generating an error. So, this script replaces angular brackets with quotation used to include header files fdt.h and libfdt_env.h Signed-off-by: Gaurav Minocha <gaurav.minocha.os@gmail.com> [robh: reword commit headline and add 'git add'] Signed-off-by: Rob Herring <robh@kernel.org>
63 lines
2.2 KiB
Bash
Executable file
63 lines
2.2 KiB
Bash
Executable file
#!/bin/sh
|
|
# Simple script to update the version of DTC carried by the Linux kernel
|
|
#
|
|
# 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 files into the scripts/dtc directory
|
|
# in the kernel and creates a git commit updating them to the new
|
|
# version.
|
|
#
|
|
# Usage: from the top level Linux 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
|
|
# message will need to be modified to reflect the version of DTC being
|
|
# imported
|
|
#
|
|
# TODO:
|
|
# This script is pretty basic, but it is seldom used so a few manual tasks
|
|
# aren't a big deal. If anyone is interested in making it more robust, the
|
|
# the following would be nice:
|
|
# * Actually fail to complete if any testcase fails.
|
|
# - The dtc "make check" target needs to return a failure
|
|
# * Extract the version number from the dtc repo for the commit message
|
|
# * Build dtc in the kernel tree
|
|
# * run 'make check" on dtc built from the kernel tree
|
|
|
|
set -ev
|
|
|
|
DTC_UPSTREAM_PATH=`pwd`/../dtc
|
|
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"
|
|
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
|
|
make clean
|
|
make check
|
|
|
|
# Copy the files into the Linux tree
|
|
cd $DTC_LINUX_PATH
|
|
for f in $DTC_SOURCE; do
|
|
cp ${DTC_UPSTREAM_PATH}/${f} ${f}
|
|
git add ${f}
|
|
done
|
|
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]"
|