Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unify timer_init() and cpu_init() prototypes

Browse source 
Clean up some duplicated prototype declarations.
Get rid of now useless AVR32 initcalls.h file.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert Aribaud <albert.aribaud@free.fr>
Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Cc: Graeme Russ <graeme.russ@gmail.com>
This commit is contained in:
Wolfgang Denk 2011-07-30 12:32:45 +00:00
parent 5589073a16
commit f6c019c454
5 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/include/asm/u-boot-arm.h
View file

@ -63,7 +63,4 @@ void reset_timer_masked (void);
ulong get_timer_masked (void); ulong get_timer_masked (void);
void udelay_masked (unsigned long usec); void udelay_masked (unsigned long usec);
/* cpu/.../timer.c */
int timer_init (void);
#endif /* _U_BOOT_ARM_H_ */ #endif /* _U_BOOT_ARM_H_ */

30
arch/avr32/include/asm/initcalls.h
View file

@ -1,30 +0,0 @@
/*
* Copyright (C) 2005, 2006 Atmel Corporation
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __ASM_AVR32_INITCALLS_H__
#define __ASM_AVR32_INITCALLS_H__
#include <config.h>
extern int cpu_init(void);
extern int timer_init(void);
#endif /* __ASM_AVR32_INITCALLS_H__ */

1
arch/avr32/lib/board.c
View file

@ -30,7 +30,6 @@
#include <miiphy.h> #include <miiphy.h>
#endif #endif
#include <asm/initcalls.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/arch/mmu.h> #include <asm/arch/mmu.h>

1
arch/x86/include/asm/u-boot-x86.h
View file

@ -36,7 +36,6 @@ typedef void (timer_fnc_t) (void);
int register_timer_isr (timer_fnc_t *isr_func); int register_timer_isr (timer_fnc_t *isr_func);
/* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */ /* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */
int timer_init(void);
int dram_init_f(void); int dram_init_f(void);
/* cpu/.../interrupts.c */ /* cpu/.../interrupts.c */

3
include/common.h
View file

@ -222,6 +222,9 @@ typedef void (interrupt_handler_t)(void *);
void hang (void) __attribute__ ((noreturn)); void hang (void) __attribute__ ((noreturn));
int timer_init(void);
int cpu_init(void);
/* */ /* */
phys_size_t initdram (int); phys_size_t initdram (int);
int display_options (void); int display_options (void);