diff --git a/[refs] b/[refs] index bd21b0aae231..4b85e2175f02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f82f16d2f55a68a5134e26edbc9303fe8048764f +refs/heads/master: 3003668ce422a00952e20e230fe09e3c2662cf25 diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index f9f6f6971b7e..7e3a24c60771 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -404,8 +404,9 @@ config ROM_BASE hex "Kernel ROM Base" depends on ROMKERNEL default "0x20040040" - range 0x20000000 0x20400000 if !(BF54x || BF561) + range 0x20000000 0x20400000 if !(BF54x || BF561 || BF60x) range 0x20000000 0x30000000 if (BF54x || BF561) + range 0xB0000000 0xC0000000 if (BF60x) help Make sure your ROM base does not include any file-header information that is prepended to the kernel.