diff options
| author | Stephan Linz <linz@li-pro.net> | 2012-06-27 00:28:25 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-06-27 10:18:20 +0200 |
| commit | 1fe7e8fa48931898ef2e35a913f56cef02f327a4 (patch) | |
| tree | fe462397b42a1d9b1dfb5746076dd419ec037e5d /include/configs/microblaze-generic.h | |
| parent | 2629d63efc2ed9c6a02dd6605a0a5cb62f4e278d (diff) | |
| download | blackbird-obmc-uboot-1fe7e8fa48931898ef2e35a913f56cef02f327a4.tar.gz blackbird-obmc-uboot-1fe7e8fa48931898ef2e35a913f56cef02f327a4.zip | |
microblaze: Avoid compile error on systems without cfi flash
Use XILINX_FLASH_START to set/unset FLASH and RAMENV.
Error:
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 <linz@li-pro.net>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'include/configs/microblaze-generic.h')
| -rw-r--r-- | include/configs/microblaze-generic.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 5f16820218..2ef7d6257e 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 |
