MLK-18146-4 mx6: Update mx6 common head file

Align the common head file with v2020.04, since some configurations
have been moved to Kconfig, so don't need them in mx6_common.h now.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 183c12aeec8faae933f3222c40d333f1fc6ef89a)
(cherry picked from commit 6fdf38a42f3dd3e623d46cb8a5f750ad83fd2720)
(cherry picked from commit e37ed29ece6593f032d0333b229ca5f70bb2269f)

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 83895ab..580aa2b 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
+ * Copyright (C) 2012-2016 Freescale Semiconductor, Inc.
  * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright 2018 NXP
  */
 
 #ifndef __MX6_COMMON_H
@@ -43,7 +45,7 @@
 #if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \
        defined(CONFIG_MX6SX) || \
        defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
-#define CONFIG_LOADADDR                0x82000000
+#define CONFIG_LOADADDR                0x80800000
 #else
 #define CONFIG_LOADADDR                0x12000000
 #endif
@@ -52,8 +54,10 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE      512
 #define CONFIG_SYS_MAXARGS     32
+#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
 
 /* MMC */
+#define CONFIG_SUPPORT_EMMC_BOOT
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT