x86: fsp: Set up init runtime buffer in update_fsp_configs()

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

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 5bdc22df9abcca6db76c0121bdb6d325013c66e1..5f0a2302de573a6d58a7c18a5fdaa743a1dd5622 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -13,51 +13,31 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R
-#define CONFIG_DOS_PARTITION
-#define CONFIG_FAT_WRITE
 #define CONFIG_FIT
 #define CONFIG_KEYBOARD
-#define CONFIG_OF_LIBFDT
 
+#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* U-Boot Commands */
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BMODE
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_FUSE
+#define CONFIG_FAT_WRITE
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SATA
-#define CONFIG_CMD_SETEXPR
 #define CONFIG_CMD_TIME
 #define CONFIG_CMD_USB
 #define CONFIG_VIDEO
 
 /* U-Boot general configurations */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE      1024            /* Console I/O buffer size */
-#define CONFIG_SYS_MAXARGS     32              /* Max number of command args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-                                               /* Boot argument buffer size */
 #define CONFIG_VERSION_VARIABLE                        /* U-BOOT version */
-#define CONFIG_AUTO_COMPLETE                   /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING                 /* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER
 
 /* U-Boot environment */
-#define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_SIZE                        (16 * 1024)
 /*
  * Environment is on MMC, starting at offset 512KiB from start of the card.
@@ -77,12 +57,9 @@
 #endif
 
 /* Booting Linux */
-#define CONFIG_BOOTDELAY               5
 #define CONFIG_BOOTFILE                        "fitImage"
 #define CONFIG_BOOTARGS                        "console=ttymxc1,115200 "
-#define CONFIG_BOOTCOMMAND             "run net_nfs"
-#define CONFIG_LOADADDR                        0x18000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_BOOTCOMMAND             "run distro_bootcmd ; run net_nfs"
 #define CONFIG_HOSTNAME                        novena
 
 /* Physical Memory Map */
@@ -106,6 +83,7 @@
 
 /* SPL */
 #define CONFIG_SPL_FAT_SUPPORT
+#define CONFIG_SPL_EXT_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 
@@ -126,6 +104,8 @@
 /* I2C */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_I2C_MULTI_BUS
 #define CONFIG_I2C_MXC
@@ -138,20 +118,8 @@
 #endif
 
 /* MMC Configs */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#endif
-
-/* OCOTP Configs */
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
@@ -182,8 +150,6 @@
 /* UART */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART2_BASE
-#define CONFIG_BAUDRATE                        115200
-#define CONFIG_CONS_INDEX              1
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
@@ -225,6 +191,7 @@
 #endif
 
 /* Extra U-Boot environment. */
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "fdt_high=0xffffffff\0"                                         \
        "initrd_high=0xffffffff\0"                                      \
@@ -233,7 +200,12 @@
        "bootdev=/dev/mmcblk0p1\0"                                      \
        "rootdev=/dev/mmcblk0p2\0"                                      \
        "netdev=eth0\0"                                                 \
-       "kernel_addr_r=0x18000000\0"                                    \
+       "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"                \
+       "pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"               \
+       "scriptaddr="__stringify(CONFIG_LOADADDR)"\0"                   \
+       "ramdisk_addr_r=0x28000000\0"                                   \
+       "fdt_addr_r=0x18000000\0"                                       \
+       "fdtfile=imx6q-novena.dtb\0"                                    \
        "addcons="                                                      \
                "setenv bootargs ${bootargs} "                          \
                "console=${consdev},${baudrate}\0"                      \
@@ -277,5 +249,19 @@
                "fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\
                "fi ; "                                                 \
                "fi\0"                                                  \
+       BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(SATA, sata, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif /* CONFIG_SPL_BUILD */
 
 #endif                         /* __CONFIG_H */