Skip to contentSkip to conversation

get rid of board/scb9328/flash.c

PATCH New Konstantin Kletschke 1 participant 1 message May 11, 2006 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 get rid of board/scb9328/flash.c

Hi Folks!

This Patch removes board/scb9328/flash.c in common of using the CFI flash driver with write buffering support enabled.

scb9328 is i.MX based.

Therefore include/configs/scb9328.h is cleaned up regarding flash stuff.

Additionally it fixes

ulong get_timer (ulong base)

in cpu/arm920t/imx/interrupts.c which seemed to be broken since it exists.
Current git tree "U-Boot 1.1.4-gd1dd22f9-dirty (May 11 2006 - 11:49:49)" reveals the following needs to be done:

- return get_timer_masked ();
+ return get_timer_masked () - base;

(included in patch).

Works fine here with intel K3 and intel J3 flashes of different sizes.

Regards, Konsti

Signature · 3 lines
GPG KeyID EF62FCEF
Fingerprint: 13C9 B16B 9844 EC15 CC2E  A080 1E69 3FDA EF62 FCEF
-------------- next part --------------
board/scb9328/Makefile +1 -1
index 5dc3fd4..498d9b8 100644
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= lib$(BOARD).a
 
-OBJS	:= scb9328.o flash.o
+OBJS	:= scb9328.o
 SOBJS	:= lowlevel_init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
board/scb9328/flash.c deleted +0 -321

321 lines not on this page · raw message

cpu/arm920t/imx/interrupts.c +1 -1
index 03ce06d..4a4be7f 100644
@@ -60,7 +60,7 @@ void reset_timer (void)
 
 ulong get_timer (ulong base)
 {
-	return get_timer_masked ();
+	return get_timer_masked () - base;
 }
 
 void set_timer (ulong t)
drivers/cfi_flash.c +0 -0
include/asm-arm/arch-imx/imx-regs.h +0 -0
include/bmp_logo.h +0 -0
include/configs/scb9328.h +10 -52

72 lines not on this page · raw message

-------------- next part --------------
* scb9328 uses CFI flash driver now,
board/scb9328/flash.c deleted

* fixed get_timer() in cpu/arm920t/imx/interrupts.c