Skip to contentSkip to conversation

arm: unify interrupt init

PATCH New Jean-Christophe PLAGNIOL-VILLARD 3 participants 15 messages May 9, 2009 – May 12, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 arm: unify interrupt init

all arm init the IRQ stack the same way
so unify it in lib_arm/interrupts.c and then call arch specific interrupt init

---
applied to arm/testing

Best Regards,
J.

 cpu/arm1136/cpu.c            |   11 -----------
 cpu/arm720t/cpu.c            |    7 -------
 cpu/arm720t/interrupts.c     |    2 +-
 cpu/arm920t/cpu.c            |   11 -----------
 cpu/arm925t/cpu.c            |   11 -----------
 cpu/arm926ejs/cpu.c          |   11 -----------
 cpu/arm946es/cpu.c           |   11 -----------
 cpu/arm_cortexa8/cpu.c       |   12 ------------
 cpu/arm_intcm/cpu.c          |   11 -----------
 cpu/ixp/cpu.c                |   12 ------------
 cpu/ixp/interrupts.c         |    2 +-
 cpu/lh7a40x/cpu.c            |   11 -----------
 cpu/pxa/cpu.c                |   11 -----------
 cpu/sa1100/cpu.c             |    7 -------
 include/asm-arm/u-boot-arm.h |    1 +
 lib_arm/interrupts.c         |   13 +++++++++++++
 16 files changed, 16 insertions(+), 128 deletions(-)
cpu/arm1136/cpu.c +0 -11
index e03a765..f467b7a 100644
@@ -35,21 +35,10 @@
 #include <command.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm720t/cpu.c +0 -7
index 6c40903..7a2b9c3 100644
@@ -42,13 +42,6 @@ static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm720t/interrupts.c +1 -1
index ff21314..91d552c 100644
@@ -111,7 +111,7 @@ static ulong timestamp;
 static ulong lastdec;
 
 #if defined(CONFIG_USE_IRQ) && defined(CONFIG_S3C4510B)
-int interrupt_init (void)
+int arch_interrupt_init (void)
 {
 	int i;
 
cpu/arm920t/cpu.c +0 -11
index 8542f0a..9d5d025 100644
@@ -33,21 +33,10 @@
 #include <command.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm925t/cpu.c +0 -11
index a9778dc..354ba5c 100644
@@ -34,21 +34,10 @@
 #include <arm925t.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm926ejs/cpu.c +0 -11
index e483de6..978bfcd 100644
@@ -33,21 +33,10 @@
 #include <command.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm946es/cpu.c +0 -11
index 04e49d6..3939322 100644
@@ -33,21 +33,10 @@
 #include <command.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm_cortexa8/cpu.c +0 -12
index 3e1780b..e911206 100644
@@ -36,10 +36,6 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 #ifndef CONFIG_L2_OFF
 void l2cache_disable(void);
 #endif
@@ -48,14 +44,6 @@ static void cache_flush(void);
 
 int cpu_init(void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START =
-	    _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/arm_intcm/cpu.c +0 -11
index 1636ffb..9ce17f2 100644
@@ -33,19 +33,8 @@
 #include <common.h>
 #include <command.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/ixp/cpu.c +0 -12
index 42c62f6..5cfc39d 100644
@@ -38,10 +38,6 @@
 
 ulong loops_per_jiffy;
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 #if defined(CONFIG_DISPLAY_CPUINFO)
@@ -81,14 +77,6 @@ int print_cpuinfo (void)
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
-
 	return 0;
 }
 
cpu/ixp/interrupts.c +1 -1
index a05e439..06a826a 100644
@@ -67,7 +67,7 @@ void irq_install_handler (int irq, interrupt_handler_t handle_irq, void *data)
 	IRQ_HANDLER[irq].m_func = handle_irq;
 }
 
-int interrupt_init (void)
+int arch_interrupt_init (void)
 {
 	int i;
 
cpu/lh7a40x/cpu.c +0 -11
index 77e6394..f47ca03 100644
@@ -33,21 +33,10 @@
 #include <command.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/pxa/cpu.c +0 -11
index 3a1be57..8edb44e 100644
@@ -35,21 +35,10 @@
 #include <asm/arch/pxa-regs.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_USE_IRQ
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
cpu/sa1100/cpu.c +0 -7
index ed1a6f7..39285a0 100644
@@ -42,13 +42,6 @@ static void cache_flush(void);
 
 int cpu_init (void)
 {
-	/*
-	 * setup up stacks if necessary
-	 */
-#ifdef CONFIG_USE_IRQ
-	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
-	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
-#endif
 	return 0;
 }
 
include/asm-arm/u-boot-arm.h +1 -0
index 238d408..76f1ffa 100644
@@ -58,6 +58,7 @@ void	setup_revision_tag (struct tag **params);
 int	setenv		(char *, char *);
 
 /* cpu/.../interrupt.c */
+int	arch_interrupt_init	(void);
 void	reset_timer_masked	(void);
 ulong	get_timer_masked	(void);
 void	udelay_masked		(unsigned long usec);
lib_arm/interrupts.c +13 -0
index 4dafbfa..d26b724 100644
@@ -39,6 +39,19 @@
 #include <asm/proc-armv/ptrace.h>
 
 #ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
+
+int interrupt_init (void)
+{
+	/*
+	 * setup up stacks if necessary
+	 */
+	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
+	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
+
+	return arch_interrupt_init();
+}
+
 /* enable IRQ interrupts */
 void enable_interrupts (void)
 {
Signature · 1 line
1.6.2.4
#1 lore raw

PATCH 2/6 arm: remove cpu_init

move s3c44b0 to arch_cpu_init and as noone use cpu_init remove it

---
applied to arm/testing

Best Regards,
J.

 cpu/arm1136/cpu.c      |    5 -----
 cpu/arm1176/cpu.c      |    5 -----
 cpu/arm720t/cpu.c      |    5 -----
 cpu/arm920t/cpu.c      |    5 -----
 cpu/arm925t/cpu.c      |    5 -----
 cpu/arm926ejs/cpu.c    |    5 -----
 cpu/arm946es/cpu.c     |    5 -----
 cpu/arm_cortexa8/cpu.c |    5 -----
 cpu/arm_intcm/cpu.c    |    5 -----
 cpu/ixp/cpu.c          |    5 -----
 cpu/lh7a40x/cpu.c      |    5 -----
 cpu/pxa/cpu.c          |    5 -----
 cpu/s3c44b0/cpu.c      |    2 +-
 cpu/sa1100/cpu.c       |    5 -----
 include/configs/B2.h   |    1 +
 lib_arm/board.c        |    1 -
 16 files changed, 2 insertions(+), 67 deletions(-)
cpu/arm1136/cpu.c +0 -5
index f467b7a..c2110c9 100644
@@ -37,11 +37,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm1176/cpu.c +0 -5
index bfa4378..bd1e4dd 100644
@@ -38,11 +38,6 @@
 
 static void cache_flush (void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm720t/cpu.c +0 -5
index 7a2b9c3..88c71bf 100644
@@ -40,11 +40,6 @@
 static void cache_flush(void);
 #endif
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm920t/cpu.c +0 -5
index 9d5d025..0c7d73f 100644
@@ -35,11 +35,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm925t/cpu.c +0 -5
index 354ba5c..893eec0 100644
@@ -36,11 +36,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm926ejs/cpu.c +0 -5
index 978bfcd..82f4242 100644
@@ -35,11 +35,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm946es/cpu.c +0 -5
index 3939322..8816071 100644
@@ -35,11 +35,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/arm_cortexa8/cpu.c +0 -5
index e911206..9c2d5da 100644
@@ -42,11 +42,6 @@ void l2cache_disable(void);
 
 static void cache_flush(void);
 
-int cpu_init(void)
-{
-	return 0;
-}
-
 int cleanup_before_linux(void)
 {
 	unsigned int i;
cpu/arm_intcm/cpu.c +0 -5
index 9ce17f2..1310604 100644
@@ -33,11 +33,6 @@
 #include <common.h>
 #include <command.h>
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/ixp/cpu.c +0 -5
index 5cfc39d..ce275e5 100644
@@ -75,11 +75,6 @@ int print_cpuinfo (void)
 }
 #endif /* CONFIG_DISPLAY_CPUINFO */
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/lh7a40x/cpu.c +0 -5
index f47ca03..9808ab8 100644
@@ -35,11 +35,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/pxa/cpu.c +0 -5
index 8edb44e..800d120 100644
@@ -37,11 +37,6 @@
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
cpu/s3c44b0/cpu.c +1 -1
index 7ef4a1f..bca38f8 100644
@@ -32,7 +32,7 @@
 #include <command.h>
 #include <asm/hardware.h>
 
-int cpu_init (void)
+int arch_cpu_init (void)
 {
 	icache_enable();
 
cpu/sa1100/cpu.c +0 -5
index 39285a0..58e90dc 100644
@@ -40,11 +40,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static void cache_flush(void);
 
-int cpu_init (void)
-{
-	return 0;
-}
-
 int cleanup_before_linux (void)
 {
 	/*
include/configs/B2.h +1 -0
index 35fad5c..e5439f3 100644
@@ -39,6 +39,7 @@
 #define CONFIG_ARM_THUMB	1	/* this is an ARM7TDMI */
 #undef  CONFIG_ARM7_REVD		/* disable ARM720 REV.D Workarounds */
 #define CONFIG_SYS_NO_CP15_CACHE
+#define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_S3C44B0_CLOCK_SPEED	75 /* we have a 75Mhz S3C44B0*/
 
lib_arm/board.c +0 -1
index 344120f..452b177 100644
@@ -265,7 +265,6 @@ typedef int (init_fnc_t) (void);
 int print_cpuinfo (void);
 
 init_fnc_t *init_sequence[] = {
-	cpu_init,		/* basic cpu dependent setup */
 #if defined(CONFIG_ARCH_CPU_INIT)
 	arch_cpu_init,		/* basic arch cpu dependent setup */
 #endif
Signature · 1 line
1.6.2.4
#2 lore raw

PATCH 3/6 s3c4510b: move interrupts code to soc

---
applied to arm/testing

Best Regards,
J.

 cpu/arm720t/Makefile                  |    4 +-
 cpu/arm720t/s3c4510b/Makefile         |    1 +
 cpu/arm720t/s3c4510b/interrupts.c     |   85 +++++++++++++++++++++++++++++++++
 cpu/arm720t/{interrupts.c => timer.c} |   74 ++++-------------------------
 4 files changed, 98 insertions(+), 66 deletions(-)
 create mode 100644 cpu/arm720t/s3c4510b/interrupts.c
 rename cpu/arm720t/{interrupts.c => timer.c} (78%)
cpu/arm720t/Makefile +3 -1
index d5ac7d3..3e9b45a 100644
@@ -26,7 +26,9 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-COBJS	= interrupts.o cpu.o
+
+COBJS	+= cpu.o
+COBJS	+= timer.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
cpu/arm720t/s3c4510b/Makefile +1 -0
index c099036..91e27fd 100644
@@ -26,6 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(SOC).a
 
 COBJS-y	+= cache.o
+COBJS-y	+= interrupts.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS-y))
cpu/arm720t/s3c4510b/interrupts.c new file +85 -0

85 lines not on this page · raw message

cpu/arm720t/timer.c renamed from cpu/arm720t/interrupts.c +9 -65

106 lines not on this page · raw message

Signature · 1 line
1.6.2.4
#3 lore raw

PATCH 4/6 lpc2292: move interrupts code to soc

---
applied to arm/testing

Best Regards,
J.

 cpu/arm720t/lpc2292/Makefile     |   11 +++++++--
 cpu/arm720t/lpc2292/interrupts.c |   41 ++++++++++++++++++++++++++++++++++++++
 cpu/arm720t/timer.c              |   12 -----------
 3 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 cpu/arm720t/lpc2292/interrupts.c
cpu/arm720t/lpc2292/Makefile +8 -3
index 240f1e3..326d9d0 100644
@@ -25,11 +25,16 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(SOC).a
 
-COBJS	= flash.o mmc.o mmc_hw.o spi.o
 SOBJS	= $(obj)iap_entry.o
 
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
+COBJS-y	+= flash.o
+COBJS-$(CONFIG_USE_IRQ)	+= interrupts.o
+COBJS-y	+= mmc.o
+COBJS-y	+= mmc_hw.o spi.o
+COBJS-y	+= spi.o
+
+SRCS	:= $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS-y))
 
 all:	$(obj).depend $(LIB)
 
cpu/arm720t/lpc2292/interrupts.c new file +41 -0

41 lines not on this page · raw message

cpu/arm720t/timer.c +0 -12
index 98588af..5352c79 100644
@@ -28,7 +28,6 @@
 
 #include <common.h>
 #include <clps7111.h>
-#include <asm/proc-armv/ptrace.h>
 #include <asm/hardware.h>
 
 #ifndef CONFIG_NETARM
@@ -50,17 +49,6 @@
 #define READ_TIMER (TM2STAT & NETARM_GEN_TSTAT_CTC_MASK)
 #endif
 
-#if defined(CONFIG_USE_IRQ) && defined(CONFIG_LPC2292)
-void do_irq (struct pt_regs *pt_regs)
-{
-    void (*pfnct)(void);
-
-    pfnct = (void (*)(void))VICVectAddr;
-
-    (*pfnct)();
-}
-#endif
-
 #if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
 	/* Use IntegratorAP routines in board/integratorap.c */
 #else
Signature · 1 line
1.6.2.4
#4 lore raw

PATCH 5/6 arm920t/interrupts: Move conditional compilation to Makefile

---
applied to arm/testing

Best Regards,
J.

 cpu/arm920t/Makefile     |    8 +++++---
 cpu/arm920t/interrupts.c |    4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)
cpu/arm920t/Makefile +5 -3
index e02bc6a..cbb13b2 100644
@@ -26,10 +26,12 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-COBJS	= cpu.o interrupts.o
 
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
+COBJS-y	+= cpu.o
+COBJS-$(CONFIG_USE_IRQ)	+= interrupts.o
+
+SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS-y) $(SOBJS))
 START	:= $(addprefix $(obj),$(START))
 
 all:	$(obj).depend $(START) $(LIB)
