From b6b5e394db62ac17e496dce9e6e9451435c8be62 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Fri, 2 Oct 2015 08:20:37 +0200 Subject: ppc4xx: Remove lcd4_lwmon5 support This platform has not gone into production. So lets remove it. Signed-off-by: Stefan Roese Cc: Masahiro Yamada --- board/lwmon5/MAINTAINERS | 1 - board/lwmon5/lwmon5.c | 8 -------- board/lwmon5/sdram.c | 2 -- 3 files changed, 11 deletions(-) (limited to 'board/lwmon5') diff --git a/board/lwmon5/MAINTAINERS b/board/lwmon5/MAINTAINERS index 7402ab6758..3ea1888cea 100644 --- a/board/lwmon5/MAINTAINERS +++ b/board/lwmon5/MAINTAINERS @@ -3,5 +3,4 @@ M: Stefan Roese S: Maintained F: board/lwmon5/ F: include/configs/lwmon5.h -F: configs/lcd4_lwmon5_defconfig F: configs/lwmon5_defconfig diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index e9aa0b77de..8ad6712841 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -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; } diff --git a/board/lwmon5/sdram.c b/board/lwmon5/sdram.c index 5dfbb0bc25..bcb344940b 100644 --- a/board/lwmon5/sdram.c +++ b/board/lwmon5/sdram.c @@ -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); } -- cgit v1.2.1