Convert CONFIG_SYS_MAX_FLASH_SECT to Kconfig

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

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 8b73900..526165c 100644 (file)
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -16,15 +16,6 @@
  * differences.
  */
 
-/*=====================*/
-/* Board and Processor */
-/*=====================*/
-
-#define CONFIG_XTFPGA
-
-/* FPGA CPU freq after init */
-#define CONFIG_SYS_CLK_FREQ            (gd->cpu_clk)
-
 /*===================*/
 /* RAM Layout        */
 /*===================*/
@@ -65,14 +56,7 @@
 # define CONFIG_SYS_MONITOR_LEN                0x00040000      /* 256KB */
 #endif
 
-#define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* heap  256KB */
-
-/* Linux boot param area in RAM (used only when booting linux) */
-#define CONFIG_SYS_BOOTPARAMS_LEN      (64  << 10)
-
 /* Memory test is destructive so default must not overlap vectors or U-Boot*/
-#define CONFIG_SYS_MEMTEST_START       MEMADDR(0x01000000)
-#define CONFIG_SYS_MEMTEST_END         MEMADDR(0x02000000)
 
 /* Load address for stand-alone applications.
  * MEMADDR cannot be used here, because the definition needs to be
@@ -100,21 +84,11 @@
 #define XTENSA_SYS_TEXT_ADDR           \
        (MEMADDR(CONFIG_SYS_MEMORY_SIZE) - CONFIG_SYS_MONITOR_LEN)
 
-/* Used by tftpboot; env var 'loadaddr' */
-#define CONFIG_SYS_LOAD_ADDR           MEMADDR(0x02000000)
-
 /*==============================*/
 /* U-Boot general configuration */
 /*==============================*/
 
-#define CONFIG_BOARD_POSTCLK_INIT
-
-#define CONFIG_BOOTFILE                        "uImage"
        /* Console I/O Buffer Size  */
-#define CONFIG_SYS_CBSIZE              1024
-       /* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
 /*==============================*/
 /* U-Boot autoboot configuration */
 /*==============================*/
@@ -176,8 +150,7 @@
 #define CONFIG_SYS_NS16550_COM1                IOADDR(0x0D050020) /* Base address */
 
 /* Input clk to NS16550 (in Hz; the SYS_CLK_FREQ is in kHz) */
-#define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_SYS_NS16550_CLK         get_board_sys_clk()
 
 /*======================*/
 /* Ethernet Driver Info */
@@ -191,30 +164,22 @@
 /* Flash & Environment */
 /*=====================*/
 
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
 #ifdef CONFIG_XTFPGA_LX60
 # define CONFIG_SYS_FLASH_SIZE         0x0040000       /* 4MB */
 # define CONFIG_SYS_FLASH_SECT_SZ      0x10000         /* block size 64KB */
 # define CONFIG_SYS_FLASH_PARMSECT_SZ  0x2000          /* param size  8KB */
 # define CONFIG_SYS_FLASH_BASE         IOADDR(0x08000000)
-# define CONFIG_SYS_MONITOR_BASE       CONFIG_SYS_FLASH_BASE
 #elif defined(CONFIG_XTFPGA_KC705)
 # define CONFIG_SYS_FLASH_SIZE         0x8000000       /* 128MB */
 # define CONFIG_SYS_FLASH_SECT_SZ      0x20000         /* block size 128KB */
 # define CONFIG_SYS_FLASH_PARMSECT_SZ  0x8000          /* param size 32KB */
 # define CONFIG_SYS_FLASH_BASE         IOADDR(0x00000000)
-# define CONFIG_SYS_MONITOR_BASE       IOADDR(0x06000000)
 #else
 # define CONFIG_SYS_FLASH_SIZE         0x1000000       /* 16MB */
 # define CONFIG_SYS_FLASH_SECT_SZ      0x20000         /* block size 128KB */
 # define CONFIG_SYS_FLASH_PARMSECT_SZ  0x8000          /* param size 32KB */
 # define CONFIG_SYS_FLASH_BASE         IOADDR(0x08000000)
-# define CONFIG_SYS_MONITOR_BASE       CONFIG_SYS_FLASH_BASE
 #endif
-#define CONFIG_SYS_MAX_FLASH_SECT      \
-       (CONFIG_SYS_FLASH_SECT_SZ/CONFIG_SYS_FLASH_PARMSECT_SZ + \
-        CONFIG_SYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ - 1)
 
 /*
  * Put environment in top block (64kB)
@@ -222,6 +187,5 @@
  */
 
 /* print 'E' for empty sector on flinfo */
-#define CONFIG_SYS_FLASH_EMPTY_INFO
 
 #endif /* __CONFIG_H */