m68k: Drop CONFIG_MCFPIT support
Subsystems (2)
PATCH 1/1 m68k: Drop CONFIG_MCFPIT support
All platforms currently use the "MCFTMR" DMA timer rather than the PIT timer, so drop the MCFPIT code.
Cc Huan Wang <[email protected]>
Cc Angelo Dureghello <[email protected]>
Cc TsiChung Liew <[email protected]>
Cc Wolfgang Wegner <[email protected]>
Signed-off-by Tom Rini <[email protected]>
--- 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(-)
arch/m68k/include/asm/immap.h +0 -42
@@ -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)
arch/m68k/lib/time.c +0 -63
69 lines not on this page · raw message
board/freescale/m52277evb/README +0 -1
@@ -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
board/freescale/m53017evb/README +0 -1
@@ -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
board/freescale/m5373evb/README +0 -1
@@ -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
board/freescale/m54455evb/README +0 -1
@@ -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
include/configs/M5208EVBE.h +0 -1
@@ -43,7 +43,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C
include/configs/M52277EVB.h +0 -1
@@ -90,7 +90,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #define CONFIG_SYS_I2C
include/configs/M5235EVB.h +0 -1
@@ -52,7 +52,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C
include/configs/M53017EVB.h +0 -1
@@ -60,7 +60,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C
include/configs/M5329EVB.h +0 -1
@@ -52,7 +52,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C
include/configs/M5373EVB.h +0 -1
@@ -52,7 +52,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C
include/configs/M54418TWR.h +0 -1
@@ -137,7 +137,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #undef CONFIG_SYS_FSL_I2C
include/configs/M54451EVB.h +0 -1
@@ -103,7 +103,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #define CONFIG_SYS_I2C
include/configs/M54455EVB.h +0 -1
@@ -130,7 +130,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #define CONFIG_SYS_I2C
include/configs/astro_mcf5373l.h +0 -1
@@ -57,7 +57,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C
include/configs/stmark2.h +0 -1
@@ -60,7 +60,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* DSPI and Serial Flash */ #define CONFIG_CF_DSPI
scripts/config_whitelist.txt +0 -1
@@ -1092,7 +1092,6 @@ CONFIG_MAX_RAM_BANK_SIZE CONFIG_MCF5249 CONFIG_MCF5253 CONFIG_MCFFEC -CONFIG_MCFPIT CONFIG_MCFRTC CONFIG_MCFTMR CONFIG_MCLK_DIS
Signature · 1 line
2.17.1
PATCH 1/1 m68k: Drop CONFIG_MCFPIT support
Hi Tom,
Quoted 393 lines · Tom Rini
All platforms currently use the "MCFTMR" DMA timer rather than the PIT timer, so drop the MCFPIT code.
Cc Huan Wang <[email protected]>Cc Angelo Dureghello <[email protected]>Cc TsiChung Liew <[email protected]>Cc Wolfgang Wegner <[email protected]>Signed-off-by Tom Rini <[email protected]>--- 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(-)arch/m68k/include/asm/immap.h +0
-42@@ -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)arch/m68k/lib/time.c +0
-63@@ -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. board/freescale/m52277evb/README +0
-1@@ -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-bangedboard/freescale/m53017evb/README +0
-1@@ -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-bangedboard/freescale/m5373evb/README +0
-1@@ -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-bangedboard/freescale/m54455evb/README +0
-1@@ -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-bangedinclude/configs/M5208EVBE.h +0
-1@@ -43,7 +43,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C include/configs/M52277EVB.h +0
-1@@ -90,7 +90,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #define CONFIG_SYS_I2C include/configs/M5235EVB.h +0
-1@@ -52,7 +52,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C include/configs/M53017EVB.h +0
-1@@ -60,7 +60,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C include/configs/M5329EVB.h +0
-1@@ -52,7 +52,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C include/configs/M5373EVB.h +0
-1@@ -52,7 +52,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C include/configs/M54418TWR.h +0
-1@@ -137,7 +137,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #undef CONFIG_SYS_FSL_I2Cinclude/configs/M54451EVB.h +0
-1@@ -103,7 +103,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #define CONFIG_SYS_I2C include/configs/M54455EVB.h +0
-1@@ -130,7 +130,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2c */ #define CONFIG_SYS_I2C include/configs/astro_mcf5373l.h +0
-1@@ -57,7 +57,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* I2C */ #define CONFIG_SYS_I2C include/configs/stmark2.h +0
-1@@ -60,7 +60,6 @@/* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT/* DSPI and Serial Flash */ #define CONFIG_CF_DSPI scripts/config_whitelist.txt +0
-1@@ -1092,7 +1092,6 @@ CONFIG_MAX_RAM_BANK_SIZE CONFIG_MCF5249 CONFIG_MCF5253 CONFIG_MCFFEC -CONFIG_MCFPIT CONFIG_MCFRTC CONFIG_MCFTMR CONFIG_MCLK_DISSignature · 1 line
2.17.1
Reviewed-by Angelo Dureghello <[email protected]>
You can apply it, thanks !
Regards,
Angelo
PATCH 1/1 m68k: Drop CONFIG_MCFPIT support
In reply to Tom RiniQuoted 9 lines · Tom Rini
All platforms currently use the "MCFTMR" DMA timer rather than the PIT timer, so drop the MCFPIT code.
Cc Huan Wang <[email protected]>Cc Angelo Dureghello <[email protected]>Cc TsiChung Liew <[email protected]>Cc Wolfgang Wegner <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Angelo Dureghello <[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: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200110/4cb96e6f/attachment.sig>