Skip to contentSkip to conversation

ARM: OMAP4/5: Add support to boot with device tree as default

PATCH New Sricharan R 3 participants 19 messages Apr 1, 2013 – Apr 8, 2013

lore
Share & tools
lore
#0 lore raw

v4 cover ARM: OMAP4/5: Add support to boot with device tree as default

With the kernel moving all towards device tree, this series adds support to make the device tree boot as the default for OMAP4/5 platforms.

Nishanth Menon (1):
omap5: Allow use of a plain text env file

Sricharan R (4):
ARM: OMAP5: Rename omap5_evm to omap5_uevm
ARM: OMAP5: Set fdt_high to enable booting with Device tree
ARM: OMAP4/5: Change the default boot command to work with device
tree
ARM: OMAP4/5: Make bootz as the default boot command

 board/ti/{omap5_evm => omap5_uevm}/Makefile   |    0
 board/ti/{omap5_evm => omap5_uevm}/evm.c      |    0
 board/ti/{omap5_evm => omap5_uevm}/mux_data.h |    0
 boards.cfg                                    |    2 +-
 include/configs/omap4_common.h                |   22 +++++++++++++---
 include/configs/omap5_common.h                |   35 +++++++++++++++++++++----
 include/configs/{omap5_evm.h => omap5_uevm.h} |    0
 7 files changed, 50 insertions(+), 9 deletions(-)
 rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%)
 rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%)
 rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%)
 rename include/configs/{omap5_evm.h => omap5_uevm.h} (100%)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v4 1/5 ARM: OMAP5: Rename omap5_evm to omap5_uevm

The omap5-uevm is the reference board name for OMAP5 soc based platform. So rename it accordingly.

---
 board/ti/{omap5_evm => omap5_uevm}/Makefile   |    0
 board/ti/{omap5_evm => omap5_uevm}/evm.c      |    0
 board/ti/{omap5_evm => omap5_uevm}/mux_data.h |    0
 boards.cfg                                    |    2 +-
 include/configs/{omap5_evm.h => omap5_uevm.h} |    0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%)
 rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%)
 rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%)
 rename include/configs/{omap5_evm.h => omap5_uevm.h} (100%)
board/ti/omap5_uevm/Makefile renamed from board/ti/omap5_evm/Makefile +0 -0
similarity index 100%
rename from board/ti/omap5_evm/Makefile
rename to board/ti/omap5_uevm/Makefile
board/ti/omap5_uevm/evm.c renamed from board/ti/omap5_evm/evm.c +0 -0
similarity index 100%
rename from board/ti/omap5_evm/evm.c
rename to board/ti/omap5_uevm/evm.c
board/ti/omap5_uevm/mux_data.h renamed from board/ti/omap5_evm/mux_data.h +0 -0
similarity index 100%
rename from board/ti/omap5_evm/mux_data.h
rename to board/ti/omap5_uevm/mux_data.h
boards.cfg +1 -1
index ee68fdd..c9ad3ff 100644
@@ -291,7 +291,7 @@ twister                      arm         armv7       twister             technex
 nokia_rx51                   arm         armv7       rx51                nokia          omap3
 omap4_panda                  arm         armv7       panda               ti             omap4
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
-omap5_evm                    arm         armv7       omap5_evm           ti		omap5
+omap5_uevm                   arm         armv7       omap5_uevm          ti		omap5
 dra7xx_evm		     arm	 armv7	     dra7xx		 ti	        omap5
 s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
 smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
include/configs/omap5_uevm.h renamed from include/configs/omap5_evm.h +0 -0
similarity index 100%
rename from include/configs/omap5_evm.h
rename to include/configs/omap5_uevm.h
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v4 2/5 ARM: OMAP5: Set fdt_high to enable booting with Device tree

In reply to Sricharan R

While booting with dt blob, if fdt_high is not set to 0xffffffff, the dt blob gets relocated to a high ram address, which the kernel is not able to use without HIGHMEM.

So set it to 0xffffffff to avoid the issue.

---
 include/configs/omap5_common.h |    1 +
 1 file changed, 1 insertion(+)
