Skip to contentSkip to conversation

omap3_beagle: Fix device tree boot

PATCH New Roger Quadros 2 participants 3 messages Mar 6, 2015 – Mar 9, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omap3_beagle: Fix device tree boot

Don't redefine fdtaddr and other values that are already defined in ti_armv7_common.h. The value of fdtaddr in ti_armv7_common.h is more appropriate as it allows a larger kernel image to be loaded.

With this change, I'm able to boot linux-4.0-rc1 with device tree blob.

---
 include/configs/omap3_beagle.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/configs/omap3_beagle.h +1 -3
index f25a940..3ea9b08 100644
@@ -129,10 +129,8 @@
 							/* devices */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=0x80200000\0" \
-	"rdaddr=0x81000000\0" \
+	DEFAULT_LINUX_BOOT_ENV \
 	"fdt_high=0xffffffff\0" \
-	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 omap3_beagle: Fix device tree boot

Quoted 17 lines · Roger Quadros

Don't redefine fdtaddr and other values that are already defined in ti_armv7_common.h. The value of fdtaddr in ti_armv7_common.h is more appropriate as it allows a larger kernel image to be loaded.

With this change, I'm able to boot linux-4.0-rc1 with device tree blob.

---
 include/configs/omap3_beagle.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/configs/omap3_beagle.h +0 -0
index f25a940..3ea9b08 100644
@@ -129,10 +129,8 @@
 							/* devices */

include/configs/omap3_beagle.h line 136

Quoted 10 lines
include/configs/omap3_beagle.h +1 -3
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=0x80200000\0" \
-	"rdaddr=0x81000000\0" \
+	DEFAULT_LINUX_BOOT_ENV \
 	"fdt_high=0xffffffff\0" \
-	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

With DEFAULT_LINUX_BOOT_ENV the bootm_size variable makes sure that we relocate the DT within the area that the kernel will see and we don't need fdt_high being set either.

Signature · 1 line
Tom
#2 lore raw

PATCH 1/1 omap3_beagle: Fix device tree boot

Tom,

Quoted 20 lines · Tom Rini
Quoted 18 lines · Roger Quadros

Don't redefine fdtaddr and other values that are already defined in ti_armv7_common.h. The value of fdtaddr in ti_armv7_common.h is more appropriate as it allows a larger kernel image to be loaded.

With this change, I'm able to boot linux-4.0-rc1 with device tree blob.

---
 include/configs/omap3_beagle.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/configs/omap3_beagle.h +0 -0
index f25a940..3ea9b08 100644
@@ -129,10 +129,8 @@
 							/* devices */
 
Quoted 14 lines

include/configs/omap3_beagle.h line 136

Quoted 9 lines
include/configs/omap3_beagle.h +1 -3
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=0x80200000\0" \
-	"rdaddr=0x81000000\0" \
+	DEFAULT_LINUX_BOOT_ENV \
 	"fdt_high=0xffffffff\0" \
-	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

With DEFAULT_LINUX_BOOT_ENV the bootm_size variable makes sure that we relocate the DT within the area that the kernel will see and we don't need fdt_high being set either.

I tried without fdt_high and the board wasn't booting. So we're still missing something for the omap3_beagle w.r.t that.
Any clues?

cheers,
-roger