summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/at91sam9x5ek.h5
-rw-r--r--include/configs/emsdp.h (renamed from include/configs/emdk.h)10
-rw-r--r--include/environment/ti/boot.h1
3 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index d48b7d0785..63305a7cdd 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -85,8 +85,9 @@
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read " \
- "0x22000000 0x200000 0x300000; " \
- "bootm 0x22000000"
+ "0x22000000 0x200000 0x600000; " \
+ "nand read 0x21000000 0x180000 0x20000; " \
+ "bootz 0x22000000 - 0x21000000"
#elif defined(CONFIG_SPI_BOOT)
/* bootstrap + u-boot + env + linux in spi flash */
#define CONFIG_ENV_OFFSET 0x5000
diff --git a/include/configs/emdk.h b/include/configs/emsdp.h
index dca13e2fff..385d59e338 100644
--- a/include/configs/emdk.h
+++ b/include/configs/emsdp.h
@@ -3,8 +3,8 @@
* Copyright (C) 2018 Synopsys, Inc. All rights reserved.
*/
-#ifndef _CONFIG_EMDK_H_
-#define _CONFIG_EMDK_H_
+#ifndef _CONFIG_EMSDP_H_
+#define _CONFIG_EMSDP_H_
#include <linux/sizes.h>
@@ -30,11 +30,11 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"upgrade_image=u-boot.bin\0" \
- "upgrade=emdk rom unlock && " \
+ "upgrade=emsdp rom unlock && " \
"fatload mmc 0 ${loadaddr} ${upgrade_image} && " \
"cp.b ${loadaddr} 0 ${filesize} && " \
"dcache flush && " \
- "emdk rom lock\0"
+ "emsdp rom lock\0"
-#endif /* _CONFIG_EMDK_H_ */
+#endif /* _CONFIG_EMSDP_H_ */
diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
index 560753ae4c..3c9c87f21b 100644
--- a/include/environment/ti/boot.h
+++ b/include/environment/ti/boot.h
@@ -93,7 +93,6 @@
AVB_VERIFY_CHECK \
"part start mmc ${mmcdev} boot boot_start; " \
"part size mmc ${mmcdev} boot boot_size; " \
- "mmc read ${fdtaddr} ${fdt_start} ${fdt_size}; " \
"mmc read ${loadaddr} ${boot_start} ${boot_size}; " \
"bootm ${loadaddr}#${fdtfile};\0 "