cpu/arm920t/interrupts.c +1 -3
index 8d5289e..a589b80 100644
@@ -30,9 +30,8 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_USE_IRQ
 #include <asm/proc-armv/ptrace.h>
+
 void do_irq (struct pt_regs *pt_regs)
 {
 #if defined (ARM920_IRQ_CALLBACK)
@@ -46,4 +45,3 @@ void do_irq (struct pt_regs *pt_regs)
 #error do_irq() not defined for this cpu type
 #endif
 }
-#endif
Signature · 1 line
1.6.2.4
#5 lore raw

PATCH 6/6 S3C24x0: extract interrupts from timer

---
applied to arm/testing

Best Regards,
J.

 cpu/arm920t/interrupts.c               |    8 ++------
 cpu/arm920t/s3c24x0/Makefile           |   14 ++++++++------
 cpu/arm920t/{ => s3c24x0}/interrupts.c |   19 +++++++++----------
 cpu/arm920t/s3c24x0/timer.c            |    9 ---------
 include/common.h                       |    2 --
 5 files changed, 19 insertions(+), 33 deletions(-)
 copy cpu/arm920t/{ => s3c24x0}/interrupts.c (78%)
cpu/arm920t/interrupts.c +2 -6
index a589b80..73e8ae8 100644
@@ -32,16 +32,12 @@
 #include <common.h>
 #include <asm/proc-armv/ptrace.h>
 
