diff options
Diffstat (limited to '0006-set-omap4-to-use-extlinux.conf-by-default.patch')
| -rw-r--r-- | 0006-set-omap4-to-use-extlinux.conf-by-default.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/0006-set-omap4-to-use-extlinux.conf-by-default.patch b/0006-set-omap4-to-use-extlinux.conf-by-default.patch new file mode 100644 index 0000000..7f74368 --- /dev/null +++ b/0006-set-omap4-to-use-extlinux.conf-by-default.patch @@ -0,0 +1,63 @@ +From 92177bae56489e1f9dd87740a37fbb5f3e15face Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore <dennis@ausil.us> +Date: Mon, 2 Sep 2013 12:35:16 -0500 +Subject: [PATCH 06/16] set omap4 to use extlinux.conf by default + +--- + include/configs/omap4_common.h | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h +index 634668a..7e22321 100644 +--- a/include/configs/omap4_common.h ++++ b/include/configs/omap4_common.h +@@ -155,6 +155,22 @@ + "vram=${vram} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ ++ "bootcmd_setup=mmc rescan\0" \ ++ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \ ++ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \ ++ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \ ++ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \ ++ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \ ++ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \ ++ "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \ ++ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \ ++ "bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \ ++ "localcmd=run bootcmd_mmc\0" \ ++ "bootdevice=0\0" \ ++ "bootargs=console=${console} root=LABEL=rootfs\0" \ ++ "bootdelay=2\0" \ ++ "bootretry=90\0" \ ++ "netretry=once\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ +@@ -164,7 +180,7 @@ + "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "mmcboot=echo Booting from mmc${mmcdev} ...; " \ + "run mmcargs; " \ +- "bootz ${loadaddr} - ${fdtaddr}\0" \ ++ "bootz ${loadaddr} - ${fdt_addr}\0" \ + "findfdt="\ + "if test $board_name = sdp4430; then " \ + "setenv fdtfile omap4-sdp.dtb; fi; " \ +@@ -176,12 +192,13 @@ + "setenv fdtfile omap4-panda-es.dtb; fi;" \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0" \ +- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ ++ "loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \ + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ ++ "run bootcmd_default; " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ +-- +1.8.3.1 + |