include/configs/omap5_common.h +1 -0
index af97564..f0416df 100644
@@ -143,6 +143,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
+	"fdt_high=0xffffffff\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH v4 3/5 omap5: Allow use of a plain text env file

In reply to Sricharan R

From: Nishanth Menon <[email protected]>

For production systems it is better to use script images since they are protected by checksums and carry valuable information like name and timestamp. Also, you can't validate the content passed to env import.

But for development, it is easier to use the env import command and plain text files instead of script-images.

Since both OMAP5evm/uevm boards are used primarily for development, we allow U-Boot to load env var from a text file in case that an boot.scr script-image is not present.

The variable uenvcmd (if existent) will be executed (using run) after uEnv.txt was loaded. If uenvcmd doesn't exist the default boot sequence will be started.

Inspired by commit: d70f54808dfa83b574e1239c3eccbcf3317343e1 (omap4: allow the use of a plain text env file instead boot scripts)

---
 include/configs/omap5_common.h |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
include/configs/omap5_common.h +13 -3
index f0416df..6d7aa7b 100644
@@ -156,6 +156,9 @@
 	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
 		"source ${loadaddr}\0" \
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
+		"env import -t ${loadaddr} ${filesize}\0" \
 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
@@ -166,9 +169,16 @@
 		"if run loadbootscript; then " \
 			"run bootscript; " \
 		"else " \
-			"if run loaduimage; then " \
-				"run mmcboot; " \
-			"fi; " \
+			"if run loadbootenv; then " \
+				"run importbootenv; " \
+			"fi;" \
+			"if test -n ${uenvcmd}; then " \
+				"echo Running uenvcmd ...;" \
+				"run uenvcmd;" \
+			"fi;" \
+		"fi;" \
+		"if run loaduimage; then " \
+			"run mmcboot; " \
 		"fi; " \
 	"fi"
 
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

In reply to Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

---
[V4] Added environment variables bootdir, bootpart
and added loadimage, loadfdt commands as per Tom's suggestion.

 include/configs/omap4_common.h |   22 +++++++++++++++++++---
 include/configs/omap5_common.h |   20 +++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)
include/configs/omap4_common.h +19 -3
index 6ae6a0f..18cd98f 100644
@@ -138,6 +138,10 @@
  */
 
 #define CONFIG_BOOTDELAY	3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 
 #define CONFIG_ENV_OVERWRITE
 
@@ -145,6 +149,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:1\0" \
+	"bootdir=\0" \
+	"bootfile=uImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -160,12 +168,19 @@
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootm ${loadaddr} - ${fdtaddr}\0" \
+	"findfdt="\
+		"if test $board_name = sdp4430; then " \
+			"setenv fdtfile omap4-sdp.dtb; fi; " \
+		"if test $board_name = panda; then " \
+			"setenv fdtfile omap4-panda-es.dtb; fi\0" \
+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
 
 #define CONFIG_BOOTCOMMAND \
+	"run findfdt; " \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"echo SD/MMC found on device ${mmcdev};" \
 		"if run loadbootscript; then " \
@@ -179,7 +194,8 @@
 				"run uenvcmd;" \
 			"fi;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run loadimage; then " \
+			"run loadfdt;" \
 			"run mmcboot; " \
 		"fi; " \
 	"fi"
include/configs/omap5_common.h +17 -3
index 6d7aa7b..24c9ecc 100644
@@ -137,6 +137,10 @@
  */
 
 #define CONFIG_BOOTDELAY	3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 
 #define CONFIG_ENV_OVERWRITE
 
@@ -144,6 +148,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:1\0" \
+	"bootdir=\0" \
+	"bootfile=uImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -159,12 +167,17 @@
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootm ${loadaddr} - ${fdtaddr}\0" \
+	"findfdt="\
+		"if test $board_name = omap5_uevm; then " \
+			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
 
 #define CONFIG_BOOTCOMMAND \
+	"run findfdt; " \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"if run loadbootscript; then " \
 			"run bootscript; " \
@@ -177,7 +190,8 @@
 				"run uenvcmd;" \
 			"fi;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run loadimage; then " \
+			"run loadfdt; " \
 			"run mmcboot; " \
 		"fi; " \
 	"fi"
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

