From a8fab5078beb88a3f1ae46450d08d0db1460fccc Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 12 Jul 2012 09:55:58 +0200
Subject: [PATCH] OMAP: Provide reasonable kernel and initrd load addresses

To make our generic boot.scr approach work, we need to make sure we
have variables that tell us where to load the kernel and initrd to.

Add them back into upstream u-boot again. They used to be there in the
linaro version.

Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 0c46d5b..c4df587 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -218,6 +218,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"kerneladdr=0x80200000\0" \
+	"ramdiskaddr=0x81000000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage.beagle\0" \
 	"console=ttyO2,115200n8\0" \
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 00578fe..bc802f4 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -150,6 +150,8 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
+	"kerneladdr=0x80000000\0" \
+	"ramdiskaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \