From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Quadros Date: Wed, 5 Nov 2014 16:25:55 +0200 Subject: [U-Boot] [u-boot][PATCH] omap3_beagle: Fix device tree boot In-Reply-To: <20141105141800.GD15133@bill-the-cat> References: <1415195854-5753-1-git-send-email-rogerq@ti.com> <20141105141800.GD15133@bill-the-cat> Message-ID: <545A3373.5060202@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 11/05/2014 04:18 PM, Tom Rini wrote: > On Wed, Nov 05, 2014 at 03:57:34PM +0200, Roger Quadros wrote: > >> Push the device tree blob load address (fdtaddr) further apart than >> kernel load address (loadaddr) to accomodate a larger kernel image. >> We set fdtaddr to the same value as set in ti_armv7_common.h. >> >> With this change, I'm able to boot linux-3.18-rc1 zImage built using >> omap2plus_defconfig. >> >> Signed-off-by: Roger Quadros >> --- >> include/configs/omap3_beagle.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h >> index f25a940..5ea048a 100644 >> --- a/include/configs/omap3_beagle.h >> +++ b/include/configs/omap3_beagle.h >> @@ -132,7 +132,7 @@ >> "loadaddr=0x80200000\0" \ >> "rdaddr=0x81000000\0" \ >> "fdt_high=0xffffffff\0" \ >> - "fdtaddr=0x80f80000\0" \ >> + "fdtaddr=0x88000000\0" \ > > While we're in here whacking these values lets make this match up the > rest of the values we use in ti_armv7_common.h (so drop fdt_high and set > bootm_size and so forth). Thanks! > It seems like omap3_beagle.h includes ti_omap3_common.h which in turn includes ti_armv7_common.h. So I just need to remove the duplicate definitions from omap3_beagle.h cheers, -roger