+#if defined (CONFIG_ARCH_INTEGRATOR)
 void do_irq (struct pt_regs *pt_regs)
 {
-#if defined (ARM920_IRQ_CALLBACK)
-	ARM920_IRQ_CALLBACK();
-#elif defined (CONFIG_ARCH_INTEGRATOR)
 	/* ASSUMED to be a timer interrupt  */
 	/* Just clear it - count handled in */
 	/* integratorap.c                   */
 	*(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0x0C) = 0;
-#else
-#error do_irq() not defined for this cpu type
-#endif
 }
+#endif
cpu/arm920t/s3c24x0/Makefile +8 -6
index 5d2be2c..7e8d6ed 100644
@@ -25,13 +25,15 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(SOC).a
 
-COBJS	+= speed.o
-COBJS	+= timer.o
-COBJS	+= usb.o
-COBJS	+= usb_ohci.o
+COBJS-$(CONFIG_USE_IRQ) += interrupts.o
+COBJS-y	+= speed.o
+COBJS-y	+= timer.o
+COBJS-y	+= usb.o
+COBJS-y	+= usb_ohci.o
 
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS-y))
 
 all:	$(obj).depend $(LIB)
 
cpu/arm920t/s3c24x0/interrupts.c renamed from cpu/arm920t/interrupts.c +9 -10
similarity index 78%
copy from cpu/arm920t/interrupts.c
copy to cpu/arm920t/s3c24x0/interrupts.c
index a589b80..11ec95e 100644
@@ -30,18 +30,17 @@
  */
 
 #include <common.h>
