Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
- Loading branch information
1 parent
d023885
commit 71e4439
Showing
1 changed file
with
177 additions
and
0 deletions.
There are no files selected for viewing
177 changes: 177 additions & 0 deletions
177
v2013.04-rc3/0001-mx53loco-uEnv.txt-bootz-n-fixes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| From d2a4564a11164bc26b782bea4d3e83c5f792165d Mon Sep 17 00:00:00 2001 | ||
| From: Robert Nelson <robertcnelson@gmail.com> | ||
| Date: Fri, 15 Mar 2013 10:16:23 -0500 | ||
| Subject: [PATCH] mx53loco: uEnv.txt, bootz, n fixes | ||
|
|
||
| Defaults: | ||
| #define CONFIG_BOOTDELAY 1 | ||
|
|
||
| #define CONFIG_CMD_FAT | ||
| #define CONFIG_CMD_EXT2 | ||
| #define CONFIG_CMD_EXT4 | ||
| #define CONFIG_CMD_FS_GENERIC | ||
|
|
||
| /* bootz: zImage/initrd.img support */ | ||
| #define CONFIG_CMD_BOOTZ | ||
| #define CONFIG_SUPPORT_RAW_INITRD | ||
|
|
||
| fatload -> load | ||
| bootm -> bootz | ||
|
|
||
| #define CONFIG_BOOTCOMMAND \ | ||
| "mmc dev ${mmcdev};" \ | ||
| "if mmc rescan; then " \ | ||
| "echo SD/MMC found on device ${mmcdev};" \ | ||
| "if run loadbootenv; then " \ | ||
| "echo Loaded environment from uEnv.txt;" \ | ||
| "run importbootenv;" \ | ||
| "fi;" \ | ||
| "if test -n $uenvcmd; then " \ | ||
| "echo Running uenvcmd ...;" \ | ||
| "run uenvcmd;" \ | ||
| "fi;" \ | ||
| "if run loadzimage; then " \ | ||
| "run loadfdt;" \ | ||
| "run mmcboot;" \ | ||
| "fi;" \ | ||
| "fi;" | ||
|
|
||
| Signed-off-by: Robert Nelson <robertcnelson@gmail.com> | ||
| --- | ||
| include/configs/mx53loco.h | 101 ++++++++++++++++++++------------------------ | ||
| 1 file changed, 45 insertions(+), 56 deletions(-) | ||
|
|
||
| diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h | ||
| index a4b610f..724afab 100644 | ||
| --- a/include/configs/mx53loco.h | ||
| +++ b/include/configs/mx53loco.h | ||
| @@ -56,6 +56,12 @@ | ||
| #define CONFIG_GENERIC_MMC | ||
| #define CONFIG_CMD_FAT | ||
| #define CONFIG_CMD_EXT2 | ||
| +#define CONFIG_CMD_EXT4 | ||
| +#define CONFIG_CMD_FS_GENERIC | ||
| + | ||
| +/* bootz: zImage/initrd.img support */ | ||
| +#define CONFIG_CMD_BOOTZ | ||
| +#define CONFIG_SUPPORT_RAW_INITRD | ||
| #define CONFIG_DOS_PARTITION | ||
|
|
||
| /* Eth Configs */ | ||
| @@ -117,74 +123,57 @@ | ||
| #define CONFIG_SYS_TEXT_BASE 0x77800000 | ||
|
|
||
| #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
| + "initrd_high=0xffffffff\0" \ | ||
| + "fdt_high=0xffffffff\0" \ | ||
| "script=boot.scr\0" \ | ||
| "uimage=uImage\0" \ | ||
| - "fdt_file=imx53-qsb.dtb\0" \ | ||
| + "fdt_file=/dtbs/imx53-qsb.dtb\0" \ | ||
| "fdt_addr=0x71000000\0" \ | ||
| "boot_fdt=try\0" \ | ||
| "ip_dyn=yes\0" \ | ||
| + "console=ttymxc0,115200\0" \ | ||
| + "optargs=\0" \ | ||
| + "video=\0" \ | ||
| "mmcdev=0\0" \ | ||
| - "mmcpart=2\0" \ | ||
| - "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \ | ||
| - "mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \ | ||
| - "loadbootscript=" \ | ||
| - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
| + "mmcpart=1\0" \ | ||
| + "mmcroot=/dev/mmcblk0p2 ro\0" \ | ||
| + "mmcrootfstype=ext4 rootwait fixrtc\0" \ | ||
| + "mmcargs=setenv bootargs console=${console} " \ | ||
| + "${optargs} " \ | ||
| + "root=${mmcroot} " \ | ||
| + "rootfstype=${mmcrootfstype} " \ | ||
| + "video=${video}\0" \ | ||
| + "loadbootenv=" \ | ||
| + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt;\0" \ | ||
| + "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \ | ||
| + "env import -t ${loadaddr} ${filesize}\0" \ | ||
| "bootscript=echo Running bootscript from mmc ...; " \ | ||
| "source\0" \ | ||
| - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
| - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ | ||
| + "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \ | ||
| + "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ | ||
| "mmcboot=echo Booting from mmc ...; " \ | ||
| "run mmcargs; " \ | ||
| - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ | ||
| - "if run loadfdt; then " \ | ||
| - "bootm ${loadaddr} - ${fdt_addr}; " \ | ||
| - "else " \ | ||
| - "if test ${boot_fdt} = try; then " \ | ||
| - "bootm; " \ | ||
| - "else " \ | ||
| - "echo WARN: Cannot load the DT; " \ | ||
| - "fi; " \ | ||
| - "fi; " \ | ||
| - "else " \ | ||
| - "bootm; " \ | ||
| - "fi;\0" \ | ||
| - "netargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
| - "root=/dev/nfs " \ | ||
| - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
| - "netboot=echo Booting from net ...; " \ | ||
| - "run netargs; " \ | ||
| - "if test ${ip_dyn} = yes; then " \ | ||
| - "setenv get_cmd dhcp; " \ | ||
| - "else " \ | ||
| - "setenv get_cmd tftp; " \ | ||
| - "fi; " \ | ||
| - "${get_cmd} ${uimage}; " \ | ||
| - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ | ||
| - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ | ||
| - "bootm ${loadaddr} - ${fdt_addr}; " \ | ||
| - "else " \ | ||
| - "if test ${boot_fdt} = try; then " \ | ||
| - "bootm; " \ | ||
| - "else " \ | ||
| - "echo ERROR: Cannot load the DT; " \ | ||
| - "exit; " \ | ||
| - "fi; " \ | ||
| - "fi; " \ | ||
| - "else " \ | ||
| - "bootm; " \ | ||
| - "fi;\0" | ||
| + "bootz ${loadaddr} - ${fdt_addr}\0" \ | ||
| + "mmc_classic_boot=echo Booting from mmc ...; " \ | ||
| + "run mmcargs; " \ | ||
| + "bootz ${loadaddr}\0" \ | ||
|
|
||
| #define CONFIG_BOOTCOMMAND \ | ||
| - "mmc dev ${mmcdev}; if mmc rescan; then " \ | ||
| - "if run loadbootscript; then " \ | ||
| - "run bootscript; " \ | ||
| - "else " \ | ||
| - "if run loaduimage; then " \ | ||
| - "run mmcboot; " \ | ||
| - "else run netboot; " \ | ||
| - "fi; " \ | ||
| - "fi; " \ | ||
| - "else run netboot; fi" | ||
| + "mmc dev ${mmcdev};" \ | ||
| + "if mmc rescan; then " \ | ||
| + "echo SD/MMC found on device ${mmcdev};" \ | ||
| + "if run loadbootenv; then " \ | ||
| + "run importbootenv;" \ | ||
| + "fi;" \ | ||
| + "if test -n $uenvcmd; then " \ | ||
| + "echo Running uenvcmd ...;" \ | ||
| + "run uenvcmd;" \ | ||
| + "fi;" \ | ||
| + "if run loadzimage; then " \ | ||
| + "run loadfdt;" \ | ||
| + "run mmcboot;" \ | ||
| + "fi;" \ | ||
| + "fi;" | ||
|
|
||
| #define CONFIG_ARP_TIMEOUT 200UL | ||
|
|
||
| -- | ||
| 1.7.10.4 | ||
|
|