diff mbox series

[U-Boot] m68k: Drop CONFIG_MCFPIT support

Message ID 20191111143911.7563-1-trini@konsulko.com
State Accepted
Commit 8947145cd0ae8adf1c5dc0ae6756d49bf5330b48
Delegated to: Tom Rini
Headers show
Series [U-Boot] m68k: Drop CONFIG_MCFPIT support | expand

Commit Message

Tom Rini Nov. 11, 2019, 2:39 p.m. UTC 
All platforms currently use the "MCFTMR" DMA timer rather than the PIT
timer, so drop the MCFPIT code.

Cc: Huan Wang <alison.wang@nxp.com>
Cc: Angelo Dureghello <angelo@sysam.it>
Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
Cc: Wolfgang Wegner <w.wegner@astro-kom.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/m68k/include/asm/immap.h    | 42 ---------------------
 arch/m68k/lib/time.c             | 63 --------------------------------
 board/freescale/m52277evb/README |  1 -
 board/freescale/m53017evb/README |  1 -
 board/freescale/m5373evb/README  |  1 -
 board/freescale/m54455evb/README |  1 -
 include/configs/M5208EVBE.h      |  1 -
 include/configs/M52277EVB.h      |  1 -
 include/configs/M5235EVB.h       |  1 -
 include/configs/M53017EVB.h      |  1 -
 include/configs/M5329EVB.h       |  1 -
 include/configs/M5373EVB.h       |  1 -
 include/configs/M54418TWR.h      |  1 -
 include/configs/M54451EVB.h      |  1 -
 include/configs/M54455EVB.h      |  1 -
 include/configs/astro_mcf5373l.h |  1 -
 include/configs/stmark2.h        |  1 -
 scripts/config_whitelist.txt     |  1 -
 18 files changed, 121 deletions(-)

Comments

Angelo Dureghello Nov. 12, 2019, 7 p.m. UTC | #1 
Hi Tom,

