[boot] add u-boot patches for BeagleBone, BeagleBoard xM and PandaBoard

This commit is contained in:
Fabio Erculiani 2012-02-02 08:24:52 +01:00
parent dbebd8980a
commit 6ef0990a1b
3 changed files with 176 additions and 0 deletions

View File

@ -0,0 +1,62 @@
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 91af8a0..07e48eb 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -217,7 +217,6 @@
"optargs=\0" \
"camera=none\0" \
"vram=12M\0" \
- "dvimode=640x480MR-16@60\0" \
"defaultdisplay=dvi\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
@@ -232,7 +231,6 @@
"buddy=${buddy} "\
"camera=${camera} "\
"vram=${vram} " \
- "omapfb.mode=dvi:${dvimode} " \
"omapdss.def_disp=${defaultdisplay} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
@@ -242,7 +240,6 @@
"buddy=${buddy} "\
"camera=${camera} "\
"vram=${vram} " \
- "omapfb.mode=dvi:${dvimode} " \
"omapdss.def_disp=${defaultdisplay} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
@@ -255,16 +252,19 @@
"mpurate=${mpurate} " \
"buddy=${buddy} "\
"vram=${vram} " \
- "omapfb.mode=dvi:${dvimode} " \
"omapdss.def_disp=${defaultdisplay} " \
"root=${ramroot} " \
"rootfstype=${ramrootfstype}\0" \
"loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
"loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
"loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
+ "loaduinitrd=ext2load mmc ${mmcdev}:2 ${rdaddr} /boot/uInitrd\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"bootm ${loadaddr}\0" \
+ "mmcbootrd=echo Booting from mmc (+uInitrd)...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr} ${rdaddr}\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"nand read ${loadaddr} 280000 400000; " \
@@ -288,7 +288,11 @@
"run uenvcmd;" \
"fi;" \
"if run loaduimage; then " \
- "run mmcboot;" \
+ "if run loaduinitrd; then " \
+ "run mmcbootrd;" \
+ "else " \
+ "run mmcboot;" \
+ "fi;" \
"fi;" \
"fi;" \
"run nandboot;" \

View File

@ -0,0 +1,55 @@
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 0170e11..89a46eb 100755
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -46,7 +46,9 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootfile=uImage\0" \
+ "ramdiskfile=uInitrd\0" \
"loadaddr=0x82000000\0" \
+ "rdaddr=0x81000000\0" \
"script_addr=0x81900000\0" \
"console=ttyO0,115200n8\0" \
"mmc_dev=0\0" \
@@ -75,6 +77,8 @@
"importbootenv=echo Importing environment from mmc ...; " \
"env import -t $loadaddr $filesize\0" \
"mmc_load_uimage=fatload mmc ${mmc_dev} 0x80007fc0 ${bootfile}\0" \
+ "mmc_load_ext_uimage=ext2load mmc ${mmc_dev}:2 ${loadaddr} /boot/${bootfile}\0" \
+ "mmc_load_ext_initrd=ext2load mmc ${mmc_dev}:2 ${rdaddr} /boot/${ramdiskfile}\0" \
"optargs=\0" \
"bootargs_defaults=setenv bootargs " \
"console=${console} " \
@@ -101,8 +105,14 @@
"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
"ip=dhcp\0" \
"mmc_boot=run mmc_args; " \
- "run mmc_load_uimage; " \
- "bootm\0" \
+ "if run mmc_load_uimage; then " \
+ "bootm;" \
+ "fi;" \
+ "if run mmc_load_ext_uimage; then " \
+ "run mmc_load_ext_initrd;" \
+ "bootm;" \
+ "fi;" \
+ "\0" \
"nand_boot=echo Booting from nand ...; " \
"run nand_args; " \
"nand read.i ${loadaddr} ${nand_src_addr} ${nand_img_siz}; " \
@@ -138,6 +148,14 @@
"run mmc_args;" \
"bootm;" \
"fi;" \
+ "if run mmc_load_ext_uimage; then " \
+ "run mmc_args;" \
+ "if run mmc_load_ext_initrd; then " \
+ "bootm ${loadaddr} ${rdaddr};" \
+ "else " \
+ "bootm ${loadaddr};" \
+ "fi;" \
+ "fi;" \
"fi;" \
"run nand_boot;" \

View File

@ -0,0 +1,59 @@
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index a989721..4583a5a 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -150,32 +150,51 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
+ "rdaddr=0x81000000\0" \
"console=ttyO2,115200n8\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
+ "optargs=\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext3 rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \
+ "${optargs} " \
"vram=${vram} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+ "bootenv=uEnv.txt\0" \
+ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+ "importbootenv=echo Importing environment from mmc ...; " \
+ "env import -t ${loadaddr} ${filesize}\0" \
+ "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
+ "loaduinitrd=ext2load mmc ${mmcdev}:2 ${rdaddr} /boot/uInitrd\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \
"bootm ${loadaddr}\0" \
+ "mmcbootrd=echo Booting from mmc${mmcdev} (+initrd)...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr} ${rdaddr}\0" \
#define CONFIG_BOOTCOMMAND \
"if mmc rescan ${mmcdev}; then " \
+ "if run loadbootenv; then " \
+ "echo Loaded environment from ${bootenv};" \
+ "run importbootenv;" \
+ "fi;" \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
"if run loaduimage; then " \
- "run mmcboot; " \
- "fi; " \
+ "if run loaduinitrd; then " \
+ "run mmcbootrd;" \
+ "else " \
+ "run mmcboot;" \
+ "fi;" \
+ "fi;" \
"fi; " \
"fi"