Merge commit 'u-boot/master' into for-1.3.1

[platform/kernel/u-boot.git] / board / freescale / common / pixis.c

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index ae4bef1..45dcf4d 100644 (file)
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -25,10 +25,9 @@
 #include <common.h>
 #include <command.h>
 #include <watchdog.h>
-#include <asm/cache.h>
 
 #ifdef CONFIG_FSL_PIXIS
-
+#include <asm/cache.h>
 #include "pixis.h"
 
 
@@ -208,13 +207,16 @@ void read_from_px_regs_altbank(int set)
        out8(PIXIS_BASE + PIXIS_VCFGEN1, tmp);
 }
 
+#ifndef CFG_PIXIS_VBOOT_MASK
+#define CFG_PIXIS_VBOOT_MASK   0x40
+#endif
 
 void set_altbank(void)
 {
        u8 tmp;
 
        tmp = in8(PIXIS_BASE + PIXIS_VBOOT);
-       tmp ^= 0x40;
+       tmp ^= CFG_PIXIS_VBOOT_MASK;
 
        out8(PIXIS_BASE + PIXIS_VBOOT, tmp);
 }