configs: Migrate RBTREE, LZO, CMD_MTDPARTS, CMD_UBI and CMD_UBIFS

[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 98aec7c1f3b3163249ab562fb7e0c1acc91caafc..02e8a97f2fc407efc2c0c73cd70aa97e3ef4e6b4 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -20,10 +20,6 @@
 #ifndef _CONFIG_KM_ARM_H
 #define _CONFIG_KM_ARM_H
 
-
-/* We got removed from Linux mach-types.h */
-#define MACH_TYPE_KM_KIRKWOOD          2255
-
 /*
  * High Level Configuration Options (easy to change)
  */
@@ -119,16 +115,6 @@
 #define CONFIG_INITRD_TAG              /* enable INITRD tag */
 #define CONFIG_SETUP_MEMORY_TAGS       /* enable memory tag */
 
-/*
- * Commands configuration
- */
-#define CONFIG_CMD_MTDPARTS
-
-/*
- * Without NOR FLASH we need this
- */
-#define CONFIG_SYS_NO_FLASH
-
 /*
  * NAND Flash configuration
  */
@@ -147,7 +133,6 @@
  * Other required minimal configurations
  */
 #define CONFIG_ARCH_CPU_INIT           /* call arch_cpu_init() */
-#define CONFIG_ARCH_MISC_INIT          /* call arch_misc_init() */
 #define CONFIG_NR_DRAM_BANKS   4
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 
@@ -163,11 +148,6 @@
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
 #define CONFIG_KM_COMMON_ETH_INIT /* standard km ethernet_present for piggy */
 
-/*
- * UBI related stuff
- */
-#define CONFIG_SYS_USE_UBI
-
 /*
  * I2C related stuff
  */
@@ -297,7 +277,7 @@ int get_scl(void);
        "arch=arm\0"                                                    \
        ""
 
-#if defined(CONFIG_SYS_NO_FLASH)
+#if !defined(CONFIG_MTD_NOR_FLASH)
 #undef CONFIG_FLASH_CFI_MTD
 #undef CONFIG_JFFS2_CMDLINE
 #endif
@@ -305,7 +285,6 @@ int get_scl(void);
 /* 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() */
-#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * resereved pram area at the end of memroy [hex]
@@ -321,9 +300,7 @@ int get_scl(void);
 #define CONFIG_POST    (CONFIG_SYS_POST_MEM_REGIONS)
 #define CONFIG_POST_SKIP_ENV_FLAGS
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS
-#define CONFIG_CMD_DIAG
 
 /* we do the whole PCIe FPGA config stuff here */
-#define        CONFIG_BOARD_LATE_INIT
 
 #endif /* _CONFIG_KM_ARM_H */