V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

microblaze: Remove !OF_CONTROL code for timer and interrupt 

OF_CONTROL is enabled by default that's why this is dead code.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2016-02-15 13:44:19 +01:00
parent 9aa65cab73
commit a359eaa598
4 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/microblaze/cpu/interrupts.c
View File

@ -115,8 +115,6 @@ static void intc_init(void)
int interrupt_init(void) int interrupt_init(void)
{ {
int i; int i;
#ifdef CONFIG_OF_CONTROL
const void *blob = gd->fdt_blob; const void *blob = gd->fdt_blob;
int node = 0; int node = 0;
@ -136,12 +134,7 @@ int interrupt_init(void)
} else { } else {
return node; return node;
} }
#else
#if defined(CONFIG_SYS_INTC_0_ADDR) && defined(CONFIG_SYS_INTC_0_NUM)
intc = (microblaze_intc_t *)CONFIG_SYS_INTC_0_ADDR;
irq_no = CONFIG_SYS_INTC_0_NUM;
#endif
#endif
if (irq_no) { if (irq_no) {
vecs = calloc(1, sizeof(struct irq_action) * irq_no); vecs = calloc(1, sizeof(struct irq_action) * irq_no);
if (vecs == NULL) { if (vecs == NULL) {

14
arch/microblaze/cpu/timer.c
View File

@ -31,11 +31,6 @@ void __udelay(unsigned long usec)
i = get_timer(0); i = get_timer(0);
while ((get_timer(0) - i) < (usec / 1000)) while ((get_timer(0) - i) < (usec / 1000))
; ;
} else {
#ifndef CONFIG_OF_CONTROL
for (i = 0; i < (usec * XILINX_CLOCK_FREQ / 10000000); i++)
;
#endif
} }
} }
@ -51,8 +46,6 @@ int timer_init (void)
int irq = -1; int irq = -1;
u32 preload = 0; u32 preload = 0;
u32 ret = 0; u32 ret = 0;
#ifdef CONFIG_OF_CONTROL
const void *blob = gd->fdt_blob; const void *blob = gd->fdt_blob;
int node = 0; int node = 0;
u32 cell[2]; u32 cell[2];
@ -83,13 +76,6 @@ int timer_init (void)
return node; return node;
} }
#else
#if defined(CONFIG_SYS_TIMER_0_ADDR) && defined(CONFIG_SYS_INTC_0_NUM)
preload = XILINX_CLOCK_FREQ / CONFIG_SYS_HZ;
irq = CONFIG_SYS_TIMER_0_IRQ;
tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);
#endif
#endif
if (tmr && preload && irq >= 0) { if (tmr && preload && irq >= 0) {
tmr->loadreg = preload; tmr->loadreg = preload;
tmr->control = TIMER_INTERRUPT | TIMER_RESET; tmr->control = TIMER_INTERRUPT | TIMER_RESET;

11
board/xilinx/microblaze-generic/xparameters.h
View File

@ -13,21 +13,10 @@
#define XILINX_BOARD_NAME microblaze-generic #define XILINX_BOARD_NAME microblaze-generic
/* System Clock Frequency */
#define XILINX_CLOCK_FREQ 100000000
/* Microblaze is microblaze_0 */ /* Microblaze is microblaze_0 */
#define XILINX_USE_MSR_INSTR 1 #define XILINX_USE_MSR_INSTR 1
#define XILINX_FSL_NUMBER 3 #define XILINX_FSL_NUMBER 3
/* Interrupt controller is opb_intc_0 */
#define XILINX_INTC_BASEADDR 0x41200000
#define XILINX_INTC_NUM_INTR_INPUTS 6
/* Timer pheriphery is opb_timer_1 */
#define XILINX_TIMER_BASEADDR 0x41c00000
#define XILINX_TIMER_IRQ 0
/* GPIO is LEDs_4Bit*/ /* GPIO is LEDs_4Bit*/
#define XILINX_GPIO_BASEADDR 0x40000000 #define XILINX_GPIO_BASEADDR 0x40000000

12
include/configs/microblaze-generic.h
View File

@ -47,18 +47,6 @@
#endif #endif
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
/* interrupt controller */
#ifdef XILINX_INTC_BASEADDR
# define CONFIG_SYS_INTC_0_ADDR XILINX_INTC_BASEADDR
# define CONFIG_SYS_INTC_0_NUM XILINX_INTC_NUM_INTR_INPUTS
#endif
/* timer */
#if defined(XILINX_TIMER_BASEADDR) && defined(XILINX_TIMER_IRQ)
# define CONFIG_SYS_TIMER_0_ADDR XILINX_TIMER_BASEADDR
# define CONFIG_SYS_TIMER_0_IRQ XILINX_TIMER_IRQ
#endif
/* watchdog */ /* watchdog */
#if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ) #if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ)
# define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR # define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR