Skip to contentSkip to conversation

Revert "powerpc: ppc4xx: remove lwmon5 support"

PATCH New Stefan Roese 2 participants 6 messages Oct 2, 2015 – Oct 12, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 Revert "powerpc: ppc4xx: remove lwmon5 support"

This reverts commit 8fe11b8901a31d11990488c82bc23612589d57be.

I'll add support to lwmon5 in the next patch and will remove support for the broken lcd4_lwmon5 as well.

Cc Masahiro Yamada <[email protected]>
---
 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, 2128 insertions(+), 2 deletions(-)
 create mode 100644 board/lwmon5/Kconfig
 create mode 100644 board/lwmon5/MAINTAINERS
 create mode 100644 board/lwmon5/Makefile
 create mode 100644 board/lwmon5/config.mk
 create mode 100644 board/lwmon5/init.S
 create mode 100644 board/lwmon5/kbd.c
 create mode 100644 board/lwmon5/lwmon5.c
 create mode 100644 board/lwmon5/sdram.c
 create mode 100644 configs/lcd4_lwmon5_defconfig
 create mode 100644 configs/lwmon5_defconfig
 create mode 100644 include/configs/lwmon5.h
arch/powerpc/cpu/ppc4xx/Kconfig +5 -0
index 23ecc89..8d3ba8d 100644
@@ -8,6 +8,10 @@ choice
 	prompt "Target select"
 	optional
 
+config TARGET_LWMON5
+	bool "Support lwmon5"
+	select SUPPORT_SPL
+
 config TARGET_T3CORP
 	bool "Support t3corp"
 
@@ -165,6 +169,7 @@ 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"
arch/powerpc/include/asm/global_data.h +6 -0
index 2527ef8..4090975 100644
@@ -106,6 +106,12 @@ 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>
board/lwmon5/Kconfig new file +9 -0
new file mode 100644
index 0000000..90566d8
@@ -0,0 +1,9 @@
+if TARGET_LWMON5
+
+config SYS_BOARD
+	default "lwmon5"
+
+config SYS_CONFIG_NAME
+	default "lwmon5"
+
+endif
board/lwmon5/MAINTAINERS new file +7 -0
new file mode 100644
index 0000000..7402ab6
@@ -0,0 +1,7 @@
+LWMON5 BOARD
+M:	Stefan Roese <[email protected]>
+S:	Maintained
+F:	board/lwmon5/
+F:	include/configs/lwmon5.h
+F:	configs/lcd4_lwmon5_defconfig
+F:	configs/lwmon5_defconfig
board/lwmon5/Makefile new file +9 -0
new file mode 100644
index 0000000..02478ca
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2002-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	= lwmon5.o kbd.o sdram.o
+extra-y	+= init.o
board/lwmon5/config.mk new file +18 -0
new file mode 100644
index 0000000..d0348e8
@@ -0,0 +1,18 @@
+#
+# (C) Copyright 2002
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+# lwmon5 (440EPx)
+#
+
+PLATFORM_CPPFLAGS += -DCONFIG_440=1
+
+ifeq ($(debug),1)
+PLATFORM_CPPFLAGS += -DDEBUG
+endif
+
+ifeq ($(dbcr),1)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000
+endif
board/lwmon5/init.S new file +75 -0

75 lines not on this page · raw message

board/lwmon5/kbd.c new file +490 -0

490 lines not on this page · raw message

board/lwmon5/lwmon5.c new file +558 -0

558 lines not on this page · raw message

board/lwmon5/sdram.c new file +247 -0

247 lines not on this page · raw message

configs/lcd4_lwmon5_defconfig new file +6 -0
new file mode 100644
index 0000000..b911dbd
@@ -0,0 +1,6 @@
+CONFIG_PPC=y
+CONFIG_4xx=y
+CONFIG_TARGET_LWMON5=y
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="LCD4_LWMON5"
+# CONFIG_CMD_SETEXPR is not set
configs/lwmon5_defconfig new file +4 -0
new file mode 100644
index 0000000..0a6da68
@@ -0,0 +1,4 @@
+CONFIG_PPC=y
+CONFIG_4xx=y
+CONFIG_TARGET_LWMON5=y
+# CONFIG_CMD_SETEXPR is not set
doc/README.scrapyard +0 -1
index 9cda0bd..c7b4fa3 100644
@@ -19,7 +19,6 @@ zeus             powerpc     ppc4xx         -           -           Stefan Roese
 sbc405           powerpc     ppc4xx         -           -
 pcs440ep         powerpc     ppc4xx         -           -           Stefan Roese <[email protected]>
 p3p440           powerpc     ppc4xx         -           -           Stefan Roese <[email protected]>
