X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fel6x_common.h;h=f7b96e48258e0350e740366a72d1a45924c8432c;hb=406df85345f942d9348443983d81a01e013e920b;hp=89d3dffc9764c8f19af11a04e1491fed14583d64;hpb=60e54562913f7a272a5483ed909cf9c740b606f6;p=oweals%2Fu-boot.git

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 89d3dffc97..f7b96e4825 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -1,17 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) Stefano Babic <sbabic@denx.de>
  *
  * Configuration settings for the E+L i.MX6Q DO82 board.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __EL6Q_COMMON_CONFIG_H
 #define __EL6Q_COMMON_CONFIG_H
 
+#include <linux/stringify.h>
+
 #define CONFIG_BOARD_NAME		EL6Q
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_IMX_THERMAL
@@ -22,8 +22,6 @@
 #define CONFIG_MXC_UART
 
 #ifdef CONFIG_SPL
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	(64 * 1024)
-#define CONFIG_SPL_SPI_LOAD
 #include "imx6_spl.h"
 #endif
 
@@ -46,10 +44,6 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Commands */
-#define CONFIG_SF_DEFAULT_BUS		3
-#define CONFIG_SF_DEFAULT_CS		0
-#define CONFIG_SF_DEFAULT_SPEED		20000000
-#define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -57,7 +51,6 @@
 
 #define CONFIG_BOARD_NAME	EL6Q
 
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS                                               \
 	"board="__stringify(CONFIG_BOARD_NAME)"\0"                              \
 	"cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
@@ -83,14 +76,7 @@
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-#define CONFIG_CMD_MEMTEST
-
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10800000
-#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
@@ -104,12 +90,9 @@
 
 /* environment organization */
 
-#define CONFIG_ENV_SIZE			(8 * 1024)
-
 #if defined(CONFIG_ENV_IS_IN_MMC)
 #define CONFIG_SYS_MMC_ENV_DEV		1
 #define CONFIG_SYS_MMC_ENV_PART		2
-#define CONFIG_ENV_OFFSET		0x0
 #endif
 
 #endif                         /* __EL6Q_COMMON_CONFIG_H */