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

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

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index dd090c5..00e5667 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2015
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,25 +7,18 @@
  * Copyright (C) 2012 Freescale Semiconductor, Inc.
  *
  * Configuration settings for the Freescale i.MX6DL aristainetos2 board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef __ARISTAINETOS2_CONFIG_H
 #define __ARISTAINETOS2_CONFIG_H
 
 #define CONFIG_SYS_BOARD_VERSION       2
-#define CONFIG_HOSTNAME                aristainetos2
+#define CONFIG_HOSTNAME                "aristainetos2"
 #define CONFIG_BOARDNAME       "aristainetos2"
 
-#define CONFIG_BOARD_LATE_INIT
-
 #define CONFIG_MXC_UART_BASE   UART2_BASE
-#define CONFIG_CONSOLE_DEV     "ttymxc1"
+#define CONSOLE_DEV    "ttymxc1"
 
 #define CONFIG_FEC_XCV_TYPE            RGMII
-#define CONFIG_PHY_MICREL_KSZ9031
-
-#define CONFIG_SF_DEFAULT_CS           1
 
 #define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
        "board_type=aristainetos2_7@1\0" \
@@ -34,7 +28,10 @@
                "-(rescue-system);gpmi-nand:-(ubi)\0" \
        "addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0\0" \
        "ubiargs=setenv bootargs console=${console},${baudrate} " \
-               "ubi.mtd=0,4096 root=ubi0:rootfs rootfstype=ubifs\0 "
+               "ubi.mtd=0,4096 root=ubi0:rootfs rootfstype=ubifs\0 " \
+       "ubifs_load_fit=sf probe;ubi part ubi 4096;ubifsmount ubi:rootfs;" \
+               "ubifsload ${fit_addr_r} /boot/system.itb; " \
+               "imi ${fit_addr_r}\0 "
 
 #define CONFIG_SYS_I2C_MXC_I2C4                /* enable I2C bus 4 */
 
@@ -48,8 +45,6 @@
 #define CONFIG_LG4573_BUS 0
 #define CONFIG_LG4573_CS 0
 
-#define CONFIG_CMD_BMP
-
 #define CONFIG_PWM_IMX
 #define CONFIG_IMX6_PWM_PER_CLK        66000000