Skip to contentSkip to conversation

arm: Remove OMAP2420H4 and all omap24xx support

PATCH New Tom Rini 1 participant 1 message Jun 4, 2013

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 arm: Remove OMAP2420H4 and all omap24xx support

The omap2420H4 was the only mainline omap24xx board. Prior to being fixed by Jon Hunter in time for v2013.04 it had been functionally broken for a very long time. Remove this board as there's not been interest in it in U-Boot for quite a long time.

---
 MAINTAINERS                                    |    4 -
 arch/arm/cpu/arm1136/start.S                   |   18 -
 arch/arm/include/asm/arch-omap24xx/bits.h      |   48 --
 arch/arm/include/asm/arch-omap24xx/clocks.h    |  112 ---
 arch/arm/include/asm/arch-omap24xx/i2c.h       |   68 --
 arch/arm/include/asm/arch-omap24xx/mem.h       |  156 -----
 arch/arm/include/asm/arch-omap24xx/mux.h       |  176 -----
 arch/arm/include/asm/arch-omap24xx/omap2420.h  |  236 -------
 arch/arm/include/asm/arch-omap24xx/sys_info.h  |   82 ---
 arch/arm/include/asm/arch-omap24xx/sys_proto.h |   54 --
 arch/arm/lib/cache.c                           |    2 +-
 board/ti/omap2420h4/Makefile                   |   45 --
 board/ti/omap2420h4/config.mk                  |   28 -
 board/ti/omap2420h4/lowlevel_init.S            |  185 -----
 board/ti/omap2420h4/mem.c                      |  362 ----------
 board/ti/omap2420h4/omap2420h4.c               |  867 ------------------------
 board/ti/omap2420h4/sys_info.c                 |  387 -----------
 boards.cfg                                     |    2 -
 doc/README.scrapyard                           |    1 +
 drivers/serial/ns16550.c                       |    5 -
 drivers/serial/serial_ns16550.c                |    5 -
 include/configs/omap2420h4.h                   |  264 --------
 22 files changed, 2 insertions(+), 3105 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/bits.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/clocks.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/i2c.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/mem.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/mux.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/omap2420.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/sys_info.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/sys_proto.h
 delete mode 100644 board/ti/omap2420h4/Makefile
 delete mode 100644 board/ti/omap2420h4/config.mk
 delete mode 100644 board/ti/omap2420h4/lowlevel_init.S
 delete mode 100644 board/ti/omap2420h4/mem.c
 delete mode 100644 board/ti/omap2420h4/omap2420h4.c
 delete mode 100644 board/ti/omap2420h4/sys_info.c
 delete mode 100644 include/configs/omap2420h4.h
MAINTAINERS +0 -4
index 14075af..2044236 100644
@@ -1025,10 +1025,6 @@ Matthias Weisser <[email protected]>
 	jadecpu		ARM926EJS (MB86R01 SoC)
 	zmx25		ARM926EJS (imx25 SoC)
 
-Richard Woodruff <[email protected]>
-
-	omap2420h4	ARM1136EJS
-
 Josh Wu <[email protected]>
 	at91sam9n12ek	ARM926EJS (AT91SAM9N12 SoC)
 
arch/arm/cpu/arm1136/start.S +0 -18
index edf249d..a7e0c28 100644
@@ -142,24 +142,6 @@ reset:
 	orr	r0,r0,#0xd3
 	msr	cpsr,r0
 
-#ifdef CONFIG_OMAP2420H4
-       /* Copy vectors to mask ROM indirect addr */
-	adr	r0, _start		/* r0 <- current position of code   */
-		add     r0, r0, #4				/* skip reset vector			*/
-	mov	r2, #64			/* r2 <- size to copy  */
-	add	r2, r0, r2		/* r2 <- source end address	    */
-	mov	r1, #SRAM_OFFSET0	  /* build vect addr */
-	mov	r3, #SRAM_OFFSET1
-	add	r1, r1, r3
-	mov	r3, #SRAM_OFFSET2
-	add	r1, r1, r3
-next:
-	ldmia	r0!, {r3-r10}		/* copy from source address [r0]    */
-	stmia	r1!, {r3-r10}		/* copy to   target address [r1]    */
-	cmp	r0, r2			/* until source end address [r2]    */
-	bne	next			/* loop until equal */
-	bl	cpy_clk_code		/* put dpll adjust code behind vectors */
-#endif
 	/* the mask ROM code should have PLL and others stable */
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 	bl  cpu_init_crit
arch/arm/include/asm/arch-omap24xx/bits.h deleted +0 -48

48 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/clocks.h deleted +0 -112

112 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/i2c.h deleted +0 -68

68 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/mem.h deleted +0 -156

156 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/mux.h deleted +0 -176

176 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/omap2420.h deleted +0 -236

236 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/sys_info.h deleted +0 -82

