Convert CONFIG_IMX_VIDEO_SKIP et al to Kconfig

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

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index c137612..6294fd1 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -8,25 +8,12 @@
 #ifndef __MX6QSABRE_COMMON_CONFIG_H
 #define __MX6QSABRE_COMMON_CONFIG_H
 
-#include "mx6_common.h"
-
-#define CONFIG_IMX_THERMAL
+#include <linux/stringify.h>
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
-
-#define CONFIG_MXC_UART
+#include "mx6_common.h"
 
 /* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-
-#define CONFIG_FEC_MXC
-#define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE            RGMII
-#define CONFIG_ETHPRIME                        "FEC"
-#define CONFIG_FEC_MXC_PHYADDR         1
-
-#define CONFIG_PHY_ATHEROS
+#define CFG_SYS_FSL_ESDHC_ADDR      0
 
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
 #define EMMC_ENV \
@@ -51,7 +38,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
-       "fdt_file=undefined\0" \
+       "fdtfile=undefined\0" \
        "fdt_addr=0x18000000\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
@@ -62,6 +49,7 @@
        "dfu_alt_info=spl raw 0x400\0" \
        "fdt_high=0xffffffff\0"   \
        "initrd_high=0xffffffff\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
@@ -82,11 +70,14 @@
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=PARTUUID=${uuid} rootwait rw\0" \
        "loadbootscript=" \
-               "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+               "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script} || " \
+               "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "source\0" \
-       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} || " \
+               "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
+       "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile} || " \
+               "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run finduuid; " \
                "run mmcargs; " \
@@ -115,7 +106,7 @@
                "fi; " \
                "${get_cmd} ${image}; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                       "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+                       "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \
                                "bootz ${loadaddr} - ${fdt_addr}; " \
                        "else " \
                                "if test ${boot_fdt} = try; then " \
@@ -128,71 +119,31 @@
                        "bootz; " \
                "fi;\0" \
                "findfdt="\
-                       "if test $fdt_file = undefined; then " \
+                       "if test $fdtfile = undefined; then " \
                                "if test $board_name = SABREAUTO && test $board_rev = MX6QP; then " \
-                                       "setenv fdt_file imx6qp-sabreauto.dtb; fi; " \
+                                       "setenv fdtfile imx6qp-sabreauto.dtb; fi; " \
                                "if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \
-                                       "setenv fdt_file imx6q-sabreauto.dtb; fi; " \
+                                       "setenv fdtfile imx6q-sabreauto.dtb; fi; " \
                                "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \
-                                       "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \
+                                       "setenv fdtfile imx6dl-sabreauto.dtb; fi; " \
                                "if test $board_name = SABRESD && test $board_rev = MX6QP; then " \
-                                       "setenv fdt_file imx6qp-sabresd.dtb; fi; " \
+                                       "setenv fdtfile imx6qp-sabresd.dtb; fi; " \
                                "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \
-                                       "setenv fdt_file imx6q-sabresd.dtb; fi; " \
+                                       "setenv fdtfile imx6q-sabresd.dtb; fi; " \
                                "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \
-                                       "setenv fdt_file imx6dl-sabresd.dtb; fi; " \
-                               "if test $fdt_file = undefined; then " \
+                                       "setenv fdtfile imx6dl-sabresd.dtb; fi; " \
+                               "if test $fdtfile = undefined; then " \
                                        "echo WARNING: Could not determine dtb to use; fi; " \
                        "fi;\0" \
 
-#define CONFIG_BOOTCOMMAND \
-       "run findfdt;" \
-       "mmc dev ${mmcdev};" \
-       "if mmc rescan; then " \
-               "if run loadbootscript; then " \
-               "run bootscript; " \
-               "else " \
-                       "if run loadimage; then " \
-                               "run mmcboot; " \
-                       "else run netboot; " \
-                       "fi; " \
-               "fi; " \
-       "else run netboot; fi"
-
-#define CONFIG_ARP_TIMEOUT     200UL
-
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
-#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#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)
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET              (768 * 1024)
-#endif
-
-/* Framebuffer */
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_BMP_16BPP
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
 
 #define CONFIG_USBD_HS