[U-Boot] [PATCH 03/19] powerpc: ppc4xx: remove lwmon5 support

Masahiro Yamada yamada.masahiro at socionext.com
Tue Sep 1 15:28:42 CEST 2015


This has not been converted to Generic Board, so should be removed.
(See doc/README.generic-board for details.)

Remove CONFIG_LWMON5 references.
(Also, remove undefined CONFIG_WD_MAX_RATE while I am here.)

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
Cc: Stefan Roese <sr at denx.de>
---

 arch/powerpc/cpu/ppc4xx/Kconfig        |   5 -
 arch/powerpc/include/asm/global_data.h |   6 -
 board/lwmon5/Kconfig                   |   9 -
 board/lwmon5/MAINTAINERS               |   7 -
 board/lwmon5/Makefile                  |   9 -
 board/lwmon5/config.mk                 |  18 -
 board/lwmon5/init.S                    |  75 ----
 board/lwmon5/kbd.c                     | 490 -----------------------
 board/lwmon5/lwmon5.c                  | 558 --------------------------
 board/lwmon5/sdram.c                   | 247 ------------
 configs/lcd4_lwmon5_defconfig          |   6 -
 configs/lwmon5_defconfig               |   4 -
 doc/README.scrapyard                   |   1 +
 drivers/video/mb862xx.c                |   3 +-
 include/configs/lwmon5.h               | 692 ---------------------------------
 15 files changed, 2 insertions(+), 2128 deletions(-)
 delete mode 100644 board/lwmon5/Kconfig
 delete mode 100644 board/lwmon5/MAINTAINERS
 delete mode 100644 board/lwmon5/Makefile
 delete mode 100644 board/lwmon5/config.mk
 delete mode 100644 board/lwmon5/init.S
 delete mode 100644 board/lwmon5/kbd.c
 delete mode 100644 board/lwmon5/lwmon5.c
 delete mode 100644 board/lwmon5/sdram.c
 delete mode 100644 configs/lcd4_lwmon5_defconfig
 delete mode 100644 configs/lwmon5_defconfig
 delete mode 100644 include/configs/lwmon5.h

diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index c6bbe12..883463a 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -8,10 +8,6 @@ choice
 	prompt "Target select"
 	optional
 
-config TARGET_LWMON5
-	bool "Support lwmon5"
-	select SUPPORT_SPL
-
 config TARGET_PCS440EP
 	bool "Support pcs440ep"
 
@@ -181,7 +177,6 @@ source "board/gdsys/405ex/Kconfig"
 source "board/gdsys/dlvision/Kconfig"
 source "board/gdsys/gdppc440etx/Kconfig"
 source "board/gdsys/intip/Kconfig"
-source "board/lwmon5/Kconfig"
 source "board/mosaixtech/icon/Kconfig"
 source "board/mpl/mip405/Kconfig"
 source "board/mpl/pip405/Kconfig"
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 4090975..2527ef8 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -106,12 +106,6 @@ struct arch_global_data {
 #ifdef CONFIG_SYS_FPGA_COUNT
 	unsigned fpga_state[CONFIG_SYS_FPGA_COUNT];
 #endif
-#if defined(CONFIG_WD_MAX_RATE)
-	unsigned long long wdt_last;	/* trace watch-dog triggering rate */
-#endif
-#if defined(CONFIG_LWMON5)
-	unsigned long kbd_status;
-#endif
 };
 
 #include <asm-generic/global_data.h>
diff --git a/board/lwmon5/Kconfig b/board/lwmon5/Kconfig
deleted file mode 100644
index 90566d8..0000000
diff --git a/board/lwmon5/MAINTAINERS b/board/lwmon5/MAINTAINERS
deleted file mode 100644
index 7402ab6..0000000
diff --git a/board/lwmon5/Makefile b/board/lwmon5/Makefile
deleted file mode 100644
index 02478ca..0000000
diff --git a/board/lwmon5/config.mk b/board/lwmon5/config.mk
deleted file mode 100644
index d0348e8..0000000
diff --git a/board/lwmon5/init.S b/board/lwmon5/init.S
deleted file mode 100644
index e5207c2..0000000
diff --git a/board/lwmon5/kbd.c b/board/lwmon5/kbd.c
deleted file mode 100644
index 97962da..0000000
diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c
deleted file mode 100644
index e9aa0b7..0000000
diff --git a/board/lwmon5/sdram.c b/board/lwmon5/sdram.c
deleted file mode 100644
index 5dfbb0b..0000000
diff --git a/configs/lcd4_lwmon5_defconfig b/configs/lcd4_lwmon5_defconfig
deleted file mode 100644
index b911dbd..0000000
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
deleted file mode 100644
index 0a6da68..0000000
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 87e2b35..2697451 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -12,6 +12,7 @@ The list should be sorted in reverse chronological order.
 
 Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
 =================================================================================================
+lwmon5           powerpc     ppc4xx         -           -           Stefan Roese <sr at denx.de>
 csb272/csb472    powerpc     ppc4xx         -           -           Tolunay Orkun <torkun at nextio.com>
 alpr             powerpc     ppc4xx         -           -           Stefan Roese <sr at denx.de>
 cam_enc_4xx      arm         arm926ejs      8d775763    2015-08-20  Heiko Schocher <hs at denx.de>
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 1c74e97..868c512 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -419,8 +419,7 @@ void *video_hw_init (void)
 	board_disp_init ();
 #endif
 
-#if (defined(CONFIG_LWMON5) || \
-     defined(CONFIG_SOCRATES)) && !(CONFIG_POST & CONFIG_SYS_POST_SYSMON)
+#if defined(CONFIG_SOCRATES) && !(CONFIG_POST & CONFIG_SYS_POST_SYSMON)
 	/* Lamp on */
 	board_backlight_switch (1);
 #endif
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
deleted file mode 100644
index 513167e..0000000
-- 
1.9.1



More information about the U-Boot mailing list