svn_rev_025
remove get_tbclk from architectures other than powerpc
This commit is contained in:
parent
a575d64811
commit
d2bf9bf488
26
Makefile
26
Makefile
|
@ -424,10 +424,7 @@ scripts: scripts_basic include/config/auto.conf
|
|||
|
||||
# Objects we will link into vmlinux / subdirs we need to visit
|
||||
common-y := common/ drivers/ lib_generic/ net/
|
||||
#drivers-y := drivers/ sound/
|
||||
#net-y := net/
|
||||
#libs-y := lib/
|
||||
#core-y := usr/
|
||||
head-y := cpu/arm920t/start.o
|
||||
|
||||
ifeq ($(dot-config),1)
|
||||
# Read in config
|
||||
|
@ -527,12 +524,7 @@ mod_strip_cmd = true
|
|||
endif # INSTALL_MOD_STRIP
|
||||
export mod_strip_cmd
|
||||
|
||||
|
||||
#core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
|
||||
|
||||
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(common-y) $(common-m) \
|
||||
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
|
||||
$(net-y) $(net-m) $(libs-y) $(libs-m)))
|
||||
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(common-y)))
|
||||
|
||||
vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
|
||||
$(common-n) $(common-) \
|
||||
|
@ -540,12 +532,6 @@ vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
|
|||
$(net-n) $(net-) $(libs-n) $(libs-))))
|
||||
|
||||
common-y := $(patsubst %/, %/built-in.o, $(common-y))
|
||||
#core-y := $(patsubst %/, %/built-in.o, $(core-y))
|
||||
#drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y))
|
||||
#net-y := $(patsubst %/, %/built-in.o, $(net-y))
|
||||
libs-y1 := $(patsubst %/, %/lib.a, $(libs-y))
|
||||
libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y))
|
||||
libs-y := $(libs-y1) $(libs-y2)
|
||||
|
||||
# Build vmlinux
|
||||
# ---------------------------------------------------------------------------
|
||||
|
@ -576,9 +562,9 @@ libs-y := $(libs-y1) $(libs-y2)
|
|||
|
||||
vmlinux-init := $(head-y)
|
||||
vmlinux-common := $(common-y)
|
||||
vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y)
|
||||
vmlinux-all := $(vmlinux-common) $(vmlinux-main)
|
||||
vmlinux-all := $(vmlinux-init) $(vmlinux-common)
|
||||
vmlinux-lds := $(BOARD)/u-boot.lds
|
||||
export KBUILD_VMLINUX_OBJS := $(vmlinux-all)
|
||||
|
||||
# Rule to link vmlinux - also used during CONFIG_KALLSYMS
|
||||
# May be overridden by arch/$(ARCH)/Makefile
|
||||
|
@ -711,7 +697,7 @@ debug_kallsyms: .tmp_map$(last_kallsyms)
|
|||
endif # ifdef CONFIG_KALLSYMS
|
||||
|
||||
# vmlinux image - including updated kernel symbols
|
||||
vmlinux: $(vmlinux-lds) $(vmlinux-common) $(vmlinux-main) $(kallsyms.o) FORCE
|
||||
vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-common) $(kallsyms.o) FORCE
|
||||
ifdef CONFIG_HEADERS_CHECK
|
||||
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
|
||||
endif
|
||||
|
@ -720,7 +706,7 @@ endif
|
|||
|
||||
# The actual objects are generated when descending,
|
||||
# make sure no implicit rule kicks in
|
||||
$(sort $(vmlinux-common) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
|
||||
$(sort $(vmlinux-init) $(vmlinux-common) ) $(vmlinux-lds): $(vmlinux-dirs) ;
|
||||
|
||||
# Handle descending into subdirectories listed in $(vmlinux-dirs)
|
||||
# Preset locale variables to speed up the build process. Limit locale
|
||||
|
|
|
@ -73,8 +73,6 @@ static uint64_t endtime = 0; /* must be set, default is instant timeout */
|
|||
static int retry_time = -1; /* -1 so can call readline before main_loop */
|
||||
#endif
|
||||
|
||||
#define endtick(seconds) (get_ticks() + (uint64_t)(seconds) * get_tbclk())
|
||||
|
||||
#ifndef CONFIG_BOOT_RETRY_MIN
|
||||
#define CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME
|
||||
#endif
|
||||
|
@ -94,7 +92,8 @@ extern void mdm_init(void); /* defined in board.c */
|
|||
static __inline__ int abortboot(int bootdelay)
|
||||
{
|
||||
int abort = 0;
|
||||
uint64_t etime = endtick(bootdelay);
|
||||
ulong etime;
|
||||
|
||||
struct {
|
||||
char* str;
|
||||
u_int len;
|
||||
|
@ -160,7 +159,8 @@ static __inline__ int abortboot(int bootdelay)
|
|||
/* In order to keep up with incoming data, check timeout only
|
||||
* when catch up.
|
||||
*/
|
||||
while (!abort && get_ticks() <= etime) {
|
||||
etime = get_timer(0);
|
||||
while (!abort && get_timer(etime) <= bootdelay * CFG_HZ) {
|
||||
for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i ++) {
|
||||
if (delaykey[i].len > 0 &&
|
||||
presskey_len >= delaykey[i].len &&
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
obj-y += cpu.o interrupts.o
|
||||
head-y := cpu/arm920t/start.o
|
||||
head-y += start.o
|
||||
obj-y += imx/
|
|
@ -138,27 +138,6 @@ void udelay_masked (unsigned long usec)
|
|||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
||||
/*
|
||||
* Reset the cpu by setting up the watchdog timer and let him time out
|
||||
* or toggle a GPIO pin on the AT91RM9200DK board
|
||||
|
|
|
@ -95,28 +95,6 @@ void udelay (unsigned long usec)
|
|||
udelay_masked(usec);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
|
||||
return tbclk;
|
||||
}
|
||||
|
||||
/*
|
||||
* Reset the cpu by setting up the watchdog timer and let him time out
|
||||
*/
|
||||
|
|
|
@ -157,36 +157,6 @@ void udelay_masked (unsigned long usec)
|
|||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
#if defined(CONFIG_SMDK2400) || defined(CONFIG_TRAB)
|
||||
tbclk = timer_load_val * 100;
|
||||
#elif defined(CONFIG_SBC2410X) || \
|
||||
defined(CONFIG_SMDK2410) || \
|
||||
defined(CONFIG_VCMA9)
|
||||
tbclk = CFG_HZ;
|
||||
#else
|
||||
# error "tbclk not configured"
|
||||
#endif
|
||||
|
||||
return tbclk;
|
||||
}
|
||||
|
||||
/*
|
||||
* reset the cpu by setting up the watchdog timer and let him time out
|
||||
*/
|
||||
|
|
|
@ -295,24 +295,3 @@ void udelay_masked (unsigned long usec)
|
|||
} while (diff >= 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
|
|
@ -154,24 +154,3 @@ void udelay_masked (unsigned long usec)
|
|||
diff = endtime - now;
|
||||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
|
|
@ -152,24 +152,3 @@ void udelay_masked (unsigned long usec)
|
|||
diff = endtime - now;
|
||||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
|
|
@ -268,25 +268,4 @@ void udelay_masked (unsigned long usec)
|
|||
/*NOP*/;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_INTEGRATOR */
|
||||
|
|
|
@ -46,24 +46,6 @@ static unsigned long tb_factor;
|
|||
|
||||
static const struct device *intc_dev;
|
||||
|
||||
unsigned long get_tbclk(void)
|
||||
{
|
||||
return gd->cpu_hz;
|
||||
}
|
||||
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
unsigned long lo, hi_now, hi_prev;
|
||||
|
||||
do {
|
||||
hi_prev = timer_overflow;
|
||||
lo = sysreg_read(COUNT);
|
||||
hi_now = timer_overflow;
|
||||
} while (hi_prev != hi_now);
|
||||
|
||||
return ((unsigned long long)hi_now << 32) | lo;
|
||||
}
|
||||
|
||||
void reset_timer(void)
|
||||
{
|
||||
sysreg_write(COUNT, 0);
|
||||
|
|
|
@ -48,27 +48,6 @@ int irq_flags; /* needed by asm-blackfin/system.h */
|
|||
|
||||
/* Functions just to satisfy the linker */
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On BF533 it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On BF533 it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
||||
void enable_interrupts(void)
|
||||
{
|
||||
restore_flags(int_flag);
|
||||
|
|
|
@ -305,25 +305,3 @@ void udelay_masked (unsigned long usec)
|
|||
diff = endtime - now;
|
||||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = timer_load_val * 100;
|
||||
|
||||
return tbclk;
|
||||
}
|
||||
|
|
|
@ -209,23 +209,3 @@ void udelay_masked (unsigned long usec)
|
|||
diff = endtime - now;
|
||||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
|
|
@ -225,24 +225,3 @@ void udelay_masked (unsigned long usec)
|
|||
diff = endtime - now;
|
||||
} while (diff >= 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On ARM it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On ARM it returns the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk (void)
|
||||
{
|
||||
ulong tbclk;
|
||||
|
||||
tbclk = CFG_HZ;
|
||||
return tbclk;
|
||||
}
|
||||
|
|
|
@ -507,8 +507,8 @@ static void ns9750_link_auto_negotiate (void)
|
|||
|
||||
/* wait for completion */
|
||||
|
||||
ulStartJiffies = get_ticks ();
|
||||
while (get_ticks () < ulStartJiffies + NS9750_MII_NEG_DELAY) {
|
||||
ulStartJiffies = get_timer (0);
|
||||
while (get_timer (ulStartJiffies) < NS9750_MII_NEG_DELAY) {
|
||||
uiStatus = ns9750_mii_read (PHY_COMMON_STAT);
|
||||
if ((uiStatus &
|
||||
(PHY_COMMON_STAT_AN_COMP | PHY_COMMON_STAT_LNK_STAT)) ==
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
link asm-arm/
|
|
@ -0,0 +1 @@
|
|||
link arch-imx
|
|
@ -293,16 +293,6 @@ void set_timer (ulong t)
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On M68K it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return get_timer(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On M68K it returns the number of timer ticks per second.
|
||||
|
|
|
@ -80,15 +80,6 @@ void udelay (unsigned long usec)
|
|||
/*NOP*/;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (read timebase as long long).
|
||||
* On MIPS it just returns the timer value.
|
||||
*/
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return mips_count_get();
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is derived from PowerPC code (timebase clock frequency).
|
||||
* On MIPS it returns the number of timer ticks per second.
|
||||
|
|
Loading…
Reference in New Issue