diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:16:49 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:16:49 -0600 |
commit | b0a41a11845259ad88897cbcf7d0d7ceb2e70844 (patch) | |
tree | 0e2f2244762b91e517a540b361cba7cc41c0b5a8 /board/freescale | |
parent | 59e7965922b683a5aca44ff294d95b206d5bc58a (diff) | |
parent | 9f23ca334a6f5f021ef9e9d0fad9da80d63b2d56 (diff) | |
download | u-boot-imx-b0a41a11845259ad88897cbcf7d0d7ceb2e70844.zip u-boot-imx-b0a41a11845259ad88897cbcf7d0d7ceb2e70844.tar.gz u-boot-imx-b0a41a11845259ad88897cbcf7d0d7ceb2e70844.tar.bz2 |
Merge branch 'for-1.3.0'
Diffstat (limited to 'board/freescale')
-rw-r--r-- | board/freescale/common/pixis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index fd99a93..45dcf4d 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -207,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); } |