Re: [U-Boot] [PATCH 06/17] LEON3: Moved GRLIB core header files to common include/grlib directory
Dear Daniel Hellstrom, In message 1274194143-8994-5-git-send-email-dan...@gaisler.com you wrote: Signed-off-by: Daniel Hellstrom dan...@gaisler.com --- arch/sparc/cpu/leon3/cpu_init.c | 10 +-- arch/sparc/cpu/leon3/interrupts.c |7 +- arch/sparc/cpu/leon3/memcfg.h |1 - arch/sparc/cpu/leon3/prom.c |7 ++- arch/sparc/cpu/leon3/serial.c | 16 ++-- drivers/net/greth.c |2 +- include/ambapp.h | 137 - include/grlib/apbuart.h | 63 + include/grlib/gptimer.h | 50 + include/grlib/greth.h | 103 include/grlib/irqmp.h | 39 +++ 11 files changed, 277 insertions(+), 158 deletions(-) create mode 100644 include/grlib/apbuart.h create mode 100644 include/grlib/gptimer.h create mode 100644 include/grlib/greth.h create mode 100644 include/grlib/irqmp.h ... --- /dev/null +++ b/include/grlib/apbuart.h @@ -0,0 +1,63 @@ +/* GRLIB APBUART definitions + * + * (C) Copyright 2010 + * Daniel Hellstrom, Aeroflex Gaisler, dan...@gaisler.com ... Incorrect multiline comment style. OK, I give up review on this patch series now. Please apply all previously made review comments globally, to all patches in this series. Then resubmit. Best regards, Wolfgang Denk -- 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: w...@denx.de Drawing on my fine command of language, I said nothing. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 06/17] LEON3: Moved GRLIB core header files to common include/grlib directory
Signed-off-by: Daniel Hellstrom dan...@gaisler.com
---
arch/sparc/cpu/leon3/cpu_init.c | 10 +--
arch/sparc/cpu/leon3/interrupts.c |7 +-
arch/sparc/cpu/leon3/memcfg.h |1 -
arch/sparc/cpu/leon3/prom.c |7 ++-
arch/sparc/cpu/leon3/serial.c | 16 ++--
drivers/net/greth.c |2 +-
include/ambapp.h | 137 -
include/grlib/apbuart.h | 63 +
include/grlib/gptimer.h | 50 +
include/grlib/greth.h | 103
include/grlib/irqmp.h | 39 +++
11 files changed, 277 insertions(+), 158 deletions(-)
create mode 100644 include/grlib/apbuart.h
create mode 100644 include/grlib/gptimer.h
create mode 100644 include/grlib/greth.h
create mode 100644 include/grlib/irqmp.h
diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c
index bc7e493..fd3e757 100644
--- a/arch/sparc/cpu/leon3/cpu_init.c
+++ b/arch/sparc/cpu/leon3/cpu_init.c
@@ -28,6 +28,8 @@
#include asm/asi.h
#include asm/leon.h
#include ambapp.h
+#include grlib/irqmp.h
+#include grlib/gptimer.h
#include config.h
@@ -41,11 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
/* reset CPU (jump to 0, without reset) */
void start(void);
-/* find initialize the memory controller */
-int init_memory_ctrl(void);
-
ambapp_dev_irqmp *irqmp = NULL;
-ambapp_dev_mctrl memctrl;
ambapp_dev_gptimer *gptimer = NULL;
unsigned int gptimer_irq = 0;
int leon3_snooping_avail = 0;
@@ -164,8 +162,8 @@ int timer_interrupt_init_cpu(void)
gptimer-e[0].val = 0;
gptimer-e[0].rld = 999;/* (((100 / 100) - 1)) */
gptimer-e[0].ctrl =
- (LEON3_GPTIMER_EN |
-LEON3_GPTIMER_RL | LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN);
+ (GPTIMER_CTRL_EN | GPTIMER_CTRL_RS |
+GPTIMER_CTRL_LD | GPTIMER_CTRL_IE);
return gptimer_irq;
}
diff --git a/arch/sparc/cpu/leon3/interrupts.c
b/arch/sparc/cpu/leon3/interrupts.c
index ac6aca5..d927de1 100644
--- a/arch/sparc/cpu/leon3/interrupts.c
+++ b/arch/sparc/cpu/leon3/interrupts.c
@@ -39,6 +39,8 @@
#include asm/leon.h
#include ambapp.h
+#include grlib/irqmp.h
+#include grlib/gptimer.h
/* 15 normal irqs and a non maskable interrupt */
#define NR_IRQS 15
@@ -141,9 +143,8 @@ int interrupt_init_cpu(void)
/* Handle Timer 0 IRQ */
void timer_interrupt_cpu(void *arg)
{
- gptimer-e[0].ctrl = (LEON3_GPTIMER_EN |
- LEON3_GPTIMER_RL |
- LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN);
+ gptimer-e[0].ctrl = (GPTIMER_CTRL_EN | GPTIMER_CTRL_RS |
+ GPTIMER_CTRL_LD | GPTIMER_CTRL_IE);
/* nothing to do here */
return;
}
diff --git a/arch/sparc/cpu/leon3/memcfg.h b/arch/sparc/cpu/leon3/memcfg.h
index 0b4738e..02086ce 100644
--- a/arch/sparc/cpu/leon3/memcfg.h
+++ b/arch/sparc/cpu/leon3/memcfg.h
@@ -54,7 +54,6 @@ extern struct grlib_mctrl_handler grlib_mctrl_handlers[];
#define MH_STRUCT_SIZE (4*4)
#define MH_TYPE0x00
#define MH_INDEX 0x01
-#define MH_UNUSED 0x02
#define MH_VENDOR_DEVICE 0x04
#define MH_FUNC0x08
#define MH_PRIV0x0c
diff --git a/arch/sparc/cpu/leon3/prom.c b/arch/sparc/cpu/leon3/prom.c
index 18d2fb2..86376bb 100644
--- a/arch/sparc/cpu/leon3/prom.c
+++ b/arch/sparc/cpu/leon3/prom.c
@@ -32,6 +32,9 @@
#include asm/irq.h
#include asm/leon.h
#include ambapp.h
+#include grlib/apbuart.h
+#include grlib/irqmp.h
+#include grlib/gptimer.h
#include config.h
/*
@@ -757,14 +760,14 @@ static int PROM_TEXT leon_nbputchar(int c)
/* Wait for last character to go. */
while (!(SPARC_BYPASS_READ(uart-status)
- LEON_REG_UART_STATUS_THE)) ;
+ APBUART_STATUS_THE)) ;
/* Send data */
SPARC_BYPASS_WRITE(uart-data, c);
/* Wait for data to be sent */
while (!(SPARC_BYPASS_READ(uart-status)
- LEON_REG_UART_STATUS_TSE)) ;
+ APBUART_STATUS_TSE)) ;
return 0;
}
diff --git a/arch/sparc/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c
index 15c380e..8964310 100644
--- a/arch/sparc/cpu/leon3/serial.c
+++ b/arch/sparc/cpu/leon3/serial.c
@@ -27,6 +27,7 @@
#include asm/processor.h
#include asm/leon.h
#include ambapp.h
+#include grlib/apbuart.h
DECLARE_GLOBAL_DATA_PTR;
@@ -69,9 +70,9 @@ int serial_init(void)
/* Let bit 11 be unchanged (debug bit for GRMON) */
tmp = READ_WORD(leon3_apbuart-ctrl);
- leon3_apbuart-ctrl = ((tmp LEON_REG_UART_CTRL_DBG) |
- LEON_REG_UART_CTRL_RE |
- LEON_REG_UART_CTRL_TE);
+ leon3_apbuart-ctrl = ((tmp APBUART_CTRL_DBG) |
+
[U-Boot] [PATCH 06/17] LEON3: Moved GRLIB core header files to common include/grlib directory
Signed-off-by: Daniel Hellstrom dan...@gaisler.com
---
cpu/leon3/cpu_init.c| 10 ++--
cpu/leon3/interrupts.c |7 ++-
cpu/leon3/memcfg.h |1 -
cpu/leon3/prom.c|7 ++-
cpu/leon3/serial.c | 16 +++---
drivers/net/greth.c |2 +-
include/ambapp.h| 137 ---
include/grlib/apbuart.h | 63 +
include/grlib/gptimer.h | 50 +
include/grlib/greth.h | 103 +++
include/grlib/irqmp.h | 39 +
11 files changed, 277 insertions(+), 158 deletions(-)
create mode 100644 include/grlib/apbuart.h
create mode 100644 include/grlib/gptimer.h
create mode 100644 include/grlib/greth.h
create mode 100644 include/grlib/irqmp.h
diff --git a/cpu/leon3/cpu_init.c b/cpu/leon3/cpu_init.c
index 046cfb8..e2e1181 100644
--- a/cpu/leon3/cpu_init.c
+++ b/cpu/leon3/cpu_init.c
@@ -28,6 +28,8 @@
#include asm/asi.h
#include asm/leon.h
#include ambapp.h
+#include grlib/irqmp.h
+#include grlib/gptimer.h
#include config.h
@@ -41,11 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
/* reset CPU (jump to 0, without reset) */
void start(void);
-/* find initialize the memory controller */
-int init_memory_ctrl(void);
-
ambapp_dev_irqmp *irqmp = NULL;
-ambapp_dev_mctrl memctrl;
ambapp_dev_gptimer *gptimer = NULL;
unsigned int gptimer_irq = 0;
int leon3_snooping_avail = 0;
@@ -164,8 +162,8 @@ int timer_interrupt_init_cpu(void)
gptimer-e[0].val = 0;
gptimer-e[0].rld = 999;/* (((100 / 100) - 1)) */
gptimer-e[0].ctrl =
- (LEON3_GPTIMER_EN |
-LEON3_GPTIMER_RL | LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN);
+ (GPTIMER_CTRL_EN | GPTIMER_CTRL_RS |
+GPTIMER_CTRL_LD | GPTIMER_CTRL_IE);
return gptimer_irq;
}
diff --git a/cpu/leon3/interrupts.c b/cpu/leon3/interrupts.c
index ac6aca5..d927de1 100644
--- a/cpu/leon3/interrupts.c
+++ b/cpu/leon3/interrupts.c
@@ -39,6 +39,8 @@
#include asm/leon.h
#include ambapp.h
+#include grlib/irqmp.h
+#include grlib/gptimer.h
/* 15 normal irqs and a non maskable interrupt */
#define NR_IRQS 15
@@ -141,9 +143,8 @@ int interrupt_init_cpu(void)
/* Handle Timer 0 IRQ */
void timer_interrupt_cpu(void *arg)
{
- gptimer-e[0].ctrl = (LEON3_GPTIMER_EN |
- LEON3_GPTIMER_RL |
- LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN);
+ gptimer-e[0].ctrl = (GPTIMER_CTRL_EN | GPTIMER_CTRL_RS |
+ GPTIMER_CTRL_LD | GPTIMER_CTRL_IE);
/* nothing to do here */
return;
}
diff --git a/cpu/leon3/memcfg.h b/cpu/leon3/memcfg.h
index 0b4738e..02086ce 100644
--- a/cpu/leon3/memcfg.h
+++ b/cpu/leon3/memcfg.h
@@ -54,7 +54,6 @@ extern struct grlib_mctrl_handler grlib_mctrl_handlers[];
#define MH_STRUCT_SIZE (4*4)
#define MH_TYPE0x00
#define MH_INDEX 0x01
-#define MH_UNUSED 0x02
#define MH_VENDOR_DEVICE 0x04
#define MH_FUNC0x08
#define MH_PRIV0x0c
diff --git a/cpu/leon3/prom.c b/cpu/leon3/prom.c
index 18d2fb2..86376bb 100644
--- a/cpu/leon3/prom.c
+++ b/cpu/leon3/prom.c
@@ -32,6 +32,9 @@
#include asm/irq.h
#include asm/leon.h
#include ambapp.h
+#include grlib/apbuart.h
+#include grlib/irqmp.h
+#include grlib/gptimer.h
#include config.h
/*
@@ -757,14 +760,14 @@ static int PROM_TEXT leon_nbputchar(int c)
/* Wait for last character to go. */
while (!(SPARC_BYPASS_READ(uart-status)
- LEON_REG_UART_STATUS_THE)) ;
+ APBUART_STATUS_THE)) ;
/* Send data */
SPARC_BYPASS_WRITE(uart-data, c);
/* Wait for data to be sent */
while (!(SPARC_BYPASS_READ(uart-status)
- LEON_REG_UART_STATUS_TSE)) ;
+ APBUART_STATUS_TSE)) ;
return 0;
}
diff --git a/cpu/leon3/serial.c b/cpu/leon3/serial.c
index 15c380e..8964310 100644
--- a/cpu/leon3/serial.c
+++ b/cpu/leon3/serial.c
@@ -27,6 +27,7 @@
#include asm/processor.h
#include asm/leon.h
#include ambapp.h
+#include grlib/apbuart.h
DECLARE_GLOBAL_DATA_PTR;
@@ -69,9 +70,9 @@ int serial_init(void)
/* Let bit 11 be unchanged (debug bit for GRMON) */
tmp = READ_WORD(leon3_apbuart-ctrl);
- leon3_apbuart-ctrl = ((tmp LEON_REG_UART_CTRL_DBG) |
- LEON_REG_UART_CTRL_RE |
- LEON_REG_UART_CTRL_TE);
+ leon3_apbuart-ctrl = ((tmp APBUART_CTRL_DBG) |
+ APBUART_CTRL_RE |
+ APBUART_CTRL_TE);
return 0;
}
@@ -92,14 +93,14 @@ void serial_putc_raw(const char c)
return;
/* Wait for last character to go. */
- while (!(READ_WORD(leon3_apbuart-status)
