Merge tag 'v2022.01-rc4' into next

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

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 65e1c7c..1caeed6 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -14,27 +14,11 @@
 #define CONFIG_EXYNOS4210              1       /* which is a EXYNOS4210 SoC */
 #define CONFIG_ORIGEN                  1       /* working with ORIGEN*/
 
-#define CONFIG_SYS_DCACHE_OFF          1
-
 /* ORIGEN has 4 bank of DRAM */
-#define CONFIG_NR_DRAM_BANKS           4
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
 #define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x6000000)
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
-#define CONFIG_MACH_TYPE               MACH_TYPE_ORIGEN
-
-/* select serial console configuration */
-#define CONFIG_SERIAL2
-
-/* Console configuration */
-#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
-
 #define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
@@ -46,7 +30,6 @@
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR    0x02020030
-#define CONFIG_SPL_TEXT_BASE   0x02021410
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x40007000\0" \
@@ -62,33 +45,14 @@
         "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
         "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
                 "source ${loadaddr}\0"
-#define CONFIG_BOOTCOMMAND \
-       "if mmc rescan; then " \
-               "echo SD/MMC found on device ${mmcdev};" \
-               "if run loadbootenv; then " \
-                       "echo Loaded environment from ${bootenv};" \
-                       "run importbootenv;" \
-               "fi;" \
-               "if test -n $uenvcmd; then " \
-                       "echo Running uenvcmd ...;" \
-                       "run uenvcmd;" \
-               "fi;" \
-               "if run loadbootscript; then " \
-                       "run bootscript; " \
-               "fi; " \
-       "fi;" \
-       "load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
 
 #define CONFIG_CLK_1000_400_200
 
 /* MIU (Memory Interleaving Unit) */
 #define CONFIG_MIU_2BIT_21_7_INTERLEAVED
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_ENV_SIZE                        (16 << 10)      /* 16 KB */
 #define RESERVE_BLOCK_SIZE             (512)
 #define BL1_SIZE                       (16 << 10) /*16 K reserved for BL1*/
-#define CONFIG_ENV_OFFSET              (RESERVE_BLOCK_SIZE + BL1_SIZE)
 
 #define CONFIG_SPL_MAX_FOOTPRINT       (14 * 1024)