In message 1212325908-7969-1-git-send-email-vapier@gentoo.org you wrote:
Some of the flash defines weren't in the correct location and caused build problems in some configurations, so let's move types and defines to better local locations.
Signed-off-by: Mike Frysinger vapier@gentoo.org
board/bf533-ezkit/bf533-ezkit.c | 25 ++++--------------------- board/bf533-ezkit/flash-defines.h | 26 ++++---------------------- board/bf533-ezkit/flash.c | 24 ++++++------------------ 3 files changed, 14 insertions(+), 61 deletions(-)
diff --git a/board/bf533-ezkit/bf533-ezkit.c b/board/bf533-ezkit/bf533-ezkit.c index 738f69c..b039811 100644 --- a/board/bf533-ezkit/bf533-ezkit.c +++ b/board/bf533-ezkit/bf533-ezkit.c @@ -1,34 +1,17 @@ /*
- U-boot - ezkit533.c
- U-Boot - bf533-ezkit.c
- Copyright (c) 2005-2007 Analog Devices Inc.
- Copyright (c) 2005-2008 Analog Devices Inc.
- (C) Copyright 2000-2004
- Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- 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., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301 USA
*/
- Licensed under the GPL-2 or later.
#include <common.h> -#if defined(CONFIG_MISC_INIT_R) #include "psd4256.h" -#endif +#include "flash-defines.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bf533-ezkit/flash-defines.h b/board/bf533-ezkit/flash-defines.h index 4e043e0..bb69fa8 100644 --- a/board/bf533-ezkit/flash-defines.h +++ b/board/bf533-ezkit/flash-defines.h @@ -1,28 +1,12 @@ /*
- U-boot - flash-defines.h
- U-Boot - flash-defines.h
- Copyright (c) 2005-2007 Analog Devices Inc.
- Copyright (c) 2005-2008 Analog Devices Inc.
- (C) Copyright 2000-2004
- Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- 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., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301 USA
*/
- Licensed under the GPL-2 or later.
Please STOP messing with license headers.
I will reject all such edits.
#ifndef __FLASHDEFINES_H__ @@ -50,6 +34,7 @@ #define FLASH_SIZE 0x220000 #define FLASH_MAN_ST 2 #define CFG_FLASH0_BASE 0x20000000 +#define CFG_FLASH1_BASE 0x20200000 #define RESET_VAL 0xF0
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; @@ -68,9 +53,6 @@ int write_flash(long nOffset, int nValue); void get_sector_number(long lOffset, int *pnSector); int GetSectorProtectionStatus(flash_info_t * info, int nSector); int GetOffset(int nBlock); -int AFP_NumSectors = 40; -long AFP_SectorSize1 = 0x10000; -int AFP_SectorSize2 = 0x4000;
#define WRITESEQ1 0x0AAA #define WRITESEQ2 0x0554 diff --git a/board/bf533-ezkit/flash.c b/board/bf533-ezkit/flash.c index cdf4dc6..ba75d99 100644 --- a/board/bf533-ezkit/flash.c +++ b/board/bf533-ezkit/flash.c @@ -1,34 +1,22 @@ /*
- U-boot - flash.c Flash driver for PSD4256GV
- Copyright (c) 2005-2007 Analog Devices Inc.
- Copyright (c) 2005-2008 Analog Devices Inc.
- This file is based on BF533EzFlash.c originally written by Analog Devices, Inc.
- (C) Copyright 2000-2004
- Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- 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., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301 USA
*/
- Licensed under the GPL-2 or later.
Rejected.
Best regards,
Wolfgang Denk