Ver código fonte

refresh patches so they apply cleanly

SVN-Revision: 33406
Florian Fainelli 13 anos atrás
pai
commit
39ddc9105c

+ 1 - 1
target/linux/leon/patches/001-find_irq_and_timer_via_of.patch

@@ -45,4 +45,4 @@ Signed-off-by: Daniel Hellstrom <[email protected]>
 +	if (leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq) {
  		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
  		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
- 				      (((1000000 / 100) - 1)));
+ 				      (((1000000 / HZ) - 1)));

+ 4 - 3
target/linux/leon/patches/007-amp_timer.patch

@@ -66,10 +66,11 @@ Signed-off-by: Daniel Hellstrom <[email protected]>
  	if (leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq) {
 -		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
 -		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
+-				      (((1000000 / HZ) - 1)));
+-		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);
 +		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].val, 0);
 +		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].rld,
- 				      (((1000000 / 100) - 1)));
--		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);
++				      (((1000000 / 100) - 1)));
 +		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl, 0);
  
  #ifdef CONFIG_SMP
@@ -84,7 +85,7 @@ Signed-off-by: Daniel Hellstrom <[email protected]>
  		}
  
 -		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0);
--		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/100) - 1)));
+-		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/HZ) - 1)));
 -		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);
 +		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].val, 0);
 +		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld, (((1000000/100) - 1)));