diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/arm920t/s3c24x0/timer.c | 8 | ||||
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 3 | ||||
| -rw-r--r-- | arch/arm/lib/board.c | 16 | 
3 files changed, 1 insertions, 26 deletions
| diff --git a/arch/arm/cpu/arm920t/s3c24x0/timer.c b/arch/arm/cpu/arm920t/s3c24x0/timer.c index 8cf9ff6be..f17b7ea5a 100644 --- a/arch/arm/cpu/arm920t/s3c24x0/timer.c +++ b/arch/arm/cpu/arm920t/s3c24x0/timer.c @@ -177,7 +177,7 @@ ulong get_tbclk(void)  {  	ulong tbclk; -#if defined(CONFIG_SMDK2400) || defined(CONFIG_TRAB) +#if defined(CONFIG_SMDK2400)  	tbclk = timer_load_val * 100;  #elif defined(CONFIG_SBC2410X) || \        defined(CONFIG_SMDK2410) || \ @@ -198,12 +198,6 @@ void reset_cpu(ulong ignored)  {  	struct s3c24x0_watchdog *watchdog; -#ifdef CONFIG_TRAB -	extern void disable_vfd(void); - -	disable_vfd(); -#endif -  	watchdog = s3c24x0_get_base_watchdog();  	/* Disable watchdog */ diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 2a84d27a4..d4c9afcd0 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -41,9 +41,6 @@ typedef	struct	global_data {  	unsigned long	env_addr;	/* Address  of Environment struct */  	unsigned long	env_valid;	/* Checksum of Environment valid? */  	unsigned long	fb_base;	/* base address of frame buffer */ -#ifdef CONFIG_VFD -	unsigned char	vfd_type;	/* display type */ -#endif  #ifdef CONFIG_FSL_ESDHC  	unsigned long	sdhc_clk;  #endif diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 1a784a1e1..e7af3d223 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -344,17 +344,6 @@ void board_init_f (ulong bootflag)  	addr &= ~(4096 - 1);  	debug ("Top of RAM usable for U-Boot at: %08lx\n", addr); -#ifdef CONFIG_VFD -#	ifndef PAGE_SIZE -#	  define PAGE_SIZE 4096 -#	endif -	/* -	 * reserve memory for VFD display (always full pages) -	 */ -	addr -= vfd_setmem (addr); -	gd->fb_base = addr; -#endif /* CONFIG_VFD */ -  #ifdef CONFIG_LCD  #ifdef CONFIG_FB_ADDR  	gd->fb_base = CONFIG_FB_ADDR; @@ -533,11 +522,6 @@ void board_init_r (gd_t *id, ulong dest_addr)  	/* initialize environment */  	env_relocate (); -#ifdef CONFIG_VFD -	/* must do this after the framebuffer is allocated */ -	drv_vfd_init(); -#endif /* CONFIG_VFD */ -  	/* IP Address */  	gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); |