-lwmon5           powerpc     ppc4xx         -           -           Stefan Roese <[email protected]>
 csb272/csb472    powerpc     ppc4xx         -           -           Tolunay Orkun <[email protected]>
 alpr             powerpc     ppc4xx         -           -           Stefan Roese <[email protected]>
 cam_enc_4xx      arm         arm926ejs      8d775763    2015-08-20  Heiko Schocher <[email protected]>
drivers/video/mb862xx.c +2 -1
index 868c512..1c74e97 100644
@@ -419,7 +419,8 @@ void *video_hw_init (void)
 	board_disp_init ();
 #endif
 
-#if defined(CONFIG_SOCRATES) && !(CONFIG_POST & CONFIG_SYS_POST_SYSMON)
+#if (defined(CONFIG_LWMON5) || \
+     defined(CONFIG_SOCRATES)) && !(CONFIG_POST & CONFIG_SYS_POST_SYSMON)
 	/* Lamp on */
 	board_backlight_switch (1);
 #endif
include/configs/lwmon5.h new file +692 -0

692 lines not on this page · raw message

Signature · 1 line
2.5.3
#1 lore raw

PATCH 2/3 ppc4xx: Convert lwmon5 board to generic board

Add CONFIG_SYS_GENERIC_BOARD to lwmon5.h and CONFIG_DISPLAY_BOARDINFO to Kconfig file.

Cc Masahiro Yamada <[email protected]>
---
 board/lwmon5/Kconfig     | 4 ++++
 include/configs/lwmon5.h | 2 ++
 2 files changed, 6 insertions(+)
board/lwmon5/Kconfig +4 -0
index 90566d8..7b8c605 100644
@@ -6,4 +6,8 @@ config SYS_BOARD
 config SYS_CONFIG_NAME
 	default "lwmon5"
 
+config DISPLAY_BOARDINFO
+	bool
+	default y
+
 endif
include/configs/lwmon5.h +2 -0
index 513167e..2a50bfe 100644
@@ -23,6 +23,8 @@
 #define CONFIG_440EPX		1		/* Specific PPC440EPx	*/
 #define CONFIG_440		1		/* ... PPC440 family	*/
 
+#define CONFIG_SYS_GENERIC_BOARD
+
 #ifdef CONFIG_LCD4_LWMON5
 #define	CONFIG_SYS_TEXT_BASE	0x01000000 /* SPL U-Boot TEXT_BASE */
 #define CONFIG_HOSTNAME		lcd4_lwmon5
Signature · 1 line
2.5.3
#2 lore raw

PATCH 2/3 ppc4xx: Convert lwmon5 board to generic board

Quoted 5 lines · Stefan Roese

Add CONFIG_SYS_GENERIC_BOARD to lwmon5.h and CONFIG_DISPLAY_BOARDINFO to Kconfig file.

Cc Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151012/e80eff55/attachment.sig>
#3 lore raw

PATCH 3/3 ppc4xx: Remove lcd4_lwmon5 support

In reply to Stefan Roese

This platform has not gone into production. So lets remove it.

Cc Masahiro Yamada <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/Kconfig |  1 -
 board/lwmon5/MAINTAINERS        |  1 -
 board/lwmon5/lwmon5.c           |  8 ------
 board/lwmon5/sdram.c            |  2 --
 configs/lcd4_lwmon5_defconfig   |  6 ----
 include/configs/lwmon5.h        | 63 +----------------------------------------
 6 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 configs/lcd4_lwmon5_defconfig
arch/powerpc/cpu/ppc4xx/Kconfig +0 -1
index 8d3ba8d..ce58d86 100644
@@ -10,7 +10,6 @@ choice
 
 config TARGET_LWMON5
 	bool "Support lwmon5"
-	select SUPPORT_SPL
 
 config TARGET_T3CORP
 	bool "Support t3corp"
