diff options
| author | Tom Rini <[email protected]> | 2024-05-07 08:01:06 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-07 08:01:06 -0600 |
| commit | 7e2938beabac24e6c8baad33e254b2383dbe9490 (patch) | |
| tree | dbefd5a48f5b034108c6b5b7c2138430539622b2 /scripts | |
| parent | 52835266d3e933656a217233eaf672dd9ccd7352 (diff) | |
| parent | 47558a4fce629390133bc6f410a942f109165efd (diff) | |
Merge branch '2024-05-06-remove-include-common_h' into next
- Merge the four series that I made to finally remove include/common.h.
For the most part, this is just removing <common.h> entirely. In a few
cases we needed to add <linux/types.h> or <time.h>. In the case of
PowerPC related code, we instead need to bring in <asm/ppc.h>.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.autoconf | 4 | ||||
| -rwxr-xr-x | scripts/gen_ll_addressable_symbols.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 8208ffe2274..b42f9b525fe 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -45,7 +45,7 @@ c_flags := $(KBUILD_CFLAGS) $(KBUILD_CPPFLAGS) $(PLATFORM_CPPFLAGS) \ quiet_cmd_autoconf_dep = GEN $@ cmd_autoconf_dep = $(CC) -x c -DDO_DEPS_ONLY -M -MP $(c_flags) \ - -MQ include/config/auto.conf $(srctree)/include/common.h > $@ || { \ + -MQ include/config/auto.conf include/config.h > $@ || { \ rm $@; false; \ } include/autoconf.mk.dep: include/config.h FORCE @@ -70,7 +70,7 @@ quiet_cmd_autoconf = GEN $@ quiet_cmd_u_boot_cfg = CFG $@ cmd_u_boot_cfg = \ - $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > [email protected] && { \ + $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM include/config.h > [email protected] && { \ grep 'define CONFIG_' [email protected] | \ sed '/define CONFIG_IS_ENABLED(/d;/define CONFIG_IF_ENABLED_INT(/d;/define CONFIG_VAL(/d;' > $@; \ rm [email protected]; \ diff --git a/scripts/gen_ll_addressable_symbols.sh b/scripts/gen_ll_addressable_symbols.sh index d0864804aaf..13f670ae0ef 100755 --- a/scripts/gen_ll_addressable_symbols.sh +++ b/scripts/gen_ll_addressable_symbols.sh @@ -10,6 +10,6 @@ set -e -echo '#include <common.h>' +echo '#include <linux/compiler.h>' $@ 2>/dev/null | grep -oe '_u_boot_list_2_[a-zA-Z0-9_]*_2_[a-zA-Z0-9_]*' | \ sort -u | sed -e 's/^\(.*\)/extern char \1[];\n__ADDRESSABLE(\1);/' |