common: Drop linux/delay.h from common header

[oweals/u-boot.git] / include / configs / km / km_arm.h

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index a2e9cf1fa5bcec1dd5593ba3dd8163c971d32e11..79edfa728a54e3471e405ca8972f5f55d234ccc5 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -32,29 +32,13 @@
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
-/* SPI NOR Flash default params, used by sf commands */
-
-#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#endif
-
 /* Reserve 4 MB for malloc */
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 #include "asm/arch/config.h"
 
-#define CONFIG_SYS_MEMTEST_START 0x00400000    /* 4M */
-#define CONFIG_SYS_MEMTEST_END 0x007fffff      /*(_8M -1) */
 #define CONFIG_SYS_LOAD_ADDR   0x00800000      /* default load adr- 8M */
 
-/* pseudo-non volatile RAM [hex] */
-#define CONFIG_KM_PNVRAM       0x80000
-/* physical RAM MTD size [hex] */
-#define CONFIG_KM_PHRAM                0x17F000
-
-#define CONFIG_KM_CRAMFS_ADDR  0x2400000
-#define CONFIG_KM_KERNEL_ADDR  0x2000000       /* 3098KBytes */
-#define CONFIG_KM_FDT_ADDR     0x23E0000       /*  128KBytes */
-
 /* architecture specific default bootargs */
 #define CONFIG_KM_DEF_BOOT_ARGS_CPU                                    \
                "bootcountaddr=${bootcountaddr} ${mtdparts}"            \
@@ -74,27 +58,11 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 
-/*
- * NS16550 Configuration
- */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_TCLK
-#define CONFIG_SYS_NS16550_COM1                KW_UART0_BASE
-#define CONFIG_SYS_NS16550_COM2                KW_UART1_BASE
-
-/*
- * Serial Port configuration
- * The following definitions let you select what serial you want to use
- * for your console driver.
- */
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_BOOTMAPSZ       (8 << 20)       /* Initial Memmap for Linux */
 #define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs  */
 #define CONFIG_INITRD_TAG              /* enable INITRD tag */
 #define CONFIG_SETUP_MEMORY_TAGS       /* enable memory tag */
@@ -104,30 +72,16 @@
  */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
-#define BOOTFLASH_START                0x0
-
-/* Kirkwood has two serial IF */
-#if (CONFIG_CONS_INDEX == 2)
-#define CONFIG_KM_CONSOLE_TTY  "ttyS1"
-#else
-#define CONFIG_KM_CONSOLE_TTY  "ttyS0"
-#endif
-
 /*
  * Other required minimal configurations
  */
-#define CONFIG_ARCH_CPU_INIT           /* call arch_cpu_init() */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_NETCONSOLE      /* include NetConsole support   */
-#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */
+#define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer autoneg timeout */
 #define CONFIG_MVGBE_PORTS     {1, 0}  /* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR    0
-#define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
-#define CONFIG_KM_COMMON_ETH_INIT /* standard km ethernet_present for piggy */
 
 /*
  * I2C related stuff
@@ -150,6 +104,8 @@
 
 #ifndef __ASSEMBLY__
 #include <asm/arch/gpio.h>
+#include <linux/delay.h>
+#include <linux/stringify.h>
 extern void __set_direction(unsigned pin, int high);
 void set_sda(int state);
 void set_scl(int state);
@@ -185,30 +141,14 @@ int get_scl(void);
  *  Environment variables configurations
  */
 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#define CONFIG_ENV_OFFSET              0xc0000     /* no bracets! */
-#define CONFIG_ENV_SIZE                        0x02000     /* Size of Environment */
-#define CONFIG_ENV_SECT_SIZE           0x10000
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
-                                       CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_TOTAL_SIZE          0x20000     /* no bracets! */
 #else
 #define CONFIG_SYS_DEF_EEPROM_ADDR     0x50
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_EEPROM_WREN
-#define CONFIG_ENV_OFFSET              0x0 /* no bracets! */
-#define CONFIG_ENV_SIZE                        (0x2000 - CONFIG_ENV_OFFSET)
 #define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
-#define CONFIG_ENV_OFFSET_REDUND       0x2000 /* no bracets! */
-#define CONFIG_ENV_SIZE_REDUND         (CONFIG_ENV_SIZE)
 #endif
 
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
-
-/* SPI bus claim MPP configuration */
-#define CONFIG_SYS_KW_SPI_MPP  0x0
-
-#define FLASH_GPIO_PIN                 0x00010000
 #define KM_FLASH_GPIO_PIN      16
 
 #define        CONFIG_KM_UPDATE_UBOOT                                          \
@@ -246,19 +186,9 @@ int get_scl(void);
        "arch=arm\0"                                                    \
        ""
 
-#if !defined(CONFIG_MTD_NOR_FLASH)
-#undef CONFIG_JFFS2_CMDLINE
-#endif
-
 /* additions for new relocation code, must be added to all boards */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-/* Do early setups now in board_init_f() */
 
-/*
- * resereved pram area at the end of memroy [hex]
- * 8Mbytes for switch + 4Kbytes for bootcount
- */
-#define CONFIG_KM_RESERVED_PRAM 0x801000
 /* address for the bootcount (taken from end of RAM) */
 #define BOOTCOUNT_ADDR          (CONFIG_KM_RESERVED_PRAM)
 
@@ -267,6 +197,4 @@ int get_scl(void);
 #define CONFIG_POST_SKIP_ENV_FLAGS
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS
 
-/* we do the whole PCIe FPGA config stuff here */
-
 #endif /* _CONFIG_KM_ARM_H */