+
+#if defined(CONFIG_S3C2400)
+#include <s3c2400.h>
+#elif defined(CONFIG_S3C2410)
+#include <s3c2410.h>
+#endif
 #include <asm/proc-armv/ptrace.h>
 
 void do_irq (struct pt_regs *pt_regs)
 {
-#if defined (ARM920_IRQ_CALLBACK)
-	ARM920_IRQ_CALLBACK();
-#elif defined (CONFIG_ARCH_INTEGRATOR)
-	/* ASSUMED to be a timer interrupt  */
-	/* Just clear it - count handled in */
-	/* integratorap.c                   */
-	*(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0x0C) = 0;
-#else
-#error do_irq() not defined for this cpu type
-#endif
+	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
+	u_int32_t intpnd = irq->INTPND;
+
 }
cpu/arm920t/s3c24x0/timer.c +0 -9
index 8205355..8aebb19 100644
@@ -215,13 +215,4 @@ void reset_cpu (ulong ignored)
 	/*NOTREACHED*/
 }
 
-#ifdef CONFIG_USE_IRQ
-void s3c2410_irq(void)
-{
-	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
-	u_int32_t intpnd = irq->INTPND;
-
-}
-#endif /* USE_IRQ */
-
 #endif /* defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB) */
include/common.h +0 -2
index 30fff7d..21a504a 100644
@@ -491,8 +491,6 @@ ulong	get_PCI_freq (void);
 #endif
 #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
 	defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
-void	s3c2410_irq(void);
-#define ARM920_IRQ_CALLBACK s3c2410_irq
 ulong	get_FCLK (void);
 ulong	get_HCLK (void);
 ulong	get_PCLK (void);
Signature · 1 line
1.6.2.4
#6 lore raw

PATCH 3/6 s3c4510b: move interrupts code to soc

In reply to Jean-Christophe PLAGNIOL-VILLARD

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 3 lines · In message <[email protected]> you wrote:

---
applied to arm/testing

How much of this patch has actually been tested yet?

Best regards,

Wolfgang Denk

Signature · 6 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
"It ain't so much the things we don't know that get  us  in  trouble.
It's  the  things  we know that ain't so." - Artemus Ward aka Charles
Farrar Brown
#8 lore raw

PATCH 3/6 s3c4510b: move interrupts code to soc

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 10 lines · In message <[email protected]> you wrote:
Quoted 8 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 3 lines · In message <[email protected]> you wrote:

---
applied to arm/testing

How much of this patch has actually been tested yet?

only compiled actually

Then we definitely need the ACK from a board maintainer who can test this on actual hardware.

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
Heavier than air flying machines are impossible.
                    -- Lord Kelvin, President, Royal Society, c. 1895
#9 lore raw

PATCH 3/6 s3c4510b: move interrupts code to soc

Quoted 11 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 7 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 3 lines · In message <[email protected]> you wrote:

---
applied to arm/testing

Quoted 5 lines
Quoted 2 lines
Quoted 1 line

How much of this patch has actually been tested yet?

only compiled actually

Then we definitely need the ACK from a board maintainer who can test this on actual hardware.

Hi Curt
Could you try the current testing branch of u-boot-arm
git://git.denx.de/u-boot-arm.git testing

I've done a cleanup of the s3c4510b interrupt code

Best Regards,
J.

#10 lore raw

PATCH 3/6 s3c4510b: move interrupts code to soc

Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 7 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 3 lines · In message <[email protected]> you wrote:

---
applied to arm/testing

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Quoted 1 line

How much of this patch has actually been tested yet?

only compiled actually

Then we definitely need the ACK from a board maintainer who can test this on actual hardware.

Hi Curt
Could you try the current testing branch of u-boot-arm
git://git.denx.de/u-boot-arm.git testing

I've receive a failure notice
is someone have a evb4510?

Best Regards,
J.

#11 lore raw

PATCH 2/6 arm: remove cpu_init

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 3 lines · Jean-Christophe PLAGNIOL-VILLARD

move s3c44b0 to arch_cpu_init and as noone use cpu_init remove it

Cortex-A8 (OMAP3) part

Just a minor _question_ for an other board below:

cpu/s3c44b0/cpu.c line 38

Quoted 13 lines
cpu/s3c44b0/cpu.c +1 -1
index 7ef4a1f..bca38f8 100644
@@ -32,7 +32,7 @@
 #include <command.h>
 #include <asm/hardware.h>
 
