Merge tag 'dm-pull-18mar22' of https://source.denx.de/u-boot/custodians/u-boot-dm...

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

diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index d9a2f75..9d9ac03 100644 (file)
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -10,20 +10,11 @@
 
 #define CONFIG_HOSTNAME                        "stmark2"
 
-#define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define LDS_BOARD_TEXT                                         \
        board/sysam/stmark2/sbf_dram_init.o (.text*)
 
-#define CONFIG_TIMESTAMP
-
-#define CONFIG_BOOTCOMMAND                                     \
-       "sf probe 0:1 50000000; "                               \
-       "sf read ${loadaddr} 0x100000 ${kern_size}; "           \
-       "bootm ${loadaddr}"
-
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "kern_size=0x700000\0"                                  \
        "loadaddr=0x40001000\0"                                 \
@@ -48,10 +39,6 @@
 #define CONFIG_RTC_MCFRRTC
 #define CONFIG_SYS_MCFRRTC_BASE                0xFC0A8000
 
-/* spi not partitions */
-#define CONFIG_JFFS2_CMDLINE
-#define CONFIG_JFFS2_DEV               "nor0"
-
 /* Timer */
 #define CONFIG_MCFTMR
 
@@ -74,7 +61,6 @@
 /* Boot Argument Buffer Size    */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x10000)
 #define CONFIG_SYS_MBAR                        0xFC000000
 
 /*
@@ -112,8 +98,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN      (64 * 1024)
 /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
-/* Reserve 256 kB for malloc() */
-#define CONFIG_SYS_MALLOC_LEN          (256 << 10)
 
 /*
  * For booting Linux, the board info and command line data
@@ -128,12 +112,7 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 
-#if defined(CONFIG_CF_SBF)
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
-#endif
-
 /* Cache Configuration */
-#define CONFIG_SYS_CACHELINE_SIZE      16
 #define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 8)
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \