diff options
| author | Holger Brunck <holger.brunck@keymile.com> | 2011-07-04 21:27:16 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-27 23:42:53 +0200 |
| commit | db0bb572d1fd154052c2d7d4685fbee356ed60f4 (patch) | |
| tree | 02869e329414580d202ecfd1a8b91d7a0b571a4d /include/configs/km/km_arm.h | |
| parent | 54193c5d8133f4f35267f412e5c1bbcbc6ac041c (diff) | |
km/common: rework and simplify default environment
This is the second step to simplify and decrease the default
environment for the keymile boards. The release usecase formaly
used to set the production environment was removed and the default
configuration is now the production environment. So the formar
environment variable "release" which has done a lot of things
in the past, simply erase the current environment and do a reset
which forces u-boot to setup the default environment again.
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/km/km_arm.h')
| -rw-r--r-- | include/configs/km/km_arm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index f1eea26320..7eb5cd49f6 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -67,12 +67,12 @@ #define CONFIG_KM_CRAMFS_ADDR 0x2400000 #define CONFIG_KM_KERNEL_ADDR 0x2000000 /* 4096KBytes */ +/* architecture specific default bootargs */ +#define CONFIG_KM_DEF_BOOT_ARGS_CPU \ + "bootcountaddr=${bootcountaddr} ${mtdparts}" + #define CONFIG_KM_DEF_ENV_CPU \ - "addbootcount=" \ - "setenv bootargs ${bootargs} " \ - "bootcountaddr=${bootcountaddr}\0" \ - "addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0" \ - "boot=bootm ${actual_kernel_addr} - -\0" \ + "boot=bootm ${load_addr_r} - -\0" \ "cramfsloadfdt=true\0" \ CONFIG_KM_DEF_ENV_UPDATE \ "" @@ -229,7 +229,7 @@ int get_scl(void); #define CONFIG_KM_DEF_ENV_UPDATE \ "update=" \ "spi on;sf probe 0;sf erase 0 50000;" \ - "sf write ${u-boot_addr_r} 0 ${filesize};" \ + "sf write ${load_addr_r} 0 ${filesize};" \ "spi off\0" /* |