X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2FM54418TWR.h;h=7552f4daf6608b91504ed812309638363a1c0b3f;hb=8f1a80e99e4a838d1540cdb1d59ccc7785fe4618;hp=f4d970d0d869804953de45e065559d011beb917e;hpb=c2774e6149a6bedb0941deefec84665119e685a4;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index f4d970d..7552f4d 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -36,10 +36,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* Command line configuration */ -#undef CONFIG_CMD_NAND -#define CONFIG_CMD_REGINFO - /* * NAND FLASH */ @@ -273,20 +269,17 @@ * Environment is embedded in u-boot in the second sector of the flash */ #if !defined(CONFIG_SERIAL_BOOT) /*MRAM boot*/ -#define CONFIG_ENV_IS_IN_MRAM 1 #define CONFIG_ENV_ADDR (0x40000 - 0x1000) /*MRAM size 40000*/ #define CONFIG_ENV_SIZE 0x1000 #endif #if defined(CONFIG_CF_SBF) -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SPI_CS 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x10000 #endif #if defined(CONFIG_SYS_NAND_BOOT) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OFFSET 0x80000 #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 @@ -325,7 +318,6 @@ #ifdef CONFIG_CMD_JFFS2 #define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_PART_OFFSET (0x800000) -#define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE #define MTDIDS_DEFAULT "nand0=m54418twr.nand" @@ -336,10 +328,8 @@ #endif #ifdef CONFIG_CMD_UBI -#define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE /* needed for mtdparts command */ #define CONFIG_MTD_PARTITIONS /* mtdparts and UBI support */ -#define CONFIG_RBTREE #define MTDIDS_DEFAULT "nand0=NAND" #define MTDPARTS_DEFAULT "mtdparts=NAND:1m(u-boot)," \ "-(ubi)"