Skip to contentSkip to conversation

aspeed: Drop bootcmd support for legacy images

PATCH Applied Brad Bishop 2 participants 2 messages Feb 16, 2018 – Feb 20, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 aspeed: Drop bootcmd support for legacy images

Assume booting from a FIT image by default. This allows image builders to use arbitrary configuration names like /configurations/conf@foo.

---
v2:
- Reworked to drop legacy image support entirely.
- Updated commit message accordingly.

 include/configs/ast-common.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
include/configs/ast-common.h +1 -5
index 89b0cd8533..eff6d2b529 100644
@@ -108,11 +108,7 @@
 #define CONFIG_ENV_OFFSET		0x60000	/* environment starts here  */
 #define CONFIG_ENV_SIZE			0x20000	/* Total Size of Environment Sector */
 
-#define CONFIG_BOOTCOMMAND	\
-	"fdt addr 20080000; " \
-	"if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \
-	"    bootm 20080000; else bootm 20080000 20300000; " \
-	"fi"
+#define CONFIG_BOOTCOMMAND		"bootm 20080000"
 #define CONFIG_ENV_OVERWRITE
 
 #define ASPEED_ENV_SETTINGS \
Signature · 1 line
2.14.3
Applied
#1 lore raw
Quoted 5 lines · Brad Bishop

Assume booting from a FIT image by default. This allows image builders to use arbitrary configuration names like /configurations/conf@foo.

Applied. Thanks!

Cheers,

Joel

Quoted 27 lines

---
v2:
- Reworked to drop legacy image support entirely.
- Updated commit message accordingly.

 include/configs/ast-common.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
include/configs/ast-common.h +1 -6
index 89b0cd8533..eff6d2b529 100644
@@ -108,11 +108,7 @@
 #define CONFIG_ENV_OFFSET              0x60000 /* environment starts here  */
 #define CONFIG_ENV_SIZE                        0x20000 /* Total Size of Environment Sector */
 
-#define CONFIG_BOOTCOMMAND     \
-       "fdt addr 20080000; " \
-       "if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \
-       "    bootm 20080000; else bootm 20080000 20300000; " \
-       "fi"
+#define CONFIG_BOOTCOMMAND             "bootm 20080000"
 #define CONFIG_ENV_OVERWRITE
 
 #define ASPEED_ENV_SETTINGS \
--

2.14.3