| Message ID | 20200707084026.2862-1-rasmus.villemoes@prevas.dk |
|---|---|
| State | Accepted |
| Commit | 5c6a4d5a2779d7c2611319076d9aa4a23981855f |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | remove include/config_defaults.h | expand |
On Tue, Jul 07, 2020 at 10:40:26AM +0200, Rasmus Villemoes wrote: > Since commit 4b0bcfa7c4ec (Kconfig: Migrate CONFIG_BOOTM_* options), > the config_defaults.h file has been void of any actual content - and > these days, "sane defaults for everyone" is achieved by appropriate > default values in Kconfig. Remove it, and thus make every translation > unit process one less header file. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Applied to u-boot/master, thanks!
diff --git a/include/config_defaults.h b/include/config_defaults.h deleted file mode 100644 index d211a41ef2..0000000000 --- a/include/config_defaults.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * config_defaults.h - sane defaults for everyone - * - * Copyright (c) 2009 Analog Devices Inc. - * - * Licensed under the GPL-2 or later. - */ - -#ifndef _CONFIG_DEFAULTS_H_ -#define _CONFIG_DEFAULTS_H_ - -#endif diff --git a/include/configs/kc1.h b/include/configs/kc1.h index e3a219c46b..3f71739f83 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -149,10 +149,4 @@ "mmc read ${kernel_addr_r} ${boot_mmc_start} ${boot_mmc_size} && " \ "bootm ${kernel_addr_r};" -/* - * Defaults - */ - -#include <config_defaults.h> - #endif diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 0e2fcc3e23..5ea8efabfc 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -142,10 +142,4 @@ "mmc read ${kernel_addr_r} ${boot_mmc_start} ${boot_mmc_size} && " \ "bootm ${kernel_addr_r};" -/* - * Defaults - */ - -#include <config_defaults.h> - #endif diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 00b8fb34aa..0bfc1b2a62 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -104,7 +104,6 @@ define filechk_config_h | sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \ done; \ echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ - echo \#include \<config_defaults.h\>; \ echo \#include \<config_uncmd_spl.h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<asm/config.h\>; \
Since commit 4b0bcfa7c4ec (Kconfig: Migrate CONFIG_BOOTM_* options), the config_defaults.h file has been void of any actual content - and these days, "sane defaults for everyone" is achieved by appropriate default values in Kconfig. Remove it, and thus make every translation unit process one less header file. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- include/config_defaults.h | 12 ------------ include/configs/kc1.h | 6 ------ include/configs/sniper.h | 6 ------ scripts/Makefile.autoconf | 1 - 4 files changed, 25 deletions(-) delete mode 100644 include/config_defaults.h