Merge git://git.denx.de/u-boot-dm

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

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 258866a..c53ba89 100644 (file)
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2015
  * (C) Copyright 2014
@@ -7,21 +8,20 @@
  * Copyright (C) 2012 Freescale Semiconductor, Inc.
  *
  * Configuration settings for the Freescale i.MX6Q SabreSD board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef __ARISTAINETOS_CONFIG_H
 #define __ARISTAINETOS_CONFIG_H
 
 #define CONFIG_SYS_BOARD_VERSION       1
-#define CONFIG_HOSTNAME                aristainetos
+#define CONFIG_HOSTNAME                "aristainetos"
 #define CONFIG_BOARDNAME       "aristainetos"
 
 #define CONFIG_MXC_UART_BASE   UART5_BASE
-#define CONFIG_CONSOLE_DEV     "ttymxc4"
+#define CONSOLE_DEV    "ttymxc4"
 
 #define CONFIG_FEC_XCV_TYPE            RMII
 
+#define CONFIG_SF_DEFAULT_BUS          3
 #define CONFIG_SF_DEFAULT_CS           0
 
 #define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
@@ -32,7 +32,10 @@
        "addmisc=setenv bootargs ${bootargs} consoleblank=0\0" \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
        "ubiargs=setenv bootargs console=${console},${baudrate} " \
-               "ubi.mtd=0,2048 root=ubi0:rootfs rootfstype=ubifs\0 "
+               "ubi.mtd=0,2048 root=ubi0:rootfs rootfstype=ubifs\0 " \
+       "ubifs_load_fit=sf probe;ubi part ubi 2048;ubifsmount ubi:rootfs;" \
+               "ubifsload ${fit_addr_r} /boot/system.itb; " \
+               "imi ${fit_addr_r}\0 "
 
 #define ARISTAINETOS_USB_OTG_PWR       IMX_GPIO_NR(4, 15)
 #define ARISTAINETOS_USB_H1_PWR                IMX_GPIO_NR(3, 31)