colibri_imx6: fix video stdout in default environment

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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 2dfb7bd861c1026de299c96652b5b7e0bd13e31c..0a52a701c628c0f65096fa9c760d7ba534dbfc05 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -8,6 +8,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/stringify.h>
+
 #include "mx6_common.h"
 
 #undef CONFIG_DISPLAY_BOARDINFO
@@ -40,19 +42,9 @@
 #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
 
-/* Network */
-#define CONFIG_FEC_MXC
-#define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE            RMII
-#define CONFIG_ETHPRIME                        "FEC"
-#define CONFIG_FEC_MXC_PHYADDR         1
-#define CONFIG_TFTP_BLOCKSIZE          16352
-#define CONFIG_TFTP_TSIZE
-
 /* USB Configs */
 /* Host */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
@@ -78,10 +70,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Command definition */
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FLASH
 
 #undef CONFIG_IPADDR
 #define CONFIG_IPADDR                  192.168.10.2
@@ -93,6 +81,7 @@
 
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \
        func(USB, usb, 0) \
        func(DHCP, dhcp, na)
@@ -111,6 +100,17 @@
        "imx6dl-colibri-eval-v3.dtb fat 0 1;" \
        "imx6dl-colibri-cam-eval-v3.dtb fat 0 1"
 
+#define UBOOT_UPDATE \
+       "uboot_hwpart=1\0" \
+       "uboot_blk=8a\0" \
+       "uboot_spl_blk=2\0" \
+       "set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && " \
+               "setexpr blkcnt ${blkcnt} / 0x200\0" \
+       "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
+               "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
+       "update_spl=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
+               "mmc write ${loadaddr} ${uboot_spl_blk} ${blkcnt}\0"
+
 #define EMMC_BOOTCMD \
        "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} "\
                "rw,noatime rootfstype=ext4 " \
@@ -132,8 +132,6 @@
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x12100000\0" \
-       "fdt_high=0xffffffff\0" \
-       "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x11000000\0" \
        "pxefile_addr_r=0x17100000\0" \
        "ramdisk_addr_r=0x12200000\0" \
@@ -149,49 +147,13 @@
        "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
-#define SD_BOOTCMD \
-       "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw,noatime " \
-               "rootfstype=ext4 rootwait\0" \
-       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-               "${vidargs}; echo Booting from SD card; " \
-               "run sddtbload; load mmc ${sddev}:${sdbootpart} "\
-               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "sdbootpart=1\0" \
-       "sddev=1\0" \
-       "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
-               "${fdt_addr_r} ${fdt_file} && setenv dtbparam \" - " \
-               "${fdt_addr_r}\" && true\0" \
-       "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 ; " \
-               "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
+       "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
                "usb start ; " \
-               "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+               "setenv stdout serial,vidconsole; " \
+               "setenv stdin serial,usbkbd\0" \
        "boot_file=zImage\0" \
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
@@ -201,8 +163,7 @@
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
-       USB_BOOTCMD \
+       UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \
@@ -217,6 +178,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 "
 
@@ -226,10 +188,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS             48
 
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
-#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
@@ -245,16 +203,11 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
-                                        CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 #endif
 
-#define CONFIG_CMD_TIME
-
 #endif /* __CONFIG_H */