Finish converting CONFIG_WATCHDOG, HW_WATCHDOG and WDT to Kconfig

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 400cea4..5052c72 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -97,11 +97,6 @@
 #define CONFIG_SYS_LBC_FLASH_BASE      CONFIG_SYS_FLASH1       /* Localbus flash start */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_LBC_FLASH_BASE /* start of FLASH     */
 
-#define CONFIG_SYS_BR0_PRELIM          0xfe001001      /* port size 16bit      */
-#define CONFIG_SYS_OR0_PRELIM          0xfe000030      /* 32MB Flash           */
-#define CONFIG_SYS_BR1_PRELIM          0xfc001001      /* port size 16bit      */
-#define CONFIG_SYS_OR1_PRELIM          0xfe000030      /* 32MB Flash           */
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     2               /* number of banks      */
 #define CONFIG_SYS_MAX_FLASH_SECT      256             /* sectors per device   */
 #undef CONFIG_SYS_FLASH_CHECKSUM
@@ -128,8 +123,6 @@
 #define CONFIG_SYS_FPGA_BASE           0xc0000000
 #define CONFIG_SYS_FPGA_SIZE           0x00100000      /* 1 MB         */
 #define CONFIG_SYS_HMI_BASE            0xc0010000
-#define CONFIG_SYS_BR3_PRELIM          0xc0001881      /* UPMA, 32-bit */
-#define CONFIG_SYS_OR3_PRELIM          0xfff00000      /* 1 MB         */
 
 #define CONFIG_SYS_NAND_BASE           (CONFIG_SYS_FPGA_BASE + 0x70)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
@@ -137,8 +130,6 @@
 /* LIME GDC */
 #define CONFIG_SYS_LIME_BASE           0xc8000000
 #define CONFIG_SYS_LIME_SIZE           0x04000000      /* 64 MB        */
-#define CONFIG_SYS_BR2_PRELIM          0xc80018a1      /* UPMB, 32-bit */
-#define CONFIG_SYS_OR2_PRELIM          0xfc000000      /* 64 MB        */
 
 #define CONFIG_SYS_SPD_BUS_NUM 0
 
@@ -190,8 +181,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#undef CONFIG_WATCHDOG                 /* watchdog disabled            */
-
 /*
  * Miscellaneous configurable options
  */
@@ -203,10 +192,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ   (8 << 20)       /* Initial Memory map for Linux */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port*/
-#endif
-
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
@@ -246,23 +231,22 @@
                "era fe000000 fe1dffff;"                                \
                "cp.b 100000 fe000000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
-       "update_fdt=tftp 100000 ${fdt_file};"                           \
+       "update_fdt=tftp 100000 ${fdt_file};"                           \
                "era fe1e0000 fe1fffff;"                                \
                "cp.b 100000 fe1e0000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
-       "update_initrd=tftp 100000 ${initrd_file};"                     \
+       "update_initrd=tftp 100000 ${initrd_file};"                     \
                "era fe200000 fe9fffff;"                                \
                "cp.b 100000 fe200000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
        "clean_data=era fea00000 fff5ffff\0"                            \
-       "usbargs=setenv bootargs root=/dev/sda1 rw\0"                   \
-       "load_usb=usb start;"                                           \
+       "usbargs=setenv bootargs root=/dev/sda1 rw\0"                   \
+       "load_usb=usb start;"                                           \
                "ext2load usb 0:1 ${kernel_addr_r} /boot/uImage\0"      \
        "boot_usb=run load_usb usbargs addcons;"                        \
                "bootm ${kernel_addr_r} - ${fdt_addr};"                 \
                "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
        ""
-#define CONFIG_BOOTCOMMAND     "run boot_nor"
 
 /* pass open firmware flat tree */