On Mon, Nov 11, 2019 at 09:39:11AM -0500, Tom Rini wrote:
> All platforms currently use the "MCFTMR" DMA timer rather than the PIT
> timer, so drop the MCFPIT code.
> 
> Cc: Huan Wang <alison.wang@nxp.com>
> Cc: Angelo Dureghello <angelo@sysam.it>
> Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
> Cc: Wolfgang Wegner <w.wegner@astro-kom.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/m68k/include/asm/immap.h    | 42 ---------------------
>  arch/m68k/lib/time.c             | 63 --------------------------------
>  board/freescale/m52277evb/README |  1 -
>  board/freescale/m53017evb/README |  1 -
>  board/freescale/m5373evb/README  |  1 -
>  board/freescale/m54455evb/README |  1 -
>  include/configs/M5208EVBE.h      |  1 -
>  include/configs/M52277EVB.h      |  1 -
>  include/configs/M5235EVB.h       |  1 -
>  include/configs/M53017EVB.h      |  1 -
>  include/configs/M5329EVB.h       |  1 -
>  include/configs/M5373EVB.h       |  1 -
>  include/configs/M54418TWR.h      |  1 -
>  include/configs/M54451EVB.h      |  1 -
>  include/configs/M54455EVB.h      |  1 -
>  include/configs/astro_mcf5373l.h |  1 -
>  include/configs/stmark2.h        |  1 -
>  scripts/config_whitelist.txt     |  1 -
>  18 files changed, 121 deletions(-)
> 
> diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
> index 80fa25769b27..9e84fb9d260c 100644
> --- a/arch/m68k/include/asm/immap.h
> +++ b/arch/m68k/include/asm/immap.h
> @@ -28,12 +28,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(128)
>  #endif				/* CONFIG_M520x */
> @@ -62,12 +56,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(128)
>  #endif				/* CONFIG_M52277 */
> @@ -91,12 +79,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(128)
>  #endif				/* CONFIG_M5235 */
> @@ -285,12 +267,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(128)
>  #endif				/* CONFIG_M5301x */
> @@ -315,12 +291,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(128)
>  #endif				/* CONFIG_M5329 && CONFIG_M5373 */
> @@ -355,12 +325,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(192)
>  
> @@ -391,12 +355,6 @@
>  #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
>  #endif
>  
> -#ifdef CONFIG_MCFPIT
> -#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
> -#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
> -#define CONFIG_SYS_PIT_PRESCALE	(6)
> -#endif
> -
>  #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
>  #define CONFIG_SYS_NUM_IRQS		(128)
>  
> diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
> index a6345a0bc9c0..52f6dd753321 100644
> --- a/arch/m68k/lib/time.c
> +++ b/arch/m68k/lib/time.c
> @@ -108,69 +108,6 @@ ulong get_timer(ulong base)
>  
>  #endif				/* CONFIG_MCFTMR */
>  
> -#if defined(CONFIG_MCFPIT)
> -#if !defined(CONFIG_SYS_PIT_BASE)
> -#	error	"CONFIG_SYS_PIT_BASE not defined!"
> -#endif
> -
> -static unsigned short lastinc;
> -
> -void __udelay(unsigned long usec)
> -{
> -	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_UDELAY_BASE);
> -	uint tmp;
> -
> -	while (usec > 0) {
> -		if (usec > 65000)
> -			tmp = 65000;
> -		else
> -			tmp = usec;
> -		usec = usec - tmp;
> -
> -		/* Set up TIMER 3 as timebase clock */
> -		timerp->pcsr = PIT_PCSR_OVW;
> -		timerp->pmr = 0;
> -		/* set period to 1 us */
> -		timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
> -
> -		timerp->pmr = tmp;
> -		while (timerp->pcntr > 0) ;
> -	}
> -}
> -
> -void timer_init(void)
> -{
> -	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
> -	timestamp = 0;
> -
> -	/* Set up TIMER 4 as poll clock */
> -	timerp->pcsr = PIT_PCSR_OVW;
> -	timerp->pmr = lastinc = 0;
> -	timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
> -
> -	return 0;
> -}
> -
> -ulong get_timer(ulong base)
> -{
> -	unsigned short now, diff;
> -	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
> -
> -	now = timerp->pcntr;
> -	diff = -(now - lastinc);
> -
> -	timestamp += diff;
> -	lastinc = now;
> -	return timestamp - base;
> -}
> -
> -void wait_ticks(unsigned long ticks)
> -{
> -	u32 start = get_timer(0);
> -	while (get_timer(start) < ticks) ;
> -}
> -#endif				/* CONFIG_MCFPIT */
> -
>  /*
>   * This function is derived from PowerPC code (read timebase as long long).
>   * On M68K it just returns the timer value.
> diff --git a/board/freescale/m52277evb/README b/board/freescale/m52277evb/README
> index b7ceb5993e7a..76f4789335bf 100644
> --- a/board/freescale/m52277evb/README
> +++ b/board/freescale/m52277evb/README
> @@ -79,7 +79,6 @@ RTC_DEBUG		-- define to show RTC debug message
>  CONFIG_CMD_DATE		-- enable to use date feature in U-Boot
>  
>  CONFIG_MCFTMR		-- define to use DMA timer
> -CONFIG_MCFPIT		-- define to use PIT timer
>  
>  CONFIG_SYS_I2C_FSL	-- define to use FSL common I2C driver
>  CONFIG_SYS_I2C_SOFT	-- define for I2C bit-banged
> diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
> index 2fca12c41706..a7074c9b7179 100644
> --- a/board/freescale/m53017evb/README
> +++ b/board/freescale/m53017evb/README
> @@ -88,7 +88,6 @@ CONFIG_SYS_FEC0_MIIBASE		-- Set FEC0 MII base register
>  MCFFEC_TOUT_LOOP		-- set FEC timeout loop
>  
>  CONFIG_MCFTMR			-- define to use DMA timer
> -CONFIG_MCFPIT			-- define to use PIT timer
>  
>  CONFIG_SYS_I2C_FSL		-- define to use FSL common I2C driver
>  CONFIG_SYS_I2C_SOFT		-- define for I2C bit-banged
> diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README
> index 757f0abdd744..f0a0631c94b3 100644
> --- a/board/freescale/m5373evb/README
> +++ b/board/freescale/m5373evb/README
> @@ -87,7 +87,6 @@ CONFIG_SYS_FEC0_MIIBASE	-- Set FEC0 MII base register
>  MCFFEC_TOUT_LOOP	-- set FEC timeout loop
>  
>  CONFIG_MCFTMR		-- define to use DMA timer
> -CONFIG_MCFPIT		-- define to use PIT timer
>  
>  CONFIG_SYS_I2C_FSL	-- define to use FSL common I2C driver
>  CONFIG_SYS_I2C_SOFT	-- define for I2C bit-banged
> diff --git a/board/freescale/m54455evb/README b/board/freescale/m54455evb/README
> index 4a8719333ac5..260aec9f1bec 100644
> --- a/board/freescale/m54455evb/README
> +++ b/board/freescale/m54455evb/README
> @@ -110,7 +110,6 @@ CONFIG_SYS_ATA_STRIDE		-- define for Interval between registers
>  _IO_BASE		-- define for IO base address
>  
>  CONFIG_MCFTMR		-- define to use DMA timer
> -CONFIG_MCFPIT		-- define to use PIT timer
>  
>  CONFIG_SYS_FSL_I2C	-- define to use FSL common I2C driver
>  CONFIG_SYS_I2C_SOFT	-- define for I2C bit-banged
> diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
> index 867ae8be6de9..92dad6ba6548 100644
> --- a/include/configs/M5208EVBE.h
> +++ b/include/configs/M5208EVBE.h
> @@ -43,7 +43,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2C */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
> index a5a1c38f6e7d..884ed11dbab9 100644
> --- a/include/configs/M52277EVB.h
> +++ b/include/configs/M52277EVB.h
> @@ -90,7 +90,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2c */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
> index 3c56cec425c4..360f7e242583 100644
> --- a/include/configs/M5235EVB.h
> +++ b/include/configs/M5235EVB.h
> @@ -52,7 +52,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2C */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
> index 24eb36159b30..ce3402ca0b3b 100644
> --- a/include/configs/M53017EVB.h
> +++ b/include/configs/M53017EVB.h
> @@ -60,7 +60,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2C */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
> index 2cff0d6cf602..ba7ed13da550 100644
> --- a/include/configs/M5329EVB.h
> +++ b/include/configs/M5329EVB.h
> @@ -52,7 +52,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2C */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
> index 576c075a174c..390bcf957e63 100644
> --- a/include/configs/M5373EVB.h
> +++ b/include/configs/M5373EVB.h
> @@ -52,7 +52,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2C */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
> index 72cc13ab79fc..2dbfb1d5ec44 100644
> --- a/include/configs/M54418TWR.h
> +++ b/include/configs/M54418TWR.h
> @@ -137,7 +137,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2c */
>  #undef CONFIG_SYS_FSL_I2C
> diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
> index 5482edeb2d91..2473377edbd7 100644
> --- a/include/configs/M54451EVB.h
> +++ b/include/configs/M54451EVB.h
> @@ -103,7 +103,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2c */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
> index 9434cc278e2c..ea62d914b064 100644
> --- a/include/configs/M54455EVB.h
> +++ b/include/configs/M54455EVB.h
> @@ -130,7 +130,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2c */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
> index 3d79311d625f..e1128043b02a 100644
> --- a/include/configs/astro_mcf5373l.h
> +++ b/include/configs/astro_mcf5373l.h
> @@ -57,7 +57,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* I2C */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
> index a08d9950bd87..4f1e947d8631 100644
> --- a/include/configs/stmark2.h
> +++ b/include/configs/stmark2.h
> @@ -60,7 +60,6 @@
>  
>  /* Timer */
>  #define CONFIG_MCFTMR
> -#undef CONFIG_MCFPIT
>  
>  /* DSPI and Serial Flash */
>  #define CONFIG_CF_DSPI
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 284fb62e54c1..1da6bce9fd10 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1092,7 +1092,6 @@ CONFIG_MAX_RAM_BANK_SIZE
>  CONFIG_MCF5249
>  CONFIG_MCF5253
>  CONFIG_MCFFEC
> -CONFIG_MCFPIT
>  CONFIG_MCFRTC
>  CONFIG_MCFTMR
>  CONFIG_MCLK_DIS
> -- 
> 2.17.1
> 


