Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index c635e9f..63c168c 100644 (file)
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -1,15 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) Stefano Babic <sbabic@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
 #ifndef __SKSIMX6_CONFIG_H
 #define __SKSIMX6_CONFIG_H
 
-#include <config_distro_defaults.h>
-
 #include "mx6_common.h"
 #include "imx6_spl.h"
 
@@ -29,7 +26,6 @@
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         0x01
 
-#define CONFIG_MII
 #define CONFIG_PHY_MICREL_KSZ9021
 
 /* I2C Configs */
@@ -41,7 +37,6 @@
 /* Filesystem support */
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
@@ -58,13 +53,7 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE                (16 * 1024)
-#define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
-                                               CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \