ARM: rmobile: Fix environment placement on Draak

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

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 697f8d25826b7f6bbd9eedf77ad74d6fe26c7c62..f495f6219ba9ad0acb79136106fabc9540a16956 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Samsung Electronics
  * Hyungwon Hwang <human.hwang@samsung.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_ODROID_XU3_H
@@ -14,7 +13,6 @@
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
-#define CONFIG_SYS_TEXT_BASE           0x43E00000
 
 /* select serial console configuration */
 #define CONFIG_SERIAL2                 /* use SERIAL 2 */
@@ -34,7 +32,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
-#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC2,115200n8\0"
+#define CONFIG_DEFAULT_CONSOLE         "ttySAC2,115200n8"
 
 /* USB */
 #define CONFIG_USB_EHCI_EXYNOS
@@ -45,15 +43,12 @@
 #define DFU_MANIFEST_POLL_TIMEOUT       25000
 
 /* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM   CONFIG_G_DNL_VENDOR_NUM
+#define CONFIG_G_DNL_THOR_VENDOR_NUM   CONFIG_USB_GADGET_VENDOR_NUM
 #define CONFIG_G_DNL_THOR_PRODUCT_NUM  0x685D
-#define CONFIG_USB_FUNCTION_THOR
-#define CONFIG_CMD_THOR_DOWNLOAD
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
 #undef CONFIG_EXYNOS_TMU
@@ -92,7 +87,6 @@
 #define CONFIG_SET_DFU_ALT_BUF_LEN     (SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_ODROID_REV_AIN                  9
 #define CONFIG_REVISION_TAG
 #define CONFIG_BOARD_TYPES
@@ -107,9 +101,8 @@
        EXYNOS_FDTFILE_SETTING \
        MEM_LAYOUT_ENV_SETTINGS \
        BOOTENV \
-       "bootdelay=0\0" \
        "rootfstype=ext4\0" \
-       "console=" CONFIG_DEFAULT_CONSOLE \
+       "console=" CONFIG_DEFAULT_CONSOLE "\0"\
        "fdtfile=exynos5422-odroidxu3.dtb\0" \
        "boardname=odroidxu3\0" \
        "mmcbootdev=0\0" \