On Tue, Nov 5, 2019 at 10:04 AM Rob Herring <robh+dt@xxxxxxxxxx> wrote: > > On Fri, Nov 1, 2019 at 3:12 AM Masahiro Yamada > <yamada.masahiro@xxxxxxxxxxxxx> wrote: > > > > Copying source files during the build time may not end up with > > as clean code as you expect. > > > > lib/fdt*.c simply wrap scripts/dtc/libfdt/fdt*.c, and it works > > nicely. Let's follow that approach for the arm decompressor, too. > > > > Add four wrappers, arch/arm/boot/compressed/fdt*.c and remove the > > Makefile messes. > > > > Another nice thing is we no longer need to maintain the separate > > libfdt_env.h since we can include <linux/libfdt_env.h>, and the > > diff stat also looks nice. > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > > --- > > > > Changes in v2: None > > > > arch/arm/boot/compressed/.gitignore | 9 ------- > > arch/arm/boot/compressed/Makefile | 33 +++++++------------------ > > arch/arm/boot/compressed/atags_to_fdt.c | 1 + > > arch/arm/boot/compressed/fdt.c | 2 ++ > > arch/arm/boot/compressed/fdt_ro.c | 2 ++ > > arch/arm/boot/compressed/fdt_rw.c | 2 ++ > > arch/arm/boot/compressed/fdt_wip.c | 2 ++ > > arch/arm/boot/compressed/libfdt_env.h | 22 ----------------- > > 8 files changed, 18 insertions(+), 55 deletions(-) > > create mode 100644 arch/arm/boot/compressed/fdt.c > > create mode 100644 arch/arm/boot/compressed/fdt_ro.c > > create mode 100644 arch/arm/boot/compressed/fdt_rw.c > > create mode 100644 arch/arm/boot/compressed/fdt_wip.c > > delete mode 100644 arch/arm/boot/compressed/libfdt_env.h > > Looks fine to me other than my question on licensing on patch 1. > > Who did you want to take the series? I can take it with Russell's ack. Rob, I'd like you to take the whole of this patch set if there is no objection. Russell, Is this patch OK with you? > > > > -$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \ > > - $(addprefix $(obj)/,$(libfdt_hdrs)) > > +OBJS += $(libfdt_objs) > > Seems like this file could benefit from doing 'OBJS-$(CONFIG_*)' style > variables. I agree, but this kind of refactoring is not the main interest of this series. It should be done by a separate patch if it is desired. > > diff --git a/arch/arm/boot/compressed/fdt.c b/arch/arm/boot/compressed/fdt.c > > new file mode 100644 > > index 000000000000..f8ea7a201ab1 > > --- /dev/null > > +++ b/arch/arm/boot/compressed/fdt.c > > @@ -0,0 +1,2 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +#include "../../../../lib/fdt.c" > > diff --git a/arch/arm/boot/compressed/fdt_ro.c b/arch/arm/boot/compressed/fdt_ro.c > > new file mode 100644 > > index 000000000000..93970a4ad5ae > > --- /dev/null > > +++ b/arch/arm/boot/compressed/fdt_ro.c > > @@ -0,0 +1,2 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +#include "../../../../lib/fdt_ro.c" > > diff --git a/arch/arm/boot/compressed/fdt_rw.c b/arch/arm/boot/compressed/fdt_rw.c > > new file mode 100644 > > index 000000000000..f7c6b8b7e01c > > --- /dev/null > > +++ b/arch/arm/boot/compressed/fdt_rw.c > > @@ -0,0 +1,2 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +#include "../../../../lib/fdt_rw.c" > > diff --git a/arch/arm/boot/compressed/fdt_wip.c b/arch/arm/boot/compressed/fdt_wip.c > > new file mode 100644 > > index 000000000000..048d2c7a088d > > --- /dev/null > > +++ b/arch/arm/boot/compressed/fdt_wip.c > > @@ -0,0 +1,2 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +#include "../../../../lib/fdt_wip.c" I gave GPL-2.0-only to this, but it should be the same as lib/fdt*.c, which is now being discussed in 1/3. -- Best Regards Masahiro Yamada
