Skip to contentSkip to conversation

Separate omap24xx specific code from arm1136

PATCH New Guennadi Liakhovetski 3 participants 4 messages Mar 26, 2008 – Apr 13, 2008 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/7 Separate omap24xx specific code from arm1136

From: Sascha Hauer <[email protected]>

Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136 to cpu/arm1136/omap24xx.

---

No changes wrt v1

 Makefile                                           |    4 +-
 cpu/arm1136/Makefile                               |    2 +-
 cpu/arm1136/cpu.c                                  |   11 +-
 cpu/arm1136/interrupts.c                           |  167 --------------------
 cpu/arm1136/omap24xx/Makefile                      |   46 ++++++
 cpu/arm1136/omap24xx/interrupts.c                  |  159 +++++++++++++++++++
 cpu/arm1136/omap24xx/start.S                       |   42 +++++
 cpu/arm1136/start.S                                |   21 ---
 .../asm-arm/{arch-arm1136 => arch-omap24xx}/bits.h |    0 
 .../{arch-arm1136 => arch-omap24xx}/clocks.h       |    0 
 .../asm-arm/{arch-arm1136 => arch-omap24xx}/i2c.h  |    0 
 .../asm-arm/{arch-arm1136 => arch-omap24xx}/mem.h  |    0 
 .../asm-arm/{arch-arm1136 => arch-omap24xx}/mux.h  |    0 
 .../{arch-arm1136 => arch-omap24xx}/omap2420.h     |    0 
 .../{arch-arm1136 => arch-omap24xx}/sizes.h        |    0 
 .../{arch-arm1136 => arch-omap24xx}/sys_info.h     |    0 
 .../{arch-arm1136 => arch-omap24xx}/sys_proto.h    |    0 
 17 files changed, 254 insertions(+), 198 deletions(-)
 delete mode 100644 cpu/arm1136/interrupts.c
 create mode 100644 cpu/arm1136/omap24xx/Makefile
 create mode 100644 cpu/arm1136/omap24xx/interrupts.c
 create mode 100644 cpu/arm1136/omap24xx/start.S
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/bits.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/clocks.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/i2c.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/mem.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/mux.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/omap2420.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/sizes.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/sys_info.h (100%)
 rename include/asm-arm/{arch-arm1136 => arch-omap24xx}/sys_proto.h (100%)
Makefile +2 -2
index 4255cf5..a9f4bd3 100644
@@ -2587,12 +2587,12 @@ zylonite_config :
 ## ARM1136 Systems
 #########################################################################
 omap2420h4_config	: unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
+	@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
 
 apollon_config		: unconfig
 	@mkdir -p $(obj)include
 	@echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
-	@$(MKCONFIG) $(@:_config=) arm arm1136 apollon
+	@$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
 	@echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 
 #========================================================================
cpu/arm1136/Makefile +1 -1
index d5ac7d3..7701b03 100644
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-COBJS	= interrupts.o cpu.o
+COBJS	= cpu.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
cpu/arm1136/cpu.c +4 -7
index fa78eaa..c27f8cd 100644
@@ -33,9 +33,6 @@
 
 #include <common.h>
 #include <command.h>
-#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
-#include <asm/arch/omap2420.h>
-#endif
 
 #ifdef CONFIG_USE_IRQ
 DECLARE_GLOBAL_DATA_PTR;
@@ -47,10 +44,10 @@ static unsigned long read_p15_c1 (void)
 	unsigned long value;
 
 	__asm__ __volatile__(
-						"mrc	p15, 0, %0, c1, c0, 0   @ read control reg\n"
-						: "=r" (value)
-						:
-						: "memory");
+				"mrc	p15, 0, %0, c1, c0, 0   @ read control reg\n"
+				: "=r" (value)
+				:
+				: "memory");
 	return value;
 }
 
cpu/arm1136/interrupts.c deleted +0 -167

167 lines not on this page · raw message

cpu/arm1136/omap24xx/Makefile new file +46 -0

46 lines not on this page · raw message

cpu/arm1136/omap24xx/interrupts.c new file +159 -0

159 lines not on this page · raw message

cpu/arm1136/omap24xx/start.S new file +42 -0

42 lines not on this page · raw message

cpu/arm1136/start.S +0 -21
index 8b765f1..56009d0 100644
@@ -30,9 +30,6 @@
 
 #include <config.h>
 #include <version.h>
-#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
-#include <asm/arch/omap2420.h>
-#endif
 .globl _start
 _start: b	reset
 #ifdef CONFIG_ONENAND_IPL
@@ -438,22 +435,4 @@ fiq:
 arm1136_cache_flush:
 		mcr	p15, 0, r1, c7, c5, 0	@ invalidate I cache
 		mov	pc, lr			@ back to caller
-
-#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
-/* Use the IntegratorCP function from board/integratorcp/platform.S */
-#else
-
-	.align	5
-.globl reset_cpu
-reset_cpu:
-	ldr	r1, rstctl	/* get addr for global reset reg */
-	mov	r3, #0x2	/* full reset pll+mpu */
-	str	r3, [r1]	/* force reset */
-	mov	r0, r0
-_loop_forever:
-	b	_loop_forever
-rstctl:
-	.word	PM_RSTCTRL_WKUP
-
-#endif
 #endif	/* CONFIG_ONENAND_IPL */
