Merge ../linus

[linux-drm-fsl-dcu.git] / arch / m68knommu / platform / 68360 / head-ram.S

diff --git a/arch/m68knommu/platform/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S
index 2ea51479f13a4b23d14c44bacbec4791e7bfc294..2ef06242398bf8bbad01b207f6436ff38cfe6ddb 100644 (file)
--- a/arch/m68knommu/platform/68360/head-ram.S
+++ b/arch/m68knommu/platform/68360/head-ram.S
@@ -25,6 +25,7 @@
 .global _periph_base
 
 #define        RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)
+#define        ROMEND                      (CONFIG_ROMBASE + CONFIG_ROMSIZE)
 
 #define REGB                        0x1000
 #define PEPAR                       (_dprbase + REGB + 0x0016)
@@ -175,7 +176,7 @@ configure_chip_select_0:
        move.l  %d0, BR0
 
 configure_chip_select_1:
-       move.l  #__rom_end, %d0
+       move.l  #ROMEND, %d0
        subi.l  #__rom_start, %d0
        subq.l  #0x01, %d0
        eori.l  #SIM_OR_MASK, %d0