Reviewed-by: Angelo Dureghello <angelo@sysam.it>

You can apply it, thanks !


Regards,
Angelo
Tom Rini Jan. 10, 2020, 9:48 p.m. UTC | #2 
On Mon, Nov 11, 2019 at 09:39:11AM -0500, Tom Rini wrote:

> All platforms currently use the "MCFTMR" DMA timer rather than the PIT
> timer, so drop the MCFPIT code.
> 
> Cc: Huan Wang <alison.wang@nxp.com>
> Cc: Angelo Dureghello <angelo@sysam.it>
> Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
> Cc: Wolfgang Wegner <w.wegner@astro-kom.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Angelo Dureghello <angelo@sysam.it>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
index 80fa25769b27..9e84fb9d260c 100644
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@@ -28,12 +28,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
 #endif				/* CONFIG_M520x */
@@ -62,12 +56,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
 #endif				/* CONFIG_M52277 */
@@ -91,12 +79,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
 #endif				/* CONFIG_M5235 */
@@ -285,12 +267,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
 #endif				/* CONFIG_M5301x */
@@ -315,12 +291,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
 #endif				/* CONFIG_M5329 && CONFIG_M5373 */
@@ -355,12 +325,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(192)
 
@@ -391,12 +355,6 @@ 
 #define CONFIG_SYS_TIMER_PRESCALER	(((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE		(MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE		(MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE	(6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
 
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a6345a0bc9c0..52f6dd753321 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -108,69 +108,6 @@  ulong get_timer(ulong base)
 
 #endif				/* CONFIG_MCFTMR */
 
