Merge tag 'u-boot-at91-2023.04-a' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index d433bdd..58b5ee6 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -7,52 +7,20 @@
 #ifndef __CONFIG_ODROID_XU3_H
 #define __CONFIG_ODROID_XU3_H
 
-#include "exynos5420-common.h"
+#include <configs/exynos5420-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_BOARD_COMMON
-
-#define CONFIG_SYS_SDRAM_BASE          0x40000000
-
-/* select serial console configuration */
-#define CONFIG_SERIAL2                 /* use SERIAL 2 */
+#define CFG_SYS_SDRAM_BASE             0x40000000
 
 #define TZPC_BASE_OFFSET               0x10000
 
-#define SDRAM_BANK_SIZE                (256UL << 20UL) /* 256 MB */
-/* Reserve the last 22 MiB for the secure firmware */
-#define CONFIG_SYS_MEM_TOP_HIDE                (22UL << 20UL)
-#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
-
-#undef CONFIG_ENV_SIZE
-#undef CONFIG_ENV_OFFSET
-#define CONFIG_ENV_SIZE                        (SZ_1K * 16)
-#define CONFIG_ENV_OFFSET              (SZ_1K * 3136) /* ~3 MiB offset */
-
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
-
-#define CONFIG_DEFAULT_CONSOLE         "ttySAC2,115200n8"
-
-/* USB */
-#define CONFIG_USB_EHCI_EXYNOS
+#define SDRAM_BANK_SIZE                        (256UL << 20UL) /* 256 MB */
 
 /* DFU */
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_32M
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-#define DFU_MANIFEST_POLL_TIMEOUT       25000
+#define DFU_MANIFEST_POLL_TIMEOUT      25000
 
-/* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM   CONFIG_USB_GADGET_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM  0x685D
-
-/* UMS */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
-
-/* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
-#undef CONFIG_EXYNOS_TMU
-
-#define CONFIG_DFU_ALT_SYSTEM               \
+#define CFG_DFU_ALT_SYSTEM               \
        "uImage fat 0 1;"                   \
        "zImage fat 0 1;"                   \
        "Image.itb fat 0 1;"                \
@@ -62,17 +30,18 @@
        "exynos5422-odroidxu3.dtb fat 0 1;" \
        "exynos5422-odroidxu3-lite.dtb fat 0 1;" \
        "exynos5422-odroidxu4.dtb fat 0 1;" \
+       "exynos5422-odroidhc1.dtb fat 0 1;" \
        "boot part 0 1;"                    \
        "root part 0 2\0"
 
-#define CONFIG_DFU_ALT_BOOT_EMMC           \
+#define CFG_DFU_ALT_BOOT_EMMC           \
        "u-boot raw 0x3e 0x800 mmcpart 1;" \
        "bl1 raw 0x0 0x1e mmcpart 1;"      \
        "bl2 raw 0x1e 0x1d mmcpart 1;"     \
        "tzsw raw 0x83e 0x200 mmcpart 1;"  \
        "params.bin raw 0x1880 0x20\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD   \
+#define CFG_DFU_ALT_BOOT_SD   \
        "u-boot raw 0x3f 0x800;" \
        "bl1 raw 0x1 0x1e;"      \
        "bl2 raw 0x1f 0x1d;"     \
@@ -80,35 +49,33 @@
        "params.bin raw 0x1880 0x20\0"
 
 /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */
-#define CONFIG_MISC_COMMON
-#define CONFIG_MISC_INIT_R
-#define CONFIG_SET_DFU_ALT_INFO
-#define CONFIG_SET_DFU_ALT_BUF_LEN     (SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN        (SZ_1K)
 
-/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
-#define CONFIG_ODROID_REV_AIN                  9
-#define CONFIG_REVISION_TAG
-#define CONFIG_BOARD_TYPES
+/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
+#define CFG_ODROID_REV_AIN             9
 
-#undef CONFIG_SYS_BOARD
-#define CONFIG_SYS_BOARD       "odroid"
+/*
+ * Need to override existing one (smdk5420) with odroid so set_board_info will
+ * use proper prefix when creating full board_name (SYS_BOARD + type)
+ */
 
 /* Define new extra env settings, including DFU settings */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
        EXYNOS_DEVICE_SETTINGS \
        EXYNOS_FDTFILE_SETTING \
        MEM_LAYOUT_ENV_SETTINGS \
        BOOTENV \
        "rootfstype=ext4\0" \
-       "console=" CONFIG_DEFAULT_CONSOLE "\0"\
+       "console=console=ttySAC2,115200n8\0" \
        "fdtfile=exynos5422-odroidxu3.dtb\0" \
-       "boardname=odroidxu3\0" \
+       "board=odroid\0" \
+       "board_name=odroidxu3\0" \
        "mmcbootdev=0\0" \
        "mmcrootdev=0\0" \
        "mmcbootpart=1\0" \
        "mmcrootpart=2\0" \
-       "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \
+       "dfu_alt_system="CFG_DFU_ALT_SYSTEM \
        "dfu_alt_info=Autoset by THOR/DFU command run.\0"
 
 #endif /* __CONFIG_H */