GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-30 11:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

am335x_evm: Add more variables and switch to DT booting.

Browse source 
Make bootcmd run findfdt so that we know what dtb file to load.  Add a
loadfdt command to load this file in.  Make mmcboot pass in ${fdtaddr}
and make the mmc section of bootcmd run loadfdt.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Koen Kooi 2013-03-14 05:55:21 +00:00 • committed by Tom Rini
parent 73a27a84e5
commit 951d582778
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/configs/am335x_evm.h
View file

@ -56,7 +56,8 @@
"fdtaddr=0x80F80000\0" \ "fdtaddr=0x80F80000\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"rdaddr=0x81000000\0" \ "rdaddr=0x81000000\0" \
"bootfile=/boot/uImage\0" \ "bootdir=/boot\0" \
"bootfile=uImage\0" \
"fdtfile=\0" \ "fdtfile=\0" \
"console=ttyO0,115200n8\0" \ "console=ttyO0,115200n8\0" \
"optargs=\0" \ "optargs=\0" \
@ -105,10 +106,11 @@
"root=${ramroot} " \ "root=${ramroot} " \
"rootfstype=${ramrootfstype}\0" \ "rootfstype=${ramrootfstype}\0" \
"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootfile}\0" \ "loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
"bootm ${loadaddr}\0" \ "bootm ${loadaddr} - ${fdtaddr}\0" \
"nandboot=echo Booting from nand ...; " \ "nandboot=echo Booting from nand ...; " \
"run nandargs; " \ "run nandargs; " \
"nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \ "nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
@ -122,11 +124,12 @@
"setenv autoload no; " \ "setenv autoload no; " \
"dhcp; " \ "dhcp; " \
"tftp ${loadaddr} ${bootfile}; " \ "tftp ${loadaddr} ${bootfile}; " \
"tftp ${fdtaddr} ${fdtfile}; " \
"run netargs; " \ "run netargs; " \
"bootm ${loadaddr}\0" \ "bootm ${loadaddr} - ${fdtaddr}\0" \
"ramboot=echo Booting from ramdisk ...; " \ "ramboot=echo Booting from ramdisk ...; " \
"run ramargs; " \ "run ramargs; " \
"bootm ${loadaddr}\0" \ "bootm ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
"findfdt="\ "findfdt="\
"if test $board_name = A335BONE; then " \ "if test $board_name = A335BONE; then " \
"setenv fdtfile am335x-bone.dtb; fi; " \ "setenv fdtfile am335x-bone.dtb; fi; " \
@ -140,6 +143,7 @@
#endif #endif
#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 loadbootenv; then " \ "if run loadbootenv; then " \
@ -151,6 +155,7 @@
"run uenvcmd;" \ "run uenvcmd;" \
"fi;" \ "fi;" \
"if run loaduimage; then " \ "if run loaduimage; then " \
"run loadfdt;" \
"run mmcboot;" \ "run mmcboot;" \
"fi;" \ "fi;" \
"else " \ "else " \