diff options
Diffstat (limited to 'recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch b/recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch deleted file mode 100644 index d0c3d3e6..00000000 --- a/recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | From: Nathan Rossi <nathan.rossi@xilinx.com> | ||
| 2 | Date: Fri, 30 Aug 2013 16:13:15 +1000 | ||
| 3 | Subject: [PATCH] zynq_common: Add uEnv.txt boot environment load support | ||
| 4 | |||
| 5 | Add support for using a uEnv.txt file for loading and or modifying the | ||
| 6 | existing boot environment during a Zynq "sdboot". If the environment | ||
| 7 | fails to load during the "sdboot" continue booting from SD normally. | ||
| 8 | |||
| 9 | This uEnv.txt and bootenv/uenv default environment variables are based | ||
| 10 | on the implementation used in omap3_beagle.h. | ||
| 11 | |||
| 12 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> | ||
| 13 | Signed-off-by: Michal Simek <michal.simek@xilinx.com> | ||
| 14 | Upstream-Status: Backport | ||
| 15 | --- | ||
| 16 | include/configs/zynq_common.h | 28 ++++++++++++++++++++++------ | ||
| 17 | 1 file changed, 22 insertions(+), 6 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h | ||
| 20 | index 762aaca..a7cadc4 100644 | ||
| 21 | --- a/include/configs/zynq_common.h | ||
| 22 | +++ b/include/configs/zynq_common.h | ||
| 23 | @@ -237,11 +237,16 @@ | ||
| 24 | "devicetree_image=devicetree.dtb\0" \ | ||
| 25 | "bitstream_image=system.bit.bin\0" \ | ||
| 26 | "loadbit_addr=0x100000\0" \ | ||
| 27 | + "loadbootenv_addr=0x2000000\0" \ | ||
| 28 | "kernel_size=0x500000\0" \ | ||
| 29 | "devicetree_size=0x20000\0" \ | ||
| 30 | "ramdisk_size=0x5E0000\0" \ | ||
| 31 | "fdt_high=0x20000000\0" \ | ||
| 32 | "initrd_high=0x20000000\0" \ | ||
| 33 | + "bootenv=uEnv.txt\0" \ | ||
| 34 | + "loadbootenv=fatload mmc 0 ${loadbootenv_addr} ${bootenv}\0" \ | ||
| 35 | + "importbootenv=echo Importing environment from SD ...; " \ | ||
| 36 | + "env import -t ${loadbootenv_addr} $filesize\0" \ | ||
| 37 | "mmc_loadbit_fat=echo Loading bitstream from SD/MMC/eMMC to RAM.. && " \ | ||
| 38 | "mmcinfo && " \ | ||
| 39 | "fatload mmc 0 ${loadbit_addr} ${bitstream_image} && " \ | ||
| 40 | @@ -259,12 +264,23 @@ | ||
| 41 | "echo Copying ramdisk... && " \ | ||
| 42 | "sf read 0x2000000 0x620000 ${ramdisk_size} && " \ | ||
| 43 | "bootm 0x3000000 0x2000000 0x2A00000\0" \ | ||
| 44 | - "sdboot=echo Copying Linux from SD to RAM... && " \ | ||
| 45 | - "mmcinfo && " \ | ||
| 46 | - "fatload mmc 0 0x3000000 ${kernel_image} && " \ | ||
| 47 | - "fatload mmc 0 0x2A00000 ${devicetree_image} && " \ | ||
| 48 | - "fatload mmc 0 0x2000000 ${ramdisk_image} && " \ | ||
| 49 | - "bootm 0x3000000 0x2000000 0x2A00000\0" \ | ||
| 50 | + "uenvboot=" \ | ||
| 51 | + "if run loadbootenv; then " \ | ||
| 52 | + "echo Loaded environment from ${bootenv}; " \ | ||
| 53 | + "run importbootenv; " \ | ||
| 54 | + "fi; " \ | ||
| 55 | + "if test -n $uenvcmd; then " \ | ||
| 56 | + "echo Running uenvcmd ...; " \ | ||
| 57 | + "run uenvcmd; " \ | ||
| 58 | + "fi\0" \ | ||
| 59 | + "sdboot=if mmcinfo; then " \ | ||
| 60 | + "run uenvboot; " \ | ||
| 61 | + "echo Copying Linux from SD to RAM... && " \ | ||
| 62 | + "fatload mmc 0 0x3000000 ${kernel_image} && " \ | ||
| 63 | + "fatload mmc 0 0x2A00000 ${devicetree_image} && " \ | ||
| 64 | + "fatload mmc 0 0x2000000 ${ramdisk_image} && " \ | ||
| 65 | + "bootm 0x3000000 0x2000000 0x2A00000; " \ | ||
| 66 | + "fi\0" \ | ||
| 67 | "nandboot=echo Copying Linux from NAND flash to RAM... && " \ | ||
| 68 | "nand read 0x3000000 0x100000 ${kernel_size} && " \ | ||
| 69 | "nand read 0x2A00000 0x600000 ${devicetree_size} && " \ | ||
| 70 | -- | ||
| 71 | 1.7.9.5 | ||
| 72 | |||
