Skip to contentSkip to conversation

aspeed: un-hardcode FIT configuration selection

PATCH In review Brad Bishop 3 participants 4 messages Feb 2, 2018 – Feb 13, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 aspeed: un-hardcode FIT configuration selection

Rely on the FDT parser to select a FIT config when looking for a ramdisk_conf. This allows image builders to use arbitrary configuration names like /configurations/conf@foo.

---
 include/configs/ast-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ast-common.h +1 -1
index 89b0cd8533..fbae281811 100644
@@ -110,7 +110,7 @@
 
 #define CONFIG_BOOTCOMMAND	\
 	"fdt addr 20080000; " \
-	"if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \
+	"if fdt get value ramdisk_conf /configurations/conf ramdisk; then " \
 	"    bootm 20080000; else bootm 20080000 20300000; " \
 	"fi"
 #define CONFIG_ENV_OVERWRITE
Signature · 1 line
2.14.3
#1 lore raw
Quoted 3 lines · Brad Bishop

Rely on the FDT parser to select a FIT config when looking for a ramdisk_conf. This allows image builders to use arbitrary configuration names like /configurations/conf@foo.

Can you elaborate?

Do we even need this script? IIRC it was in place to support pre-FIT configurations where the initrd and the kernel were stored in seperate locations in flash. Now that all systems use FIT, we can simply say "bootm 2008000".

I suggest we don't need it, so we should change the environment to be

#define CONFIG_BOOTCOMMAND "bootm 20080000"

Cheers,

Joel

Quoted 21 lines
---
 include/configs/ast-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ast-common.h +1 -2
index 89b0cd8533..fbae281811 100644
@@ -110,7 +110,7 @@
 
 #define CONFIG_BOOTCOMMAND     \
        "fdt addr 20080000; " \
-       "if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \
+       "if fdt get value ramdisk_conf /configurations/conf ramdisk; then " \
        "    bootm 20080000; else bootm 20080000 20300000; " \
        "fi"
 #define CONFIG_ENV_OVERWRITE
--

2.14.3

#2 lore raw
Quoted 10 lines · Joel Stanley
Quoted 3 lines · Brad Bishop

Rely on the FDT parser to select a FIT config when looking for a ramdisk_conf. This allows image builders to use arbitrary configuration names like /configurations/conf@foo.

Can you elaborate?

Quoted 8 lines

Do we even need this script? IIRC it was in place to support pre-FIT configurations where the initrd and the kernel were stored in seperate locations in flash. Now that all systems use FIT, we can simply say "bootm 2008000".

I suggest we don't need it, so we should change the environment to be

#define CONFIG_BOOTCOMMAND "bootm 20080000”

Sounds good to me.

#3 lore raw

SGTM

Quoted 21 lines · Brad Bishop
Quoted 4 lines · Joel Stanley

On Fri, Feb 2, 2018 at 1:37 PM, Brad Bishop <[email protected]>

Quoted 6 lines · wrote:
Quoted 3 lines

Rely on the FDT parser to select a FIT config when looking for a ramdisk_conf. This allows image builders to use arbitrary configuration names like /configurations/conf@foo.

Can you elaborate?

Quoted 8 lines

Do we even need this script? IIRC it was in place to support pre-FIT configurations where the initrd and the kernel were stored in seperate locations in flash. Now that all systems use FIT, we can simply say "bootm 2008000".

I suggest we don't need it, so we should change the environment to be

#define CONFIG_BOOTCOMMAND "bootm 20080000”

Sounds good to me.