Quoted 8 lines · Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

[snip]

include/configs/omap4_common.h line 155

Quoted 8 lines
include/configs/omap4_common.h +4 -0
@@ -145,6 +149,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:1\0" \
+	"bootdir=\0" \
+	"bootfile=uImage\0" \

What about 0:2 and /boot, ala am335x_evm as well? I'm not aware of any distributions being really clever and mounting the FAT partition to /boot and I know some that have been expecting and using their ext*-located kernels for a while for various TI platforms. And wer're moving in that latter direction too :) Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130401/0fa569fb/attachment.pgp>
#6 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

Hi Tom,

Quoted 11 lines · Tom Rini
Quoted 8 lines · Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

[snip]

Quoted 15 lines

include/configs/omap4_common.h line 155

Quoted 8 lines
include/configs/omap4_common.h +4 -0
@@ -145,6 +149,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:1\0" \
+	"bootdir=\0" \
+	"bootfile=uImage\0" \

What about 0:2 and /boot, ala am335x_evm as well? I'm not aware of any distributions being really clever and mounting the FAT partition to /boot and I know some that have been expecting and using their ext*-located kernels for a while for various TI platforms. And wer're moving in that latter direction too :) Thanks!

Sorry, i am not clear here. You mean default partition should be '2' and not '1'. why ?. Is there any ordering like FAT-1, EXT2-2, etc ? The reason i added 0:1, was we generally have boot FAT as partition '1' and directly take images from there, without any hierarchies (/boot)

Regards,
Sricharan

#7 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 25 lines · Sricharan R

Hi Tom,

Quoted 10 lines · Tom Rini
Quoted 7 lines · Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

[snip]

Quoted 12 lines

Review

Quoted 4 lines
(quoted diff) +0 -0
@@ -145,6 +149,10 @@ "loadaddr=0x82000000\0" \ 

"console=ttyO2,115200n8\0" \ "fdt_high=0xffffffff\0" \ +
"fdtaddr=0x80f80000\0" \ + "bootpart=0:1\0" \ + "bootdir=\0" \

(quoted diff) +1 -0
+	"bootfile=uImage\0" \

What about 0:2 and /boot, ala am335x_evm as well? I'm not aware of any distributions being really clever and mounting the FAT partition to /boot and I know some that have been expecting and using their ext*-located kernels for a while for various TI platforms. And wer're moving in that latter direction too :) Thanks!

Quoted 5 lines

Sorry, i am not clear here. You mean default partition should be '2' and not '1'. why ?. Is there any ordering like FAT-1, EXT2-2, etc ? The reason i added 0:1, was we generally have boot FAT as partition '1' and directly take images from there, without any hierarchies (/boot)

Right. I'm saying we should be pulling from the Linux filesystem for our kernel / device tree and move people toward pulling from EXT* (where the distro or vendor has provided them with a reasonable kernel, or they've updated their own there) and away from FAT.

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRWwONAAoJENk4IS6UOR1WnNsP/2H1huM1H3Ii+DtanBGyRBKu +dqQaNB/N2GJ6GjyJv7etxvs6BV5I7n5LaP40Tp8M9m8O7cMBvjXGFqFi1+/Tngo zuQTu7UHcfsDO4fp3mNoYvj0e74M4bPoWqgOh5HxRifTwzoB4JeFvRH9OsahjFDu AUtL9XdyZolHBukJHUS0NHEe4Z/k66IglXw+dlJJaIG4Gz32qyp3sz8FgxlYiA/9 Wn0gR/mOj0boVKK03HNi7Twfwlyj67oAUsekI0boDbwr292++3+zBqsccBv9t3Jo 354+XcUUXY8en2v6oFPp/54Tno0qO3ix4YzG3eB1GNmdF564KGkPFlLGALGl/d95 mearLR2wH2ejZ5X9O2q72tdTNDQ5eBSVWVvb2DjzXVIDQ1v9gQ76FvqGpPiYYxrt kQF4ghO5/hisWFtEXgoDDEbWp9ywVDRJpDLmo6e8yg06j+2z3Atg+iEFdVrTnSNu Blarhi3nGVOHoVDFRnvlyGMp+30b1YkCwoxy3+ocYuWgcctWJMnOvb+x8rKGVgNU irjJAztBAjN0LLivwYMNL8grHaSqCoTdKhM/9Ocm9wi9gHMLGA5+pPfpMampIMX2 7fKP0rgR53S+ycPxF7U/yjwJ6jT8QqYjpTZywI02+88q2iV5gWeDQv91tnjEsyhA T8dz3YqF94lmFMD0HWDU
=+duh
-----END PGP SIGNATURE-----

