cm_fx6: fix video stdout in default environment
[oweals/u-boot.git] / include / configs / cm_fx6.h
index 51956102335105e974821906c24b0fed8fe6cf22..35f251c15ed42deb298dac1fde37357b607e3aa2 100644 (file)
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Config file for Compulab CM-FX6 board
  *
  * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
  *
  * Author: Nikita Kiryanov <nikita@compulab.co.il>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_CM_FX6_H
@@ -25,9 +24,6 @@
 #define PHYS_SDRAM_1                   MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_2                   MMDC1_ARB_BASE_ADDR
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define CONFIG_NR_DRAM_BANKS           2
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 #define CONFIG_SYS_INIT_SP_OFFSET \
 #define CONFIG_MXC_UART_BASE           UART4_BASE
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
-/* SPI flash */
-#define CONFIG_SF_DEFAULT_BUS          0
-#define CONFIG_SF_DEFAULT_CS           0
-#define CONFIG_SF_DEFAULT_SPEED                25000000
-#define CONFIG_SF_DEFAULT_MODE         (SPI_MODE_0)
-
-/* MTD support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_SPI_FLASH_MTD
-#endif
-
 /* Environment */
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SECT_SIZE           (64 * 1024)
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-#define CONFIG_ENV_OFFSET              (768 * 1024)
 
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "fdt_high=0xffffffff\0" \
+       "initrd_high=0xffffffff\0" \
+       "fdt_addr_r=0x18000000\0" \
+       "ramdisk_addr_r=0x13000000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=undefined\0" \
        "stdin=serial,usbkbd\0" \
-       "stdout=serial,vga\0" \
-       "stderr=serial,vga\0" \
+       "stdout=serial,vidconsole\0" \
+       "stderr=serial,vidconsole\0" \
        "panel=HDMI\0" \
        "autoload=no\0" \
        "uImage=uImage-cm-fx6\0" \
        "zImage=zImage-cm-fx6\0" \
        "kernel=uImage-cm-fx6\0" \
-       "script=boot.scr\0" \
        "dtb=cm-fx6.dtb\0" \
-       "bootm_low=18000000\0" \
-       "loadaddr=0x10800000\0" \
-       "fdtaddr=0x11000000\0" \
        "console=ttymxc3,115200\0" \
        "ethprime=FEC0\0" \
        "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \
        "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
-       "doboot=bootm ${loadaddr}\0" \
+       "doboot=bootm ${kernel_addr_r}\0" \
        "doloadfdt=false\0" \
        "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setboottypez=setenv kernel ${zImage};" \
-               "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
+               "setenv doboot bootz ${kernel_addr_r} - ${fdt_addr_r};" \
                "setenv doloadfdt true;\0" \
        "setboottypem=setenv kernel ${uImage};" \
-               "setenv doboot bootm ${loadaddr};" \
+               "setenv doboot bootm ${kernel_addr_r};" \
                "setenv doloadfdt false;\0"\
        "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
        "sataroot=/dev/sda2 rw rootwait\0" \
        "run_eboot=echo Starting EBOOT ...; "\
                "mmc dev 2 && " \
                "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
-       "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0"\
-       "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0"\
-       "loadfdt=load ${storagetype} ${storagedev} ${fdtaddr} ${dtb};\0" \
-       "bootscript=echo Running bootscript from ${storagetype} ...;" \
-                  "source ${loadaddr};\0" \
-       "nandloadkernel=nand read ${loadaddr} 0 780000;\0" \
-       "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
+       "loadkernel=load ${storagetype} ${storagedev} ${kernel_addr_r} ${kernel};\0"\
+       "loadfdt=load ${storagetype} ${storagedev} ${fdt_addr_r} ${dtb};\0" \
+       "nandloadkernel=nand read ${kernel_addr_r} 0 780000;\0" \
+       "nandloadfdt=nand read ${fdt_addr_r} 780000 80000;\0" \
        "setupmmcboot=setenv storagetype mmc; setenv storagedev 2;\0" \
        "setupsataboot=setenv storagetype sata; setenv storagedev 0;\0" \
        "setupnandboot=setenv storagetype nand;\0" \
