imx: wandboard: convert FEC support to DM_ETH

[platform/kernel/u-boot.git] / include / configs / colibri_imx6.h

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index b540b3e..fa4dc49 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -40,7 +40,6 @@
 #define CONFIG_SYS_MXC_I2C3_SPEED      400000
 
 /* MMC Configs */
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
@@ -50,8 +49,6 @@
 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         1
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* USB Configs */
@@ -167,30 +164,11 @@
        "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
        "sdrootpart=2\0"
 
-#define USB_BOOTCMD \
-       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw,noatime " \
-               "rootfstype=ext4 rootwait\0" \
-       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
-               "setenv bootargs ${defargs} ${setupargs} " \
-               "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-               "run usbdtbload; " \
-               "load usb ${usbdev}:${usbbootpart} ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "usbbootpart=1\0" \
-       "usbdev=0\0" \
-       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
-               "${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && " \
-               "true\0" \
-       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
-       "usbrootpart=2\0"
-
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-               "run distro_bootcmd ; " \
+               "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
                "usb start ; " \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
        "boot_file=zImage\0" \
@@ -203,7 +181,6 @@
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
        SD_BOOTCMD \
-       USB_BOOTCMD \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \
@@ -218,6 +195,7 @@
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
+       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
        "vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \
                "video=mxcfb1:off fbmem=8M\0 "