diff options
author | Wolfgang Denk <wd@denx.de> | 2010-01-26 22:32:38 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-01-26 22:32:38 +0100 |
commit | 797312a15edc9dfb433e6903a75189030e7aaaaa (patch) | |
tree | 390ff511ada886225af9169492272dcf76aff1a0 | |
parent | 0a42c3a433e25dd30b5062aa251f5a240478cbbb (diff) | |
parent | 8b1760ed9a35a5fd71d1f64981068ca2979f1e3d (diff) | |
download | u-boot-imx-797312a15edc9dfb433e6903a75189030e7aaaaa.zip u-boot-imx-797312a15edc9dfb433e6903a75189030e7aaaaa.tar.gz u-boot-imx-797312a15edc9dfb433e6903a75189030e7aaaaa.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
-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 */ |