There are no differences for the different 832x targets we have in the header defined with SYS_CONFIG_NAME. So we can join the five headers to a single file.
Signed-off-by: Holger Brunck holger.brunck@hitachienergy.com --- board/keymile/km83xx/Kconfig | 10 +++++----- include/configs/{kmopti2.h => km832x.h} | 0 include/configs/kmsupx5.h | 26 ------------------------- include/configs/kmtepr2.h | 26 ------------------------- include/configs/tuge1.h | 26 ------------------------- include/configs/tuxx1.h | 26 ------------------------- 6 files changed, 5 insertions(+), 109 deletions(-) rename include/configs/{kmopti2.h => km832x.h} (100%) delete mode 100644 include/configs/kmsupx5.h delete mode 100644 include/configs/kmtepr2.h delete mode 100644 include/configs/tuge1.h delete mode 100644 include/configs/tuxx1.h
diff --git a/board/keymile/km83xx/Kconfig b/board/keymile/km83xx/Kconfig index f87a2e6416..9bdacee61a 100644 --- a/board/keymile/km83xx/Kconfig +++ b/board/keymile/km83xx/Kconfig @@ -69,7 +69,7 @@ config SYS_VENDOR default "keymile"
config SYS_CONFIG_NAME - default "tuxx1" + default "km832x"
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -88,7 +88,7 @@ config SYS_VENDOR default "keymile"
config SYS_CONFIG_NAME - default "kmsupx5" + default "km832x"
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -107,7 +107,7 @@ config SYS_VENDOR default "keymile"
config SYS_CONFIG_NAME - default "tuge1" + default "km832x"
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -126,7 +126,7 @@ config SYS_VENDOR default "keymile"
config SYS_CONFIG_NAME - default "kmopti2" + default "km832x"
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -145,7 +145,7 @@ config SYS_VENDOR default "keymile"
config SYS_CONFIG_NAME - default "kmtepr2" + default "km832x"
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y diff --git a/include/configs/kmopti2.h b/include/configs/km832x.h similarity index 100% rename from include/configs/kmopti2.h rename to include/configs/km832x.h diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h deleted file mode 100644 index 69c28c2035..0000000000 --- a/include/configs/kmsupx5.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2006 Freescale Semiconductor, Inc. - * Dave Liu daveliu@freescale.com - * - * Copyright (C) 2007 Logic Product Development, Inc. - * Peter Barada peterb@logicpd.com - * - * Copyright (C) 2007 MontaVista Software, Inc. - * Anton Vorontsov avorontsov@ru.mvista.com - * - * (C) Copyright 2008 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * (C) Copyright 2010-2013 - * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com - * Holger Brunck, Keymile GmbH, holger.bruncl@keymile.com - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* include common defines/options for all Keymile boards */ -#include "km/km-mpc83xx.h" - -#endif /* __CONFIG_H */ diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h deleted file mode 100644 index 69c28c2035..0000000000 --- a/include/configs/kmtepr2.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2006 Freescale Semiconductor, Inc. - * Dave Liu daveliu@freescale.com - * - * Copyright (C) 2007 Logic Product Development, Inc. - * Peter Barada peterb@logicpd.com - * - * Copyright (C) 2007 MontaVista Software, Inc. - * Anton Vorontsov avorontsov@ru.mvista.com - * - * (C) Copyright 2008 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * (C) Copyright 2010-2013 - * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com - * Holger Brunck, Keymile GmbH, holger.bruncl@keymile.com - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* include common defines/options for all Keymile boards */ -#include "km/km-mpc83xx.h" - -#endif /* __CONFIG_H */ diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h deleted file mode 100644 index 69c28c2035..0000000000 --- a/include/configs/tuge1.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2006 Freescale Semiconductor, Inc. - * Dave Liu daveliu@freescale.com - * - * Copyright (C) 2007 Logic Product Development, Inc. - * Peter Barada peterb@logicpd.com - * - * Copyright (C) 2007 MontaVista Software, Inc. - * Anton Vorontsov avorontsov@ru.mvista.com - * - * (C) Copyright 2008 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * (C) Copyright 2010-2013 - * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com - * Holger Brunck, Keymile GmbH, holger.bruncl@keymile.com - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* include common defines/options for all Keymile boards */ -#include "km/km-mpc83xx.h" - -#endif /* __CONFIG_H */ diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h deleted file mode 100644 index 69c28c2035..0000000000 --- a/include/configs/tuxx1.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2006 Freescale Semiconductor, Inc. - * Dave Liu daveliu@freescale.com - * - * Copyright (C) 2007 Logic Product Development, Inc. - * Peter Barada peterb@logicpd.com - * - * Copyright (C) 2007 MontaVista Software, Inc. - * Anton Vorontsov avorontsov@ru.mvista.com - * - * (C) Copyright 2008 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * (C) Copyright 2010-2013 - * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com - * Holger Brunck, Keymile GmbH, holger.bruncl@keymile.com - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* include common defines/options for all Keymile boards */ -#include "km/km-mpc83xx.h" - -#endif /* __CONFIG_H */