Merge branch 'elf_reloc'

[oweals/u-boot.git] / board / amcc / bamboo / flash.c

diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c
index 001348ac5c9dce0bcccaad13624faa389843eddd..07d185fd2f4bc8602e1d2ef15baa98c843dd9da2 100644 (file)
--- a/board/amcc/bamboo/flash.c
+++ b/board/amcc/bamboo/flash.c
@@ -32,9 +32,9 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include "bamboo.h"
 
 #undef DEBUG
@@ -86,7 +86,7 @@ unsigned long flash_init(void)
        unsigned long ebc_boot_size;
        unsigned long boot_selection;
 
-       mfsdr(sdr_pstrp0, val);
+       mfsdr(SDR0_PINSTP, val);
        index = (val & SDR0_PSTRP0_BOOTSTRAP_MASK) >> 29;
 
        if ((index == 5) || (index == 7)) {
@@ -94,7 +94,7 @@ unsigned long flash_init(void)
                 * Boot Settings in IIC EEprom address 0xA8 or 0xA4
                 * Read Serial Device Strap Register1 in PPC440EP
                 */
-               mfsdr(sdr_sdstp1, val);
+               mfsdr(SDR0_SDSTP1, val);
                boot_selection  = val & SDR0_SDSTP1_BOOT_SEL_MASK;
                ebc_boot_size   = val & SDR0_SDSTP1_EBC_ROM_BS_MASK;