global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index be0ed457d602399d6ba8b9bb5330559f9c85afeb..14fdf5b50e6673274560ef1d4862cd729a49c9c7 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -12,8 +12,6 @@
 
 #include "mx6_common.h"
 
-#undef CONFIG_DISPLAY_BOARDINFO
-
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
@@ -21,31 +19,20 @@
 #include "imx6_spl.h"
 #endif
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-#define CONFIG_SERIAL_TAG
-
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
 /* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_USDHC_NUM       2
+#define CFG_SYS_FSL_ESDHC_ADDR 0
+#define CFG_SYS_FSL_USDHC_NUM  2
 
 /* USB Configs */
 /* Host */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 /* Client */
 #define CONFIG_USBD_HS
 
 /* Framebuffer and LCD */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
@@ -57,7 +44,6 @@
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP                        192.168.10.1
 
-#ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \
        func(MMC, mmc, 0) \
@@ -66,9 +52,6 @@
 #include <config_distro_bootcmd.h>
 #undef BOOTENV_RUN_NET_USB_START
 #define BOOTENV_RUN_NET_USB_START ""
-#else /* CONFIG_SPL_BUILD */
-#define BOOTENV
-#endif /* CONFIG_SPL_BUILD */
 
 #define UBOOT_UPDATE \
        "uboot_hwpart=1\0" \
@@ -83,37 +66,21 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x12100000\0" \
-       "kernel_addr_r=0x11000000\0" \
-       "pxefile_addr_r=0x17100000\0" \
-       "ramdisk_addr_r=0x12200000\0" \
-       "scriptaddr=0x17000000\0"
-
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
-       "nfsboot=run setup; " \
-               "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
-               "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-               "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
-               "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
-#define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
+       "fdt_addr_r=0x18200000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=0x18300000\0" \
+       "ramdisk_addr_r=0x18400000\0" \
+       "scriptaddr=0x18280000\0"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
-       "bootcmd=run distro_bootcmd; " \
-               "usb start ; " \
-               "setenv stdout serial,vidconsole; " \
-               "setenv stdin serial,usbkbd\0" \
        "boot_file=zImage\0" \
+       "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
-       "fdt_file=" FDT_FILE "\0" \
-       "fdtfile=" FDT_FILE "\0" \
+       "fdt_board=eval-v3\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
@@ -133,10 +100,6 @@
        "vidargs=fbmem=8M\0"
 
 /* Miscellaneous configurable options */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE              1024
-#undef CONFIG_SYS_MAXARGS
-#define CONFIG_SYS_MAXARGS             48
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
@@ -145,9 +108,4 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
 #endif /* __CONFIG_H */