diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-01 19:31:38 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-06 15:36:26 -0600 |
commit | 41836ec3ad1cbbd5af32490f7ff7ac153d5fb335 (patch) | |
tree | dbefd5a48f5b034108c6b5b7c2138430539622b2 | |
parent | 5575019fe9cf1ba7d44cc9014bb9851f68de09f9 (diff) | |
download | u-boot-HACK/final-remove-common_h.zip u-boot-HACK/final-remove-common_h.tar.gz u-boot-HACK/final-remove-common_h.tar.bz2 |
common.h: Remove this file and all referencesHACK/final-remove-common_h
With all files that had included this file directly having been updated,
we can now remove this file.
Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r-- | doc/develop/codingstyle.rst | 8 | ||||
-rw-r--r-- | doc/develop/tests_writing.rst | 1 | ||||
-rw-r--r-- | include/common.h | 33 | ||||
-rw-r--r-- | tools/dtoc/dtb_platdata.py | 3 | ||||
-rwxr-xr-x | tools/dtoc/test_dtoc.py | 3 |
5 files changed, 2 insertions, 46 deletions
diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst index f6248cd..fa3cd6a 100644 --- a/doc/develop/codingstyle.rst +++ b/doc/develop/codingstyle.rst @@ -110,9 +110,8 @@ Include files You should follow this ordering in U-Boot. In all cases, they should be listed in alphabetical order. First comes headers which are located directly in our -top-level include diretory. This excludes the common.h header file which is to -be removed. Second are headers within subdirectories, Finally directory-local -includes should be listed. See this example: +top-level include diretory. Second are headers within subdirectories, Finally +directory-local includes should be listed. See this example: .. code-block:: C @@ -129,9 +128,6 @@ For files that need to be compiled for the host (e.g. tools), you need to use ``#ifndef USE_HOSTCC`` to avoid including U-Boot specific include files. See common/image.c for an example. -If you encounter code which still uses <common.h> a patch to remove that and -replace it with any required include files directly is much appreciated. - If your file uses driver model, include <dm.h> in the C file. Do not include dm.h in a header file. Try to use forward declarations (e.g. ``struct udevice``) instead. diff --git a/doc/develop/tests_writing.rst b/doc/develop/tests_writing.rst index bb1145d..44b544f 100644 --- a/doc/develop/tests_writing.rst +++ b/doc/develop/tests_writing.rst @@ -281,7 +281,6 @@ new one of those, you should add a new suite. Create a new file in test/ or a subdirectory and define a macro to register the suite. For example:: - #include <common.h> #include <console.h> #include <mapmem.h> #include <dm/test.h> diff --git a/include/common.h b/include/common.h deleted file mode 100644 index a79c2bb..0000000 --- a/include/common.h +++ /dev/null @@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Common header file for U-Boot - * - * This file still includes quite a few headers that should be included - * individually as needed. Patches to remove things are welcome. - * - * (C) Copyright 2000-2009 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - */ - -#ifndef __COMMON_H_ -#define __COMMON_H_ 1 - -#ifndef __ASSEMBLY__ /* put C only stuff in this section */ -#include <config.h> -#include <errno.h> -#include <time.h> -#include <linux/types.h> -#include <linux/string.h> -#include <stdarg.h> -#include <stdio.h> -#include <linux/kernel.h> -#include <asm/u-boot.h> /* boot information for Linux kernel */ -#include <vsprintf.h> -#endif /* __ASSEMBLY__ */ - -/* Pull in stuff for the build system */ -#ifdef DO_DEPS_ONLY -# include <env_internal.h> -#endif - -#endif /* __COMMON_H_ */ diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 39f416c..89066e6 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -835,7 +835,6 @@ class DtbPlatdata(): def generate_uclasses(self): self.out('\n') - self.out('#include <common.h>\n') self.out('#include <dm.h>\n') self.out('#include <dt-structs.h>\n') self.out('\n') @@ -1059,7 +1058,6 @@ class DtbPlatdata(): self.out('/* Allow use of U_BOOT_DRVINFO() in this file */\n') self.out('#define DT_PLAT_C\n') self.out('\n') - self.out('#include <common.h>\n') self.out('#include <dm.h>\n') self.out('#include <dt-structs.h>\n') self.out('\n') @@ -1092,7 +1090,6 @@ class DtbPlatdata(): See the documentation in doc/driver-model/of-plat.rst for more information. """ - self.out('#include <common.h>\n') self.out('#include <dm.h>\n') self.out('#include <dt-structs.h>\n') self.out('\n') diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 597c93e..c4a0889 100755 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -63,7 +63,6 @@ C_HEADER = C_HEADER_PRE + ''' /* Allow use of U_BOOT_DRVINFO() in this file */ #define DT_PLAT_C -#include <common.h> #include <dm.h> #include <dt-structs.h> ''' @@ -417,7 +416,6 @@ U_BOOT_DRVINFO(spl_test3) = { ''' uclass_text_inst = ''' -#include <common.h> #include <dm.h> #include <dt-structs.h> @@ -521,7 +519,6 @@ DM_UCLASS_INST(testfdt) = { * This was generated by dtoc from a .dtb (device tree binary) file. */ -#include <common.h> #include <dm.h> #include <dt-structs.h> |