-       "setupusbboot=setenv storagetype usb; setenv storagedev 0;\0" \
        "storagebootcmd=echo Booting from ${storagetype} ...;" \
                        "run ${storagetype}args; run doboot;\0" \
        "trybootk=if run loadkernel; then " \
                "fi;" \
                "run storagebootcmd;" \
                "fi;\0" \
-       "trybootsmz=if run loadscript; then " \
-                       "run bootscript;" \
-               "fi;" \
+       "trybootsmz=" \
                "run setboottypem;" \
                "run trybootk;" \
                "run setboottypez;" \
-               "run trybootk;\0"
-
-#define CONFIG_BOOTCOMMAND \
-       "run setupmmcboot;" \
-       "mmc dev ${storagedev};" \
-       "if mmc rescan; then " \
-               "run trybootsmz;" \
-       "fi;" \
-       "run setupusbboot;" \
-       "if usb start; then "\
-               "if run loadscript; then " \
-                       "run bootscript;" \
+               "run trybootk;\0" \
+       "legacy_bootcmd=" \
+               "run setupmmcboot;" \
+               "mmc dev ${storagedev};" \
+               "if mmc rescan; then " \
+                       "run trybootsmz;" \
                "fi;" \
-       "fi;" \
-       "run setupsataboot;" \
-       "if sata init; then " \
-               "run trybootsmz;" \
-       "fi;" \
-       "run setupnandboot;" \
-       "run nandboot;"
-
-#define CONFIG_PREBOOT         "usb start;sf probe"
-
-/* SPI */
-#define CONFIG_SPI
-#define CONFIG_MXC_SPI
+               "run setupsataboot;" \
+               "if sata init; then " \
+                       "run trybootsmz;" \
+               "fi;" \
+               "run setupnandboot;" \
+               "run nandboot;\0" \
+       "findfdt="\
+               "if test $board_name = Utilite && test $board_rev = MX6Q ; then " \
+                       "setenv fdtfile imx6q-utilite-pro.dtb; fi; " \
+               "if test $fdtfile = undefined; then " \
+                       "echo WARNING: Could not determine dtb to use; fi; \0" \
+       BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(USB, usb, 0) \
+       func(MMC, mmc, 2) \
+       func(SATA, sata, 0)
+
+#include <config_distro_bootcmd.h>
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif
 
 /* NAND */
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_MAX_CHIPS      1
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_NAND_MXS
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 /* APBH DMA is required for NAND support */
-#define CONFIG_APBH_DMA
-#define CONFIG_APBH_DMA_BURST
-#define CONFIG_APBH_DMA_BURST8
+#endif
+
+/* SPI Flash Configs */
+#if defined(CONFIG_SPL_BUILD)
+#undef CONFIG_DM_SPI
+#undef CONFIG_DM_SPI_FLASH
+#undef CONFIG_SPI_FLASH_MTD
 #endif
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR         0
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_PHY_ATHEROS
-#define CONFIG_MII
 #define CONFIG_ETHPRIME                        "FEC0"
 #define CONFIG_ARP_TIMEOUT             200UL
 #define CONFIG_NET_RETRY_COUNT         5
 
 /* misc */
 #define CONFIG_SYS_MALLOC_LEN                  (10 * 1024 * 1024)
-#define CONFIG_MISC_INIT_R
 
 /* SPL */
 #include "imx6_spl.h"
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
-#define CONFIG_SPL_SPI_LOAD
 
 /* Display */
-#define CONFIG_VIDEO_IPUV3
 #define CONFIG_IMX_HDMI
 
 #define CONFIG_SPLASH_SCREEN