board/lwmon5/MAINTAINERS +0 -1
index 7402ab6..3ea1888 100644
@@ -3,5 +3,4 @@ M:	Stefan Roese <[email protected]>
 S:	Maintained
 F:	board/lwmon5/
 F:	include/configs/lwmon5.h
-F:	configs/lcd4_lwmon5_defconfig
 F:	configs/lwmon5_defconfig
board/lwmon5/lwmon5.c +0 -8
index e9aa0b7..8ad6712 100644
@@ -187,11 +187,9 @@ int misc_init_r(void)
 	u32 pbcr;
 	int size_val = 0;
 	u32 reg;
-#ifndef CONFIG_LCD4_LWMON5
 	unsigned long usb2d0cr = 0;
 	unsigned long usb2phy0cr, usb2h0cr = 0;
 	unsigned long sdr0_pfc1, sdr0_srst;
-#endif
 
 	/*
 	 * FLASH stuff...
@@ -222,7 +220,6 @@ int misc_init_r(void)
 		      CONFIG_ENV_ADDR_REDUND + 2 * CONFIG_ENV_SECT_SIZE - 1,
 		      &flash_info[cfi_flash_num_flash_banks - 1]);
 
-#ifndef CONFIG_LCD4_LWMON5
 	/*
 	 * USB suff...
 	 */
@@ -296,7 +293,6 @@ int misc_init_r(void)
 	/* 7. Reassert internal PHY reset: */
 	mtsdr(SDR0_SRST1, SDR0_SRST1_USB20PHY);
 	udelay(1000);
-#endif
 
 	/*
 	 * Clear resets
@@ -304,9 +300,7 @@ int misc_init_r(void)
 	mtsdr(SDR0_SRST1, 0x00000000);
 	mtsdr(SDR0_SRST0, 0x00000000);
 
-#ifndef CONFIG_LCD4_LWMON5
 	printf("USB:   Host(int phy) Device(ext phy)\n");
-#endif
 
 	/*
 	 * Clear PLB4A0_ACR[WRP]
@@ -316,12 +310,10 @@ int misc_init_r(void)
 	reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK;
 	mtdcr(PLB4A0_ACR, reg);
 
-#ifndef CONFIG_LCD4_LWMON5
 	/*
 	 * Init matrix keyboard
 	 */
 	misc_init_r_kbd();
-#endif
 
 	return 0;
 }
board/lwmon5/sdram.c +0 -2
index 5dfbb0b..bcb3449 100644
@@ -147,7 +147,6 @@ static void program_ecc(u32 start_address,
  ************************************************************************/
 phys_size_t initdram (int board_type)
 {
-#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_LCD4_LWMON5)
 	/* CL=4 */
 	mtsdram(DDR0_02, 0x00000000);
 
@@ -241,7 +240,6 @@ phys_size_t initdram (int board_type)
 	 * exceptions are enabled.
 	 */
 	set_mcsr(get_mcsr());
-#endif /* CONFIG_SPL_BUILD */
 
 	return (CONFIG_SYS_MBYTES_SDRAM << 20);
 }
configs/lcd4_lwmon5_defconfig deleted +0 -6
deleted file mode 100644
index b911dbd..0000000
@@ -1,6 +0,0 @@
-CONFIG_PPC=y
-CONFIG_4xx=y
-CONFIG_TARGET_LWMON5=y
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="LCD4_LWMON5"
-# CONFIG_CMD_SETEXPR is not set
include/configs/lwmon5.h +1 -62

149 lines not on this page · raw message

Signature · 1 line
2.5.3
#4 lore raw

PATCH 3/3 ppc4xx: Remove lcd4_lwmon5 support

Quoted 4 lines · Stefan Roese

This platform has not gone into production. So lets remove it.

Cc Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151012/72ef5875/attachment.sig>
#5 lore raw

PATCH 1/3 Revert "powerpc: ppc4xx: remove lwmon5 support"

In reply to Stefan Roese
Quoted 7 lines · Stefan Roese

This reverts commit 8fe11b8901a31d11990488c82bc23612589d57be.

I'll add support to lwmon5 in the next patch and will remove support for the broken lcd4_lwmon5 as well.

Cc Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151012/7ccee062/attachment.sig>