config: Move CONFIG_BOARD_LATE_INIT to defconfigs

[people/ms/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 e74f85f604527bb535db7eab206fb7887dd740e0..bcde7681ab335a53580fe70797f1cdc3417b67e4 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -20,6 +20,7 @@
 #ifndef _CONFIG_KM_ARM_H
 #define _CONFIG_KM_ARM_H
 
+
 /* We got removed from Linux mach-types.h */
 #define MACH_TYPE_KM_KIRKWOOD          2255
 
@@ -28,7 +29,6 @@
  */
 #define CONFIG_MARVELL
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 #define CONFIG_MACH_KM_KIRKWOOD                /* Machine type */
 
@@ -41,7 +41,6 @@
 #include "keymile-common.h"
 
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_SF
 
 /* SPI NOR Flash default params, used by sf commands */
 #define CONFIG_SF_DEFAULT_SPEED                8100000
@@ -70,7 +69,8 @@
 #define CONFIG_KM_PHRAM                0x17F000
 
 #define CONFIG_KM_CRAMFS_ADDR  0x2400000
-#define CONFIG_KM_KERNEL_ADDR  0x2000000       /* 4096KBytes */
+#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                                    \
@@ -78,10 +78,15 @@
                " boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}"
 
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "boot=bootm ${load_addr_r} - -\0"                               \
-       "cramfsloadfdt=true\0"                                          \
        "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0"           \
        CONFIG_KM_UPDATE_UBOOT                                          \
+       "set_fdthigh=setenv fdt_high ${kernelmem}\0"                    \
+       "checkfdt="                                                     \
+               "if cramfsls fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; " \
+               "then true; else setenv cramfsloadfdt true; "           \
+               "setenv boot bootm ${load_addr_r}; "                    \
+               "echo No FDT found, booting with the kernel "           \
+               "appended one; fi\0"                                    \
        ""
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
@@ -90,7 +95,6 @@
 /*
  * NS16550 Configuration
  */
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_TCLK
@@ -118,16 +122,12 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_NFS
 
 /*
  * Without NOR FLASH we need this
  */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 /*
  * NAND Flash configuration
@@ -146,10 +146,8 @@
 /*
  * Other required minimal configurations
  */
-#define CONFIG_CONSOLE_INFO_QUIET      /* some code reduction */
 #define CONFIG_ARCH_CPU_INIT           /* call arch_cpu_init() */
 #define CONFIG_ARCH_MISC_INIT          /* call arch_misc_init() */
-#define CONFIG_DISPLAY_CPUINFO         /* Display cpu info */
 #define CONFIG_NR_DRAM_BANKS   4
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 
@@ -158,7 +156,6 @@
  */
 #define CONFIG_NETCONSOLE      /* include NetConsole support   */
 #define CONFIG_MII             /* expose smi ove miiphy interface */
-#define CONFIG_CMD_MII         /* to debug mdio phy config */
 #define CONFIG_MVGBE           /* Enable Marvell Gbe Controller Driver */
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */
 #define CONFIG_MVGBE_PORTS     {1, 0}  /* enable port 0 only */
@@ -191,7 +188,7 @@
                                }
 
 #ifndef __ASSEMBLY__
-#include <asm/arch-kirkwood/gpio.h>
+#include <asm/arch/gpio.h>
 extern void __set_direction(unsigned pin, int high);
 void set_sda(int state);
 void set_scl(int state);
@@ -216,7 +213,6 @@ int get_scl(void);
 #define        CONFIG_SYS_I2C_SOFT_SPEED       100000
 
 /* EEprom support 24C128, 24C256 valid for environment eeprom */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      6 /* 64 Byte write page */
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
@@ -242,15 +238,13 @@ int get_scl(void);
 #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      KM_ENV_BUS
+#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
 
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_STMICRO
 
 /* SPI bus claim MPP configuration */
 #define CONFIG_SYS_KW_SPI_MPP  0x0
@@ -289,10 +283,15 @@ int get_scl(void);
                " ${addr} " __stringify(CONFIG_ENV_OFFSET_REDUND) " 4\0"
 #endif
 
+#ifndef CONFIG_KM_BOARD_EXTRA_ENV
+#define CONFIG_KM_BOARD_EXTRA_ENV       ""
+#endif
+
 /*
  * Default environment variables
  */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       CONFIG_KM_BOARD_EXTRA_ENV                                       \
        CONFIG_KM_DEF_ENV                                               \
        CONFIG_KM_NEW_ENV                                               \
        "arch=arm\0"                                                    \
@@ -325,6 +324,5 @@ int get_scl(void);
 #define CONFIG_CMD_DIAG
 
 /* we do the whole PCIe FPGA config stuff here */
-#define        CONFIG_BOARD_LATE_INIT
 
 #endif /* _CONFIG_KM_ARM_H */