From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Mon, 25 Jun 2012 06:55:28 +0200 Subject: [U-Boot] [PATCH 1/2] microblaze: avoid compile error on systems without cfi flash In-Reply-To: <1340307771-15204-1-git-send-email-linz@li-pro.net> References: <1340307771-15204-1-git-send-email-linz@li-pro.net> Message-ID: <4FE7EF40.7080004@monstr.eu> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 06/21/2012 09:42 PM, Stephan Linz wrote: > Use XILINX_FLASH_START to set/unset FLASH and RAMENV. > > Error was: > board.c: In function 'board_init': > board.c:134: error: 'XILINX_FLASH_START' undeclared (first use in this function) > board.c:134: error: (Each undeclared identifier is reported only once > board.c:134: error: for each function it appears in.) > > Signed-off-by: Stephan Linz > --- > include/configs/microblaze-generic.h | 14 +++++++++----- > 1 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h > index 295d123..2ef7d62 100644 > --- a/include/configs/microblaze-generic.h > +++ b/include/configs/microblaze-generic.h > @@ -31,6 +31,15 @@ > #define CONFIG_MICROBLAZE 1 > #define MICROBLAZE_V5 1 > > +/* linear flash memory */ > +#ifdef XILINX_FLASH_START > +#define FLASH > +#undef RAMENV /* hold environment in flash */ > +#else > +#undef FLASH > +#define RAMENV /* hold environment in RAM */ > +#endif > + > /* uart */ > #ifdef XILINX_UARTLITE_BASEADDR > # define CONFIG_XILINX_UARTLITE > @@ -164,9 +173,6 @@ > /* stack */ > #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE > > -/*#define RAMENV */ > -#define FLASH > - > #ifdef FLASH > # define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START > # define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE > @@ -200,8 +206,6 @@ > # define CONFIG_ENV_IS_NOWHERE 1 > # define CONFIG_ENV_SIZE 0x1000 > # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) > -/* hardware flash protection */ > -# define CONFIG_SYS_FLASH_PROTECTION What's wrong with hardware flash protection? Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian