From: John Linn Date: Wed, 5 Dec 2012 18:27:04 +0000 (-0800) Subject: zynq: remove CONFIG_EXTRA_ENV_SETTINGS from Zed board X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e01fd7c7d538373adfe3e441d21a215112224f65;p=thirdparty%2Fu-boot.git zynq: remove CONFIG_EXTRA_ENV_SETTINGS from Zed board 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 Acked-by: Michal Simek --- diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 67c94ab7a8b..9d3a2084b60 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -34,29 +34,4 @@ #include -#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 */