diff options
author | Michael Brandt <michael.brandt@stericsson.com> | 2010-11-22 16:30:05 +0100 |
---|---|---|
committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-11-23 09:20:10 +0100 |
commit | 8a81734f8320002a727c5c3280e8159aa3c51c04 (patch) | |
tree | 8ad606b16c32045d4e469307e65db79989c4dfa8 /board | |
parent | 4fb4da50ecea90b14994272b6d78cffe003a3a87 (diff) |
U8500: config: removed non-applicable and unused defines
Some defines were inherited from the old U-Boot 1.3.1 and are not used
anywhere. This patch removes them.
As a side-effect the flash.c dummy was also removed.
Change-Id: Iecddb2f8bb59d909b936254085c358a1d246d205
Signed-off-by: Michael Brandt <michael.brandt@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9203
Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
Reviewed-by: Robert ROSENGREN <robert.rosengren@stericsson.com>
Diffstat (limited to 'board')
-rw-r--r-- | board/st/u8500/Makefile | 2 | ||||
-rwxr-xr-x | board/st/u8500/flash.c | 108 |
2 files changed, 1 insertions, 109 deletions
diff --git a/board/st/u8500/Makefile b/board/st/u8500/Makefile index d57e4bcd2..324a973d3 100644 --- a/board/st/u8500/Makefile +++ b/board/st/u8500/Makefile @@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := u8500.o flash.o gpio.o u8500_i2c.o mmc_host.o mmc_utils.o clock.o prcmu.o mcde_display.o mcde_hw.o ab8500vibra.o cmd_cdump.o +COBJS := u8500.o gpio.o u8500_i2c.o mmc_host.o mmc_utils.o clock.o prcmu.o mcde_display.o mcde_hw.o ab8500vibra.o cmd_cdump.o SOBJS := mmc_fifo.o COBJS-$(CONFIG_ITP_LOAD) += itp.o cspsa_fp.o diff --git a/board/st/u8500/flash.c b/board/st/u8500/flash.c deleted file mode 100755 index e44f9ef32..000000000 --- a/board/st/u8500/flash.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2009 - * - * 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 - */ - -/* Support for ST NOR flash M30L0R7KB02AQ and M30L0R7KT02AQ */ - -#include <common.h> -#include <linux/byteorder/swab.h> - -#undef DEBUG_FLASH -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ - -/* Board support for 1 or 2 flash devices */ -#undef FLASH_PORT_WIDTH32 -#define FLASH_PORT_WIDTH16 - -#ifdef FLASH_PORT_WIDTH16 -#define FLASH_PORT_WIDTH ushort -#define FLASH_PORT_WIDTHV vu_short -#define SWAP(x) __swab16(x) -#else -#define FLASH_PORT_WIDTH ulong -#define FLASH_PORT_WIDTHV vu_long -#define SWAP(x) __swab32(x) -#endif - -#define FPW FLASH_PORT_WIDTH -#define FPWV FLASH_PORT_WIDTHV - -/*----------------------------------------------------------------------- - * Functions - */ -unsigned long flash_init(void); -/*static ulong flash_get_size(FPW * addr, flash_info_t * info); -static int write_data(flash_info_t * info, ulong dest, FPW data); -static void flash_get_offsets(ulong base, flash_info_t * info);*/ -void inline spin_wheel(void); -void flash_print_info(flash_info_t * info); -void flash_unprotect_sectors(FPWV * addr); -int flash_erase(flash_info_t * info, int s_first, int s_last); -int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt); - -/*----------------------------------------------------------------------- - */ - -unsigned long flash_init(void) -{ - ulong size = 0; - return size; -} - -/*----------------------------------------------------------------------- - */ -void flash_print_info(flash_info_t * info) -{ -} - -/* unprotects a sector for write and erase - * on some intel parts, this unprotects the entire chip, but it - * wont hurt to call this additional times per sector... - */ -void flash_unprotect_sectors(FPWV * addr) -{ - return; -} - -/*----------------------------------------------------------------------- - */ - -int flash_erase(flash_info_t * info, int s_first, int s_last) -{ - return 0; -} - -/*----------------------------------------------------------------------- - * Copy memory to flash, returns: - * 0 - OK - * 1 - write timeout - * 2 - Flash not erased - * 4 - Flash not identified - */ - -int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) -{ - return 0; -} - -void inline spin_wheel(void) -{ -} |