qfw: Switch to CONFIG_SYS_LOAD_ADDR from CONFIG_LOADADDR

[J-u-boot.git] / include / configs / colibri-imx6ull.h

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 21d9a3da01fa47818dfeae468dd7f1386185ca74..3799b4a99970ec79e737478cbe33cada3bc3afa2 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -18,9 +18,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 

-/* Network */
-#define CONFIG_TFTP_TSIZE
-

 /* ENET1 */
 #define IMX_FEC_BASE                   ENET2_BASE_ADDR
 
 /* ENET1 */
 #define IMX_FEC_BASE                   ENET2_BASE_ADDR
 


@@ -28,63 +25,46 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 

-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
-/* I2C configs */
-#define CONFIG_SYS_I2C_SPEED           100000
-

 #define CONFIG_IPADDR                  192.168.10.2
 #define CONFIG_NETMASK                 255.255.255.0
 #define CONFIG_SERVERIP                        192.168.10.1
 
 #define CONFIG_IPADDR                  192.168.10.2
 #define CONFIG_NETMASK                 255.255.255.0
 #define CONFIG_SERVERIP                        192.168.10.1
 

-#define FDT_FILE "imx6ull-colibri${variant}-${fdt_board}.dtb"
-

 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x82100000\0" \
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x82100000\0" \

-       "fdt_high=0xffffffff\0" \
-       "initrd_high=0xffffffff\0" \

        "kernel_addr_r=0x81000000\0" \
        "pxefile_addr_r=0x87100000\0" \
        "ramdisk_addr_r=0x82200000\0" \
        "scriptaddr=0x87000000\0"
 
        "kernel_addr_r=0x81000000\0" \
        "pxefile_addr_r=0x87100000\0" \
        "ramdisk_addr_r=0x82200000\0" \
        "scriptaddr=0x87000000\0"
 

+#define UBOOT_UPDATE \
+       "update_uboot=nand erase.part u-boot1 && " \
+               "nand write ${loadaddr} u-boot1 ${filesize} && " \
+               "nand erase.part u-boot2 && " \
+               "nand write ${loadaddr} u-boot2 ${filesize}\0"
+

 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
        "nfsboot=run setup; " \
                "setenv bootargs ${defargs} ${nfsargs} " \
                "${setupargs} ${vidargs}; echo Booting from NFS...;" \
                "dhcp ${kernel_addr_r} && " \
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
        "nfsboot=run setup; " \
                "setenv bootargs ${defargs} ${nfsargs} " \
                "${setupargs} ${vidargs}; echo Booting from NFS...;" \
                "dhcp ${kernel_addr_r} && " \

-               "tftp ${fdt_addr_r} " FDT_FILE " && " \
+               "tftp ${fdt_addr_r} ${fdtfile} && " \

                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 

-#define SD_BOOTCMD \
-       "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \
-       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-       "setenv bootargs ${defargs} ${sdargs} " \
-       "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-       "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
-       "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "sdbootpart=1\0" \
-       "sddev=0\0" \
-       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-       "sdrootpart=2\0"
-

 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
                "ubi.fm_autoconvert=1\0" \
        "ubiboot=run setup; " \
                "setenv bootargs ${defargs} ${ubiargs} " \
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
                "ubi.fm_autoconvert=1\0" \
        "ubiboot=run setup; " \
                "setenv bootargs ${defargs} ${ubiargs} " \

-               "${setupargs} ${vidargs}; echo Booting from NAND...; " \
+               "${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \

                "ubi part ubi &&" \
                "ubi read ${kernel_addr_r} kernel && " \
                "ubi read ${fdt_addr_r} dtb && " \
                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
                "ubi part ubi &&" \
                "ubi read ${kernel_addr_r} kernel && " \
                "ubi read ${fdt_addr_r} dtb && " \
                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 

-#define CONFIG_BOOTCOMMAND "run ubiboot; " \
-       "setenv fdtfile " FDT_FILE " && run distro_bootcmd;"
+/* Run Distro Boot script if ubiboot fails */
+#define CONFIG_BOOTCOMMAND "run ubiboot || run distro_bootcmd;"

 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \


@@ -98,8 +78,9 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \

-       SD_BOOTCMD \

        UBI_BOOTCMD \
        UBI_BOOTCMD \

+       UBOOT_UPDATE \
+       "bootubipart=ubi\0" \

        "console=ttymxc0\0" \
        "defargs=user_debug=30\0" \
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
        "console=ttymxc0\0" \
        "defargs=user_debug=30\0" \
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \


@@ -122,11 +103,9 @@
                "fatload ${interface} 0:1 ${loadaddr} " \
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "splashpos=m,m\0" \
                "fatload ${interface} 0:1 ${loadaddr} " \
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "splashpos=m,m\0" \

+       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \

        "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \
        "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \

-       "vidargs=video=mxsfb:640x480-16@60"
-
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x08000000)
+       "vidargs=video=mxsfb:640x480M-16@60"

 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 


@@ -142,18 +121,11 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 

-#if defined(CONFIG_ENV_IS_IN_NAND)
-#define CONFIG_ENV_SECT_SIZE           (128 * 1024)
-#define CONFIG_ENV_OFFSET              (28 * CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#endif
-

 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 /* used to initialize CONFIG_SYS_NAND_BASE_LIST which is unused */
 #define CONFIG_SYS_NAND_BASE           -1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 /* used to initialize CONFIG_SYS_NAND_BASE_LIST which is unused */
 #define CONFIG_SYS_NAND_BASE           -1
 #define CONFIG_SYS_NAND_ONFI_DETECTION

-#define CONFIG_SYS_NAND_USE_FLASH_BBT

 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET


@@ -162,22 +134,15 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 

-#define CONFIG_IMX_THERMAL
-

 #define CONFIG_USBD_HS
 
 /* USB Device Firmware Update support */
 #define CONFIG_USBD_HS
 
 /* USB Device Firmware Update support */

-#define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_16M

 #define DFU_DEFAULT_POLL_TIMEOUT       300
 
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 

-#ifdef CONFIG_VIDEO
+#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)

 #define CONFIG_VIDEO_MXS
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_MXS
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 #define CONFIG_VIDEO_LOGO

-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_BMP_16BPP
-#define CONFIG_VIDEO_BMP_RLE8

 #define CONFIG_VIDEO_BMP_LOGO
 #endif
 
 #define CONFIG_VIDEO_BMP_LOGO
 #endif