-int cpu_init (void)
+int arch_cpu_init (void)
 {
 	icache_enable();
 

Would encapsulating this new arch_cpu_init() with an additional CONFIG_ARCH_CPU_INIT, e.g.

#if defined(CONFIG_ARCH_CPU_INIT)
int arch_cpu_init (void)
{

(like below) help to avoid issues if cpu/s3c44b0/cpu.c would be compiled without CONFIG_ARCH_CPU_INIT enabled?

Quoted 24 lines
include/configs/B2.h +1 -0
index 35fad5c..e5439f3 100644
@@ -39,6 +39,7 @@
 #define CONFIG_ARM_THUMB	1	/* this is an ARM7TDMI */
 #undef  CONFIG_ARM7_REVD		/* disable ARM720 REV.D Workarounds */
 #define CONFIG_SYS_NO_CP15_CACHE
+#define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_S3C44B0_CLOCK_SPEED	75 /* we have a 75Mhz S3C44B0*/
 
lib_arm/board.c +0 -1
index 344120f..452b177 100644
@@ -265,7 +265,6 @@ typedef int (init_fnc_t) (void);
 int print_cpuinfo (void);
 
 init_fnc_t *init_sequence[] = {
-	cpu_init,		/* basic cpu dependent setup */
 #if defined(CONFIG_ARCH_CPU_INIT)
 	arch_cpu_init,		/* basic arch cpu dependent setup */
 #endif
#12 lore raw

PATCH 2/6 arm: remove cpu_init

Quoted 11 lines · Dirk Behme
Quoted 3 lines · Jean-Christophe PLAGNIOL-VILLARD

move s3c44b0 to arch_cpu_init and as noone use cpu_init remove it

Cortex-A8 (OMAP3) part

Just a minor _question_ for an other board below:

Quoted 15 lines

cpu/s3c44b0/cpu.c line 38

Quoted 12 lines
cpu/s3c44b0/cpu.c +1 -0
index 7ef4a1f..bca38f8 100644
@@ -32,7 +32,7 @@
 #include <command.h>
 #include <asm/hardware.h>
 -int cpu_init (void)
+int arch_cpu_init (void)
 {
 	icache_enable();
 

Would encapsulating this new arch_cpu_init() with an additional CONFIG_ARCH_CPU_INIT, e.g.

no as this code is supposed to be always enable

Quoted 7 lines

#if defined(CONFIG_ARCH_CPU_INIT)
int arch_cpu_init (void)
{

(like below) help to avoid issues if cpu/s3c44b0/cpu.c would be compiled without CONFIG_ARCH_CPU_INIT enabled?

why?
this is where the s3c44 enable the icache

Best Regards,
J.

#13 lore raw

PATCH 1/6 arm: unify interrupt init

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 4 lines · Jean-Christophe PLAGNIOL-VILLARD

all arm init the IRQ stack the same way
so unify it in lib_arm/interrupts.c and then call arch specific interrupt init

Cortex-A8 (OMAP3) part

Quoted 22 lines

---
applied to arm/testing

Best Regards,
J.

 cpu/arm1136/cpu.c            |   11 -----------
 cpu/arm720t/cpu.c            |    7 -------
 cpu/arm720t/interrupts.c     |    2 +-
 cpu/arm920t/cpu.c            |   11 -----------
 cpu/arm925t/cpu.c            |   11 -----------
 cpu/arm926ejs/cpu.c          |   11 -----------
 cpu/arm946es/cpu.c           |   11 -----------
 cpu/arm_cortexa8/cpu.c       |   12 ------------
 cpu/arm_intcm/cpu.c          |   11 -----------
 cpu/ixp/cpu.c                |   12 ------------
 cpu/ixp/interrupts.c         |    2 +-
 cpu/lh7a40x/cpu.c            |   11 -----------
 cpu/pxa/cpu.c                |   11 -----------
 cpu/sa1100/cpu.c             |    7 -------
 include/asm-arm/u-boot-arm.h |    1 +
 lib_arm/interrupts.c         |   13 +++++++++++++
 16 files changed, 16 insertions(+), 128 deletions(-)
#14 lore raw

PATCH 1/6 arm: unify interrupt init

Quoted 7 lines · Dirk Behme
Quoted 4 lines · Jean-Christophe PLAGNIOL-VILLARD

all arm init the IRQ stack the same way
so unify it in lib_arm/interrupts.c and then call arch specific interrupt init

Cortex-A8 (OMAP3) part

As OMAP3 does not support IRQ actually
this patch will have normally no impact
in the omap3 way it's just remove dead code

Best Regards,
J.