Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-25 20:07:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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 <trini@ti.com> for suggesting this.

Signed-off-by: Sricharan R <r.sricharan@ti.com>
This commit is contained in:
SRICHARAN R 2013-04-04 23:39:27 +00:00 • committed by Tom Rini
parent 78fd004107
commit 143070df8e
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/configs/omap4_common.h
View file

@ -138,6 +138,10 @@
*/ */
#define CONFIG_BOOTDELAY 3 #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 #define CONFIG_ENV_OVERWRITE
@ -145,6 +149,10 @@
"loadaddr=0x82000000\0" \ "loadaddr=0x82000000\0" \
"console=ttyO2,115200n8\0" \ "console=ttyO2,115200n8\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdtaddr=0x80f80000\0" \
"bootpart=0:2\0" \
"bootdir=/boot\0" \
"bootfile=uImage\0" \
"usbtty=cdc_acm\0" \ "usbtty=cdc_acm\0" \
"vram=16M\0" \ "vram=16M\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \
@ -160,12 +168,19 @@
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize}\0" \ "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} ...; " \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \ "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 \ #define CONFIG_BOOTCOMMAND \
"run findfdt; " \
"mmc dev ${mmcdev}; if mmc rescan; then " \ "mmc dev ${mmcdev}; if mmc rescan; then " \
"echo SD/MMC found on device ${mmcdev};" \ "echo SD/MMC found on device ${mmcdev};" \
"if run loadbootscript; then " \ "if run loadbootscript; then " \
@ -179,7 +194,8 @@
"run uenvcmd;" \ "run uenvcmd;" \
"fi;" \ "fi;" \
"fi;" \ "fi;" \
"if run loaduimage; then " \ "if run loadimage; then " \
"run loadfdt;" \
"run mmcboot; " \ "run mmcboot; " \
"fi; " \ "fi; " \
"fi" "fi"

20
include/configs/omap5_common.h
View file

@ -137,6 +137,10 @@
*/ */
#define CONFIG_BOOTDELAY 3 #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 #define CONFIG_ENV_OVERWRITE
@ -144,6 +148,10 @@
"loadaddr=0x82000000\0" \ "loadaddr=0x82000000\0" \
"console=ttyO2,115200n8\0" \ "console=ttyO2,115200n8\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdtaddr=0x80f80000\0" \
"bootpart=0:2\0" \
"bootdir=/boot\0" \
"bootfile=uImage\0" \
"usbtty=cdc_acm\0" \ "usbtty=cdc_acm\0" \
"vram=16M\0" \ "vram=16M\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \
@ -159,12 +167,17 @@
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize}\0" \ "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} ...; " \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \ "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 \ #define CONFIG_BOOTCOMMAND \
"run findfdt; " \
"mmc dev ${mmcdev}; if mmc rescan; then " \ "mmc dev ${mmcdev}; if mmc rescan; then " \
"if run loadbootscript; then " \ "if run loadbootscript; then " \
"run bootscript; " \ "run bootscript; " \
@ -177,7 +190,8 @@
"run uenvcmd;" \ "run uenvcmd;" \
"fi;" \ "fi;" \
"fi;" \ "fi;" \
"if run loaduimage; then " \ "if run loadimage; then " \
"run loadfdt; " \
"run mmcboot; " \ "run mmcboot; " \
"fi; " \ "fi; " \
"fi" "fi"