82 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/sys_proto.h deleted +0 -54

54 lines not on this page · raw message

arch/arm/lib/cache.c +1 -1
index b545fb7..8b1c8ed 100644
@@ -27,7 +27,7 @@
 
 void  __flush_cache(unsigned long start, unsigned long size)
 {
-#if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
+#if defined(CONFIG_ARM1136)
 	void arm1136_cache_flush(void);
 
 	arm1136_cache_flush();
board/ti/omap2420h4/Makefile deleted +0 -45

45 lines not on this page · raw message

board/ti/omap2420h4/config.mk deleted +0 -28
deleted file mode 100644
index e5dff69..0000000
@@ -1,28 +0,0 @@
-#
-# (C) Copyright 2004
-# Texas Instruments, <www.ti.com>
-#
-# TI H4 board with OMAP2420 (ARM1136) cpu
-# see http://www.ti.com/ for more information on Texas Instruments
-#
-# H4 has 1 bank of 32MB or 64MB mDDR-SDRAM on CS0
-# H4 has 1 bank of 32MB or 00MB mDDR-SDRAM on CS1
-# Physical Address:
-# 8000'0000 (bank0)
-# A000/0000 (bank1) ES2 will be configurable
-# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
-# (mem base + reserved)
-
-# For use with external or internal boots.
-#CONFIG_SYS_TEXT_BASE = 0x80e80000
-
-# Used with full SRAM boot.
-# This is either with a GP system or a signed boot image.
-# easiest, and safest way to go if you can.
-#CONFIG_SYS_TEXT_BASE = 0x40270000
-
-
-# Handy to get symbols to debug ROM version.
-#CONFIG_SYS_TEXT_BASE = 0x0
-CONFIG_SYS_TEXT_BASE = 0x08000000
-#CONFIG_SYS_TEXT_BASE = 0x04000000
board/ti/omap2420h4/lowlevel_init.S deleted +0 -185

185 lines not on this page · raw message

board/ti/omap2420h4/mem.c deleted +0 -362

362 lines not on this page · raw message

board/ti/omap2420h4/omap2420h4.c deleted +0 -867

867 lines not on this page · raw message

board/ti/omap2420h4/sys_info.c deleted +0 -387

387 lines not on this page · raw message

boards.cfg +0 -2
index e2a8d42..627db1f 100644
@@ -52,8 +52,6 @@ flea3                        arm         arm1136     -                   CarMedi
 mx35pdk                      arm         arm1136     -                   freescale      mx35
 woodburn                     arm         arm1136     -                   -              mx35
 woodburn_sd                  arm         arm1136     woodburn            -              mx35        woodburn_sd:IMX_CONFIG=board/woodburn/imximage.cfg
-omap2420h4                   arm         arm1136     -                   ti             omap24xx
-tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
 rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
 integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
 integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap:CM920T
doc/README.scrapyard +1 -0
index 9223f6e..a0f1fa3 100644
@@ -96,3 +96,4 @@ R5200            ColdFire    -              48ead7a     2008-03-31  Zachary P. L
 CPCI440          powerpc     440GP          b568fd2     2007-12-27  Matthias Fuchs <[email protected]>
 PCIPPC2          powerpc     MPC740/MPC750  7c9e89b     2013-02-07  Wolfgang Denk <[email protected]>
 PCIPPC6	powerpc	MPC740/MPC750 -	  -		Wolfgang Denk <[email protected]>
+omap2420h4       arm         omap24xx       -           2013-06-04  Richard Woodruff <[email protected]>
drivers/serial/ns16550.c +0 -5
index 7f013ab..d77c25f 100644
@@ -74,13 +74,8 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)
 	defined(CONFIG_AM33XX) || defined(CONFIG_SOC_DA8XX) || \
 	defined(CONFIG_TI814X)
 
-#if defined(CONFIG_APTIX)
-	/* /13 mode so Aptix 6MHz can hit 115200 */
-	serial_out(3, &com_port->mdr1);
-#else
 	/* /16 is proper to hit 115200 with 48MHz */
 	serial_out(0, &com_port->mdr1);
-#endif
 #endif /* CONFIG_OMAP */
 }
 
drivers/serial/serial_ns16550.c +0 -5
index b92eef4..3c07da3 100644
@@ -151,12 +151,7 @@ static int calc_divisor (NS16550_t port)
 	}
 #endif
 
-#ifdef CONFIG_APTIX
-#define MODE_X_DIV 13
-#else
 #define MODE_X_DIV 16
-#endif
-
 	/* Compute divisor value. Normally, we should simply return:
 	 *   CONFIG_SYS_NS16550_CLK) / MODE_X_DIV / gd->baudrate
 	 * but we need to round that value by adding 0.5.
include/configs/omap2420h4.h deleted +0 -264

115 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.9.5

Part of the diff is not shown here. View the raw message.