include/asm-arm/arch-omap24xx/bits.h renamed from include/asm-arm/arch-arm1136/bits.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/bits.h
rename to include/asm-arm/arch-omap24xx/bits.h
include/asm-arm/arch-omap24xx/clocks.h renamed from include/asm-arm/arch-arm1136/clocks.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/clocks.h
rename to include/asm-arm/arch-omap24xx/clocks.h
include/asm-arm/arch-omap24xx/i2c.h renamed from include/asm-arm/arch-arm1136/i2c.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/i2c.h
rename to include/asm-arm/arch-omap24xx/i2c.h
include/asm-arm/arch-omap24xx/mem.h renamed from include/asm-arm/arch-arm1136/mem.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/mem.h
rename to include/asm-arm/arch-omap24xx/mem.h
include/asm-arm/arch-omap24xx/mux.h renamed from include/asm-arm/arch-arm1136/mux.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/mux.h
rename to include/asm-arm/arch-omap24xx/mux.h
include/asm-arm/arch-omap24xx/omap2420.h renamed from include/asm-arm/arch-arm1136/omap2420.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/omap2420.h
rename to include/asm-arm/arch-omap24xx/omap2420.h
include/asm-arm/arch-omap24xx/sizes.h renamed from include/asm-arm/arch-arm1136/sizes.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/sizes.h
rename to include/asm-arm/arch-omap24xx/sizes.h
include/asm-arm/arch-omap24xx/sys_info.h renamed from include/asm-arm/arch-arm1136/sys_info.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/sys_info.h
rename to include/asm-arm/arch-omap24xx/sys_info.h
include/asm-arm/arch-omap24xx/sys_proto.h renamed from include/asm-arm/arch-arm1136/sys_proto.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm1136/sys_proto.h
rename to include/asm-arm/arch-omap24xx/sys_proto.h
Signature · 1 line
1.5.4
#1 lore raw

PATCH v2 1/7 Separate omap24xx specific code from arm1136

Quoted 9 lines

-----Original Message-----
From: Guennadi Liakhovetski [mailto:lg at denx.de]
Sent: 26 March 2008 19:41
To: u-boot-users at lists.sourceforge.net
Cc: Wolfgang Denk; Sascha Hauer; Peter Pearse
Subject: [PATCH v2 1/7] Separate omap24xx specific code from arm1136

Quoted 8 lines

From: Sascha Hauer <[email protected]>

Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136 to cpu/arm1136/omap24xx.

---snip---

Quoted 37 lines
cpu/arm1136/omap24xx/interrupts.c new file +30 -0
new file mode 100644
index 0000000..a50fa39
@@ -0,0 +1,159 @@
+/*
+ * (C) Copyright 2004
+ * Texas Instruments
+ * Richard Woodruff <[email protected]>
+ *
+ * (C) Copyright 2002
+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
+ * Marius Groeger <[email protected]>
+ * Alex Zuepke <[email protected]>
+ *
+ * (C) Copyright 2002
+ * Gary Jennejohn, DENX Software Engineering, <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA

cpu/arm1136/omap24xx/interrupts.c line 40

Quoted 10 lines
cpu/arm1136/omap24xx/interrupts.c new file +10 -0
+ */
+
+#include <common.h>
+#include <asm/arch/bits.h>
+#include <asm/arch/omap2420.h>
+
+#define TIMER_LOAD_VAL 0
+
+/* macro to read the 32 bit timer */
+#define READ_TIMER (*(volatile ulong *)(CFG_TIMERBASE+TCRR))

I'm assuming you have no objection to me patching this to

#define READ_TIMER (*((volatile ulong *)(CFG_TIMERBASE+TCRR)))

to get apollon & omap2420h4 to build with arm-linux-gcc (GCC) 4.0.0 (DENX ELDK 4.0 4.0.0) .

Then I can submit for merge tomorrow (Sunday)

Regards

Peter

#2 lore raw

PATCH v2 1/7 Separate omap24xx specific code from arm1136

Quoted 8 lines · Peter Pearse

cpu/arm1136/omap24xx/interrupts.c line 40

Quoted 5 lines

-----Original Message-----
From: Guennadi Liakhovetski [mailto:lg at denx.de]

cpu/arm1136/omap24xx/interrupts.c new file +3 -0
+
+/* macro to read the 32 bit timer */
+#define READ_TIMER (*(volatile ulong *)(CFG_TIMERBASE+TCRR))

I'm assuming you have no objection to me patching this to

Quoted 4 lines

#define READ_TIMER (*((volatile ulong *)(CFG_TIMERBASE+TCRR)))

to get apollon & omap2420h4 to build with arm-linux-gcc (GCC) 4.0.0 (DENX ELDK 4.0 4.0.0) .

Fine with me, although, strange that it is needed... But if it is - no problem.

Quoted 1 line

Then I can submit for merge tomorrow (Sunday)

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.

DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de

#3 lore raw

PATCH v2 1/7 Separate omap24xx specific code from arm1136

In reply to Guennadi Liakhovetski
Quoted 8 lines · In message <[email protected]> you wrote:

From: Sascha Hauer <[email protected]>

Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm= 1136
to cpu/arm1136/omap24xx.

Pulled in directly.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A wise person makes his  own  decisions,  a  weak  one  obeys  public
opinion.                                           -- Chinese proverb