mips: remove unused INCDIR and BOARD variables in Makefile

PATCH Applied Masahiro Yamada 2 participants 3 messages Apr 30, 2020 – May 4, 2020 MIPS

lore

Share & tools

lore

Masahiro Yamada

author

2020-04-30 04:45 UTC #0 lore raw

PATCH 1/2 mips: remove unused INCDIR and BOARD variables in Makefile

The variable INCDIR is not used by anyone.

The variable BOARD is not set by anyone, so $(BOARD) is always empty.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/mips/Makefile | 13 -------------
 1 file changed, 13 deletions(-)

arch/mips/Makefile +0 ~~-13~~

index 4717f49a4..abfa82504 100644
@@ -88,25 +88,12 @@ else
 KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-ifeq ($(KBUILD_SRC),)
-KBUILD_CPPFLAGS += -I$(BOARD)/include
-else
-KBUILD_CPPFLAGS += -I$(srctree)/$(BOARD)/include
-endif
-
 ifneq ($(machine-y),)
 MACH  := arch/mips/mach-$(machine-y)/
 else
 MACH  :=
 endif
 
-common-y += $(BOARD)
-
 common-y += $(MACH)
 common-y += arch/mips/lib/
 common-y += arch/mips/boot/

Signature · 7 lines

2.25.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Masahiro Yamada

author

2020-04-30 04:45 UTC #1 lore raw

PATCH 2/2 mips: remove unused board/debug_ll.h

There is no way to include <board/debug_ll.h>. These three files are dead code.

Signed-off-by Masahiro Yamada <[email protected]>

---

 .../loongson-ls1b/include/board/debug_ll.h    | 22 -------------------
 .../netgear-wg102/include/board/debug_ll.h    | 21 ------------------
 .../qemu-malta/include/board/debug_ll.h       | 18 ---------------
 3 files changed, 61 deletions(-)
 delete mode 100644 arch/mips/boards/loongson-ls1b/include/board/debug_ll.h
 delete mode 100644 arch/mips/boards/netgear-wg102/include/board/debug_ll.h
 delete mode 100644 arch/mips/boards/qemu-malta/include/board/debug_ll.h

arch/mips/boards/loongson-ls1b/include/board/debug_ll.h deleted +0 ~~-22~~

deleted file mode 100644
index 05420f73a..000000000
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2014 Antony Pavlov <[email protected]>
- */
-
-/** @file
- *  This File contains declaration for early output support
- */
-#ifndef __LOONGSON_TECH_LS1B_DEBUG_LL_H__
-#define __LOONGSON_TECH_LS1B_DEBUG_LL_H__
-
-#include <asm/addrspace.h>
-#include <mach/loongson1.h>
-
-#define DEBUG_LL_UART_ADDR	KSEG1ADDR(LS1X_UART2_BASE)
-#define DEBUG_LL_UART_SHIFT	0
-
-#define DEBUG_LL_UART_CLK   (83000000 / 16)
-#define DEBUG_LL_UART_BPS   CONFIG_BAUDRATE
-#define DEBUG_LL_UART_DIVISOR   (DEBUG_LL_UART_CLK / DEBUG_LL_UART_BPS)
-
-#endif /* __LOONGSON_TECH_LS1B_DEBUG_LL_H__ */

arch/mips/boards/netgear-wg102/include/board/debug_ll.h deleted +0 ~~-21~~

deleted file mode 100644
index cc3b1d74b..000000000
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2013 Oleksij Rempel <[email protected]>
- */
-
-/** @file
- *  This File contains declaration for early output support
- */
-#ifndef __NETGEAR_WG102_DEBUG_LL_H__
-#define __NETGEAR_WG102_DEBUG_LL_H__
-
-#include <mach/ar2312_regs.h>
-
-#define DEBUG_LL_UART_ADDR	KSEG1ADDR(AR2312_UART0)
-#define DEBUG_LL_UART_SHIFT	AR2312_UART_SHIFT
-
-#define DEBUG_LL_UART_CLK   (45000000 / 16)
-#define DEBUG_LL_UART_BPS   CONFIG_BAUDRATE
-#define DEBUG_LL_UART_DIVISOR   (DEBUG_LL_UART_CLK / DEBUG_LL_UART_BPS)
-
-#endif /* __NETGEAR_WG102_DEBUG_LL_H__ */

arch/mips/boards/qemu-malta/include/board/debug_ll.h deleted +0 ~~-18~~

deleted file mode 100644
index 5b112b8ae..000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2013 Antony Pavlov <[email protected]>
- */
-
-#ifndef __INCLUDE_BOARD_DEBUG_LL_QEMU_MALTA_H__
-#define __INCLUDE_BOARD_DEBUG_LL_QEMU_MALTA_H__
-
-#include <mach/hardware.h>
-
-#define DEBUG_LL_UART_ADDR	MALTA_PIIX4_UART0
-#define DEBUG_LL_UART_SHIFT	0
-
-#define DEBUG_LL_UART_CLK       1843200
-#define DEBUG_LL_UART_BPS       CONFIG_BAUDRATE
-#define DEBUG_LL_UART_DIVISOR   (DEBUG_LL_UART_CLK / DEBUG_LL_UART_BPS)
-
-#endif /* __INCLUDE_BOARD_DEBUG_LL_QEMU_MALTA_H__ */

Signature · 7 lines

2.25.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Sascha Hauer

Applied

2020-05-04 06:49 UTC #2 lore raw

In reply to Masahiro Yamada

Quoted 6 lines · Masahiro Yamada

The variable INCDIR is not used by anyone.
The variable BOARD is not set by anyone, so $(BOARD) is always empty.
Signed-off-by Masahiro Yamada <[email protected]>
---

Applied, thanks

Sascha

Quoted 43 lines

 arch/mips/Makefile | 13 -------------
 1 file changed, 13 deletions(-)

arch/mips/Makefile +0 ~~-13~~

index 4717f49a4..abfa82504 100644
@@ -88,25 +88,12 @@ else
 KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-ifeq ($(KBUILD_SRC),)
-KBUILD_CPPFLAGS += -I$(BOARD)/include
-else
-KBUILD_CPPFLAGS += -I$(srctree)/$(BOARD)/include
-endif
-
 ifneq ($(machine-y),)
 MACH  := arch/mips/mach-$(machine-y)/
 else
 MACH  :=
 endif
 
-common-y += $(BOARD)
-
 common-y += $(MACH)
 common-y += arch/mips/lib/
 common-y += arch/mips/boot/

Signature · 7 lines

2.25.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Signature · 9 lines

Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox