diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2010-02-06 17:20:09 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-02-06 17:20:09 +0900 |
commit | bdaef38171c9ea030bae46b798aba4f430dcac18 (patch) | |
tree | 4da072aceaa42e7ff3ec9962f5d99a9ca667ace9 /include/configs/kmeter1.h | |
parent | ed44387f406ca0e695609270a1282e699111a945 (diff) | |
parent | c20a3c0bac909a0a1311eaafdec156b6a8686d46 (diff) | |
download | u-boot-imx-bdaef38171c9ea030bae46b798aba4f430dcac18.zip u-boot-imx-bdaef38171c9ea030bae46b798aba4f430dcac18.tar.gz u-boot-imx-bdaef38171c9ea030bae46b798aba4f430dcac18.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm_cortexa8/s5pc1xx/cache.c
include/configs/spear6xx.h
lib_ppc/reloc.S
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'include/configs/kmeter1.h')
-rw-r--r-- | include/configs/kmeter1.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 71658d8..0327b97 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -33,6 +33,8 @@ /* include common defines/options for all Keymile boards */ #include "keymile-common.h" +#define CONFIG_KM_UBI_PARTITION_NAME "ubi0" + #define MTDIDS_DEFAULT "nor0=boot" #define MTDPARTS_DEFAULT \ "mtdparts=boot:768k(u-boot),128k(env),128k(envred)," \ @@ -449,11 +451,6 @@ #define CONFIG_PRAM 512 /* protected RAM [KBytes] */ -#define MTDIDS_DEFAULT "nor2=app" -#define MTDPARTS_DEFAULT \ - "mtdparts=app:256k(u-boot),128k(env),128k(envred)," \ - "1536k(esw0),8704k(rootfs0),1536k(esw1),2432k(rootfs1),640k(var),768k(cfg)" - /* * Environment Configuration */ |