-#if defined(CONFIG_MCFPIT)
-#if !defined(CONFIG_SYS_PIT_BASE)
-#	error	"CONFIG_SYS_PIT_BASE not defined!"
-#endif
-
-static unsigned short lastinc;
-
-void __udelay(unsigned long usec)
-{
-	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_UDELAY_BASE);
-	uint tmp;
-
-	while (usec > 0) {
-		if (usec > 65000)
-			tmp = 65000;
-		else
-			tmp = usec;
-		usec = usec - tmp;
-
-		/* Set up TIMER 3 as timebase clock */
-		timerp->pcsr = PIT_PCSR_OVW;
-		timerp->pmr = 0;
-		/* set period to 1 us */
-		timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
-
-		timerp->pmr = tmp;
-		while (timerp->pcntr > 0) ;
-	}
-}
-
-void timer_init(void)
-{
-	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
-	timestamp = 0;
-
-	/* Set up TIMER 4 as poll clock */
-	timerp->pcsr = PIT_PCSR_OVW;
-	timerp->pmr = lastinc = 0;
-	timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
-
-	return 0;
-}
-
-ulong get_timer(ulong base)
-{
-	unsigned short now, diff;
-	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
-
-	now = timerp->pcntr;
-	diff = -(now - lastinc);
-
-	timestamp += diff;
-	lastinc = now;
-	return timestamp - base;
-}
-
-void wait_ticks(unsigned long ticks)
-{
-	u32 start = get_timer(0);
-	while (get_timer(start) < ticks) ;
-}
-#endif				/* CONFIG_MCFPIT */
-
 /*
  * This function is derived from PowerPC code (read timebase as long long).
  * On M68K it just returns the timer value.
diff --git a/board/freescale/m52277evb/README b/board/freescale/m52277evb/README
index b7ceb5993e7a..76f4789335bf 100644
--- a/board/freescale/m52277evb/README
+++ b/board/freescale/m52277evb/README
@@ -79,7 +79,6 @@  RTC_DEBUG		-- define to show RTC debug message
 CONFIG_CMD_DATE		-- enable to use date feature in U-Boot
 
 CONFIG_MCFTMR		-- define to use DMA timer
-CONFIG_MCFPIT		-- define to use PIT timer
 
 CONFIG_SYS_I2C_FSL	-- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT	-- define for I2C bit-banged
diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
index 2fca12c41706..a7074c9b7179 100644
--- a/board/freescale/m53017evb/README
+++ b/board/freescale/m53017evb/README
@@ -88,7 +88,6 @@  CONFIG_SYS_FEC0_MIIBASE		-- Set FEC0 MII base register
 MCFFEC_TOUT_LOOP		-- set FEC timeout loop
 
 CONFIG_MCFTMR			-- define to use DMA timer
-CONFIG_MCFPIT			-- define to use PIT timer
 
 CONFIG_SYS_I2C_FSL		-- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT		-- define for I2C bit-banged
diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README
index 757f0abdd744..f0a0631c94b3 100644
--- a/board/freescale/m5373evb/README
+++ b/board/freescale/m5373evb/README
@@ -87,7 +87,6 @@  CONFIG_SYS_FEC0_MIIBASE	-- Set FEC0 MII base register
 MCFFEC_TOUT_LOOP	-- set FEC timeout loop
 
 CONFIG_MCFTMR		-- define to use DMA timer
-CONFIG_MCFPIT		-- define to use PIT timer
 
 CONFIG_SYS_I2C_FSL	-- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT	-- define for I2C bit-banged
diff --git a/board/freescale/m54455evb/README b/board/freescale/m54455evb/README
index 4a8719333ac5..260aec9f1bec 100644
--- a/board/freescale/m54455evb/README
+++ b/board/freescale/m54455evb/README
@@ -110,7 +110,6 @@  CONFIG_SYS_ATA_STRIDE		-- define for Interval between registers
 _IO_BASE		-- define for IO base address
 
 CONFIG_MCFTMR		-- define to use DMA timer
-CONFIG_MCFPIT		-- define to use PIT timer
 
 CONFIG_SYS_FSL_I2C	-- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT	-- define for I2C bit-banged
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 867ae8be6de9..92dad6ba6548 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -43,7 +43,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index a5a1c38f6e7d..884ed11dbab9 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -90,7 +90,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 3c56cec425c4..360f7e242583 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -52,7 +52,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 24eb36159b30..ce3402ca0b3b 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -60,7 +60,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 2cff0d6cf602..ba7ed13da550 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -52,7 +52,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 576c075a174c..390bcf957e63 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -52,7 +52,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 72cc13ab79fc..2dbfb1d5ec44 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -137,7 +137,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #undef CONFIG_SYS_FSL_I2C
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 5482edeb2d91..2473377edbd7 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -103,7 +103,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 9434cc278e2c..ea62d914b064 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -130,7 +130,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 3d79311d625f..e1128043b02a 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -57,7 +57,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index a08d9950bd87..4f1e947d8631 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -60,7 +60,6 @@ 
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 284fb62e54c1..1da6bce9fd10 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1092,7 +1092,6 @@  CONFIG_MAX_RAM_BANK_SIZE
 CONFIG_MCF5249
 CONFIG_MCF5253
 CONFIG_MCFFEC
-CONFIG_MCFPIT
 CONFIG_MCFRTC
 CONFIG_MCFTMR
 CONFIG_MCLK_DIS