]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
zynq: remove CONFIG_EXTRA_ENV_SETTINGS from Zed board
authorJohn Linn <john.linn@xilinx.com>
Wed, 5 Dec 2012 18:27:04 +0000 (10:27 -0800)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 6 Dec 2012 07:16:10 +0000 (08:16 +0100)
They are the same as the settings in zynq_common.h with
respect to QSPI, JTAG, and SD booting. Having them
replicated for the Zed board is a maintenance hassle.

Signed-off-by: John Linn <john.linn@xilinx.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
include/configs/zynq_zed.h

index 67c94ab7a8b1770b4a50f6022e99a25ed7a89f86..9d3a2084b600be391cc94fec1bd76c703e246197 100644 (file)
 
 #include <configs/zynq_common.h>
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-       "ethaddr=00:0a:35:00:01:22\0"   \
-       "kernel_image=uImage\0" \
-       "ramdisk_image=uramdisk.image.gz\0"     \
-       "devicetree_image=devicetree.dtb\0"     \
-       "qspiboot=echo Copying Linux from QSPI flash to RAM...;" \
-               "sf probe 0 0 0;" \
-               "sf read 0x3000000 0x100000 0x400000;" \
-               "sf read 0x2A00000 0x600000 0x20000;" \
-               "echo Copying ramdisk...;" \
-               "sf read 0x2000000 0x800000 0x400000;" \
-               "bootm 0x3000000 0x2000000 0x2A00000\0" \
-       "sdboot=echo Copying Linux from SD to RAM...;" \
-               "mmcinfo;" \
-               "fatload mmc 0 0x3000000 ${kernel_image};" \
-               "fatload mmc 0 0x2A00000 ${devicetree_image};" \
-               "fatload mmc 0 0x2000000 ${ramdisk_image};" \
-               "bootm 0x3000000 0x2000000 0x2A00000\0" \
-       "jtagboot=echo TFTPing Linux to RAM...;" \
-               "tftp 0x3000000 ${kernel_image};" \
-               "tftp 0x2A00000 ${devicetree_image};" \
-               "tftp 0x2000000 ${ramdisk_image};" \
-               "bootm 0x3000000 0x2000000 0x2A00000\0"
-
 #endif /* __CONFIG_ZYNQ_ZED_H */