#8 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

Quoted 35 lines · Tom Rini

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 25 lines · Sricharan R

Hi Tom,

Quoted 10 lines · Tom Rini
Quoted 7 lines · Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

[snip]

Quoted 12 lines

Review

Quoted 4 lines
(quoted diff) +0 -0
@@ -145,6 +149,10 @@ "loadaddr=0x82000000\0" \ 

"console=ttyO2,115200n8\0" \ "fdt_high=0xffffffff\0" \ +
"fdtaddr=0x80f80000\0" \ + "bootpart=0:1\0" \ + "bootdir=\0" \

(quoted diff) +1 -0
+	"bootfile=uImage\0" \

What about 0:2 and /boot, ala am335x_evm as well? I'm not aware of any distributions being really clever and mounting the FAT partition to /boot and I know some that have been expecting and using their ext*-located kernels for a while for various TI platforms. And wer're moving in that latter direction too :) Thanks!

Quoted 5 lines

Sorry, i am not clear here. You mean default partition should be '2' and not '1'. why ?. Is there any ordering like FAT-1, EXT2-2, etc ? The reason i added 0:1, was we generally have boot FAT as partition '1' and directly take images from there, without any hierarchies (/boot)

Quoted 5 lines

Right. I'm saying we should be pulling from the Linux filesystem for our kernel / device tree and move people toward pulling from EXT* (where the distro or vendor has provided them with a reasonable kernel, or they've updated their own there) and away from FAT.

ok, get it. Will change then.

Regards,
Sricharan

#9 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

In reply to Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

---
[V4] Added environment variables bootdir, bootpart
and added loadimage, loadfdt commands as per Tom's suggestion.

 include/configs/omap4_common.h |   22 +++++++++++++++++++---
 include/configs/omap5_common.h |   20 +++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)
include/configs/omap4_common.h +19 -3
index 6ae6a0f..7af3989 100644
@@ -138,6 +138,10 @@
  */
 
 #define CONFIG_BOOTDELAY	3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 
 #define CONFIG_ENV_OVERWRITE
 
@@ -145,6 +149,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:2\0" \
+	"bootdir=/boot\0" \
+	"bootfile=uImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -160,12 +168,19 @@
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootm ${loadaddr} - ${fdtaddr}\0" \
+	"findfdt="\
+		"if test $board_name = sdp4430; then " \
+			"setenv fdtfile omap4-sdp.dtb; fi; " \
+		"if test $board_name = panda; then " \
+			"setenv fdtfile omap4-panda-es.dtb; fi\0" \
+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
 
 #define CONFIG_BOOTCOMMAND \
+	"run findfdt; " \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"echo SD/MMC found on device ${mmcdev};" \
 		"if run loadbootscript; then " \
@@ -179,7 +194,8 @@
 				"run uenvcmd;" \
 			"fi;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run loadimage; then " \
+			"run loadfdt;" \
 			"run mmcboot; " \
 		"fi; " \
 	"fi"
include/configs/omap5_common.h +17 -3
index 6d7aa7b..6fb0253 100644
@@ -137,6 +137,10 @@
  */
 
 #define CONFIG_BOOTDELAY	3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 
 #define CONFIG_ENV_OVERWRITE
 
@@ -144,6 +148,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:2\0" \
+	"bootdir=/boot\0" \
+	"bootfile=uImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -159,12 +167,17 @@
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootm ${loadaddr} - ${fdtaddr}\0" \
+	"findfdt="\
+		"if test $board_name = omap5_uevm; then " \
+			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
 
 #define CONFIG_BOOTCOMMAND \
+	"run findfdt; " \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"if run loadbootscript; then " \
 			"run bootscript; " \
