Merge tag 'u-boot-stm32-20211110' of https://source.denx.de/u-boot/custodians/u-boot-stm

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

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 0322991..281922a 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -19,8 +19,6 @@
 #define CONFIG_SYS_PL310_BASE  0x10502000
 #endif
 
-#define CONFIG_MACH_TYPE       4289
-
 #define CONFIG_SYS_SDRAM_BASE  0x40000000
 #define SDRAM_BANK_SIZE                (256 << 20)     /* 256 MB */
 #define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
@@ -28,26 +26,15 @@
 #define CONFIG_SYS_MEM_TOP_HIDE                (1UL << 20UL)
 #define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
 
-/* memtest works on */
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
 #include <linux/sizes.h>
 
-/* select serial console configuration */
-
-/* Console configuration */
-
 #define CONFIG_BOOTCOMMAND             "run distro_bootcmd ; run autoboot"
-#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
 
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-#define CONFIG_ENV_OVERWRITE
-
 /* Partitions name */
 #define PARTS_BOOT             "boot"
 #define PARTS_ROOT             "platform"
@@ -152,7 +139,7 @@
                "elif test -e mmc ${mmcbootdev} uImage; then; " \
                        "run boot_uimg;" \
                "fi;\0" \
-       "console=" CONFIG_DEFAULT_CONSOLE \
+       "console=console=ttySAC1,115200n8\0" \
        "mmcbootdev=0\0" \
        "mmcbootpart=1\0" \
        "mmcrootdev=0\0" \
@@ -182,6 +169,4 @@
  */
 #define CONFIG_MISC_COMMON
 
-#undef CONFIG_REVISION_TAG
-
 #endif /* __CONFIG_H */