sunxi: DT: update device tree files for Allwinner H3 and H5 SoCs

[u-boot] / include / configs / apalis_imx6.h

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 21a79e1662abd6984345c4672b2b1b90381601fe..7225c03ac50f5a0da7dbbf64b5d115152892b00b 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2013-2015 Toradex, Inc.
  *
  * Configuration settings for the Toradex Apalis iMX6
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -12,7 +11,6 @@
 #include "mx6_common.h"
 
 #undef CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
 
 #define CONFIG_MACH_TYPE               4886
 
@@ -39,10 +37,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
-/* Make the HW version stuff available in U-Boot env */
-#define CONFIG_VERSION_VARIABLE                /* ver environment variable */
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
 /* I2C Configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
@@ -57,13 +51,11 @@
 #endif
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
 #define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-#define CONFIG_BOUNCE_BUFFER
 
 /*
  * SATA Configs
@@ -117,7 +109,6 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX              1
 
 /* Command definition */
 #undef CONFIG_CMD_LOADB
@@ -254,7 +245,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS             48
 
-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000