@@ -177,7 +190,8 @@
 				"run uenvcmd;" \
 			"fi;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run loadimage; then " \
+			"run loadfdt; " \
 			"run mmcboot; " \
 		"fi; " \
 	"fi"
Signature · 1 line
1.7.9.5
#10 lore raw

PATCH v4 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree

In reply to Sricharan R

Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.

Thanks to Tom Rini <[email protected]> for suggesting this.

---
[V4] Added environment variables bootdir, bootpart
and added loadimage, loadfdt commands as per Tom's suggestion.

 include/configs/omap4_common.h |   22 +++++++++++++++++++---
 include/configs/omap5_common.h |   20 +++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)
include/configs/omap4_common.h +19 -3
index 6ae6a0f..7af3989 100644
@@ -138,6 +138,10 @@
  */
 
 #define CONFIG_BOOTDELAY	3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 
 #define CONFIG_ENV_OVERWRITE
 
@@ -145,6 +149,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:2\0" \
+	"bootdir=/boot\0" \
+	"bootfile=uImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -160,12 +168,19 @@
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootm ${loadaddr} - ${fdtaddr}\0" \
+	"findfdt="\
+		"if test $board_name = sdp4430; then " \
+			"setenv fdtfile omap4-sdp.dtb; fi; " \
+		"if test $board_name = panda; then " \
+			"setenv fdtfile omap4-panda-es.dtb; fi\0" \
+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
 
 #define CONFIG_BOOTCOMMAND \
+	"run findfdt; " \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"echo SD/MMC found on device ${mmcdev};" \
 		"if run loadbootscript; then " \
@@ -179,7 +194,8 @@
 				"run uenvcmd;" \
 			"fi;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run loadimage; then " \
+			"run loadfdt;" \
 			"run mmcboot; " \
 		"fi; " \
 	"fi"
include/configs/omap5_common.h +17 -3
index 6d7aa7b..6fb0253 100644
@@ -137,6 +137,10 @@
  */
 
 #define CONFIG_BOOTDELAY	3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 
 #define CONFIG_ENV_OVERWRITE
 
@@ -144,6 +148,10 @@
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"bootpart=0:2\0" \
+	"bootdir=/boot\0" \
+	"bootfile=uImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -159,12 +167,17 @@
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootm ${loadaddr} - ${fdtaddr}\0" \
+	"findfdt="\
+		"if test $board_name = omap5_uevm; then " \
+			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
 
 #define CONFIG_BOOTCOMMAND \
+	"run findfdt; " \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"if run loadbootscript; then " \
 			"run bootscript; " \
@@ -177,7 +190,8 @@
 				"run uenvcmd;" \
 			"fi;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run loadimage; then " \
+			"run loadfdt; " \
 			"run mmcboot; " \
 		"fi; " \
 	"fi"
Signature · 1 line
1.7.9.5
#11 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

In reply to Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/omap4_common.h +2 -2
index 7af3989..1fd3097 100644
@@ -152,7 +152,7 @@
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:2\0" \
 	"bootdir=/boot\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -171,7 +171,7 @@
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
include/configs/omap5_common.h +2 -2
index 6fb0253..da0ead9 100644
@@ -151,7 +151,7 @@
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:2\0" \
 	"bootdir=/boot\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -170,7 +170,7 @@
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = omap5_uevm; then " \
 			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
Signature · 1 line
1.7.9.5
#12 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

Hi Sricharan,

Quoted 6 lines · Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

Quoted 7 lines
---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Is there a reason why this patch does not have history?

Amicalement,

Signature · 1 line
Albert.
#13 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

Hi Albert,

Quoted 19 lines · Albert ARIBAUD

Hi Sricharan,

Quoted 6 lines · Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

Quoted 7 lines
---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 3 lines

Is there a reason why this patch does not have history?

Amicalement,

I had a minor change only in these two from the series. So reposted only these two with 'in-reply-to' threads. If this is not the right etiquette, then should it be update/appended in the original patch ?

Regards,
Sricharan

#14 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

Hi Sricharan,

Quoted 22 lines · Sricharan R

Hi Albert,

Quoted 19 lines · Albert ARIBAUD

Hi Sricharan,

