diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /board/mbx8xx/csr.h | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'board/mbx8xx/csr.h')
| -rw-r--r-- | board/mbx8xx/csr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/mbx8xx/csr.h b/board/mbx8xx/csr.h index 832e924..d1a58b6 100644 --- a/board/mbx8xx/csr.h +++ b/board/mbx8xx/csr.h @@ -54,7 +54,7 @@ #define SR2_RDY 0x02 /* Flash programming status bit */ #define SR2_FT 0x01 /* Reserved for Factory test purposes */ -#define MBX_CSR1 (*((uchar *)CFG_CSR_BASE)) -#define MBX_CSR2 (*((uchar *)CFG_CSR_BASE + 1)) +#define MBX_CSR1 (*((uchar *)CONFIG_SYS_CSR_BASE)) +#define MBX_CSR2 (*((uchar *)CONFIG_SYS_CSR_BASE + 1)) #endif /* __csr_h */ |