Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-samsung

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

diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 004b2b3..bd4bac7 100644 (file)
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -33,15 +33,11 @@
 
 /* Misc CPU related */
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_SERIAL_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_CMDLINE_TAG                     /* enable passing of ATAGs */
-#define CONFIG_MISC_INIT_R                     /* Call misc_init_r */
-
-#define CONFIG_PREBOOT                         /* enable preboot variable */
 
 /*
  * Hardware drivers
@@ -59,12 +55,9 @@
 #define PHYS_SDRAM                                     ATMEL_BASE_CS1 /* 0x20000000 */
 #define PHYS_SDRAM_SIZE                                0x02000000     /* 32 MByte */
 
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_SDRAM_SIZE          PHYS_SDRAM_SIZE
 
-#define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE + 0x00100000)
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x01E00000)
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x00100000)
 
 /*
@@ -77,7 +70,6 @@
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-# define CONFIG_NAND_ATMEL
 # define CONFIG_SYS_MAX_NAND_DEVICE            1
 # define CONFIG_SYS_NAND_BASE                  ATMEL_BASE_CS3 /* 0x40000000 */
 # define CONFIG_SYS_NAND_DBW_8
@@ -99,16 +91,10 @@
 #ifdef CONFIG_SYS_USE_DATAFLASH
 
 /* bootstrap + u-boot + env in dataflash on CS0 */
-#define CONFIG_ENV_OFFSET      0x4200
-#define CONFIG_ENV_SIZE                0x4200
-#define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 
 #elif CONFIG_SYS_USE_NANDFLASH
 
 /* bootstrap + u-boot + env + linux in nandflash */
-# define CONFIG_ENV_OFFSET             0xC0000
-# define CONFIG_ENV_SIZE               0x20000
 
 #endif