Quoted 13 lines · Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 7 lines
Quoted 3 lines

Is there a reason why this patch does not have history?

Amicalement,

I had a minor change only in these two from the series. So reposted only these two with 'in-reply-to' threads. If this is not the right etiquette, then should it be update/appended in the original patch ?

My question is not about the series but only about 5/5 which has no patch history after the commit message delimiter (---) whereas 4/5 has history.

If 5/5 has a minor change in V4, then it should have a history log indicating which minor change it was.

Quoted 2 lines

Regards,
Sricharan

Amicalement,

Signature · 1 line
Albert.
#15 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

Quoted 35 lines · Albert ARIBAUD

Hi Sricharan,

Quoted 22 lines · Sricharan R

Hi Albert,

Quoted 19 lines · Albert ARIBAUD

Hi Sricharan,

Quoted 13 lines · Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 7 lines
Quoted 3 lines

Is there a reason why this patch does not have history?

Amicalement,

I had a minor change only in these two from the series. So reposted only these two with 'in-reply-to' threads. If this is not the right etiquette, then should it be update/appended in the original patch ?

Quoted 7 lines

My question is not about the series but only about 5/5 which has no patch history after the commit message delimiter (---) whereas 4/5 has history.

If 5/5 has a minor change in V4, then it should have a history log indicating which minor change it was.

ok. 5/5 was just rebase on 4/5. Will add it though. Sorry for the miss.

Regards,
Sricharan

#16 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

In reply to Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

---
[V4] Just rebased on top of 4/5 th patch.

 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/omap4_common.h +2 -2
index 7af3989..1fd3097 100644
@@ -152,7 +152,7 @@
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:2\0" \
 	"bootdir=/boot\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -171,7 +171,7 @@
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
include/configs/omap5_common.h +2 -2
index 6fb0253..da0ead9 100644
@@ -151,7 +151,7 @@
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:2\0" \
 	"bootdir=/boot\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -170,7 +170,7 @@
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = omap5_uevm; then " \
 			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
Signature · 1 line
1.7.9.5
#17 lore raw

PATCH v4 5/5 ARM: OMAP4/5: Make bootz as the default boot command

In reply to Sricharan R

So with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.

---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/omap4_common.h +2 -2
index 18cd98f..5ad606e 100644
@@ -152,7 +152,7 @@
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:1\0" \
 	"bootdir=\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -171,7 +171,7 @@
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
include/configs/omap5_common.h +2 -2
index 24c9ecc..44c35b1 100644
@@ -151,7 +151,7 @@
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:1\0" \
 	"bootdir=\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -170,7 +170,7 @@
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = omap5_uevm; then " \
 			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
Signature · 1 line
1.7.9.5
#18 lore raw

v4 cover ARM: OMAP4/5: Add support to boot with device tree as default

In reply to Sricharan R
Quoted 14 lines · Sricharan R

With the kernel moving all towards device tree, this series adds support to make the device tree boot as the default for OMAP4/5 platforms.

Nishanth Menon (1):
omap5: Allow use of a plain text env file

Sricharan R (4):
ARM: OMAP5: Rename omap5_evm to omap5_uevm
ARM: OMAP5: Set fdt_high to enable booting with Device tree
ARM: OMAP4/5: Change the default boot command to work with device
tree
ARM: OMAP4/5: Make bootz as the default boot command

Quoted 12 lines
 board/ti/{omap5_evm => omap5_uevm}/Makefile   |    0
 board/ti/{omap5_evm => omap5_uevm}/evm.c      |    0
 board/ti/{omap5_evm => omap5_uevm}/mux_data.h |    0
 boards.cfg                                    |    2 +-
 include/configs/omap4_common.h                |   22 +++++++++++++---
 include/configs/omap5_common.h                |   35 +++++++++++++++++++++----
 include/configs/{omap5_evm.h => omap5_uevm.h} |    0
 7 files changed, 50 insertions(+), 9 deletions(-)
 rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%)
 rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%)
 rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%)
 rename include/configs/{omap5_evm.h => omap5_uevm.h} (100%)

Along with what would be v5 of 4/5 and 5/5, applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130408/7b58d740/attachment.pgp>