Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 4764d22..7fc3459 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -10,8 +10,6 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_BOARD_NAME              EL6Q
-
 #include "mx6_common.h"
 
 #ifdef CONFIG_SPL
@@ -30,10 +28,8 @@
 
 #define CONFIG_MXC_UART_BASE   UART2_BASE
 
-#define CONFIG_BOARD_NAME      EL6Q
-
 #define CONFIG_EXTRA_ENV_SETTINGS                                               \
-       "board="__stringify(CONFIG_BOARD_NAME)"\0"                              \
+       "board=EL6Q\0"                                                          \
        "cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
        "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
        "console=" CONSOLE_DEV "\0"                                     \
@@ -62,11 +58,6 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
 /* environment organization */
 
 #endif                         /* __EL6Q_COMMON_CONFIG_H */