Skip to contentSkip to conversation

nios2: Enable support for fitImage

PATCH New Marek Vasut 2 participants 7 messages Dec 16, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 nios2: Enable support for fitImage

The uImage format is legacy for years now, enable support for the fitImage format, which allows combining multiple files (kernel and dtb) into a single file, offers better protection of the payload and so on.

---
 configs/10m50_defconfig | 1 +
 configs/3c120_defconfig | 1 +
 2 files changed, 2 insertions(+)

V2: Move CONFIG_FIT into Kconfig
Drop duplicate CONFIG_OF_LIBFDT definition

configs/10m50_defconfig +1 -0
index 0d18e8d..c179a0f 100644
@@ -25,3 +25,4 @@ CONFIG_ALTERA_TSE=y
 CONFIG_SYS_NS16550=y
 CONFIG_TIMER=y
 CONFIG_ALTERA_TIMER=y
+CONFIG_FIT=y
configs/3c120_defconfig +1 -0
index 8bc13f3..2fdff87 100644
@@ -26,3 +26,4 @@ CONFIG_ALTERA_JTAG_UART=y
 CONFIG_ALTERA_JTAG_UART_BYPASS=y
 CONFIG_TIMER=y
 CONFIG_ALTERA_TIMER=y
+CONFIG_FIT=y
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 2/2 nios2: Soup up the shell experience

Enable command auto completion and enable $version variable. This makes working with U-Boot far more enjoyable.

---
 include/configs/10m50_devboard.h | 2 ++
 include/configs/3c120_devboard.h | 2 ++
 2 files changed, 4 insertions(+)

V2: Drop the default prompt setting

include/configs/10m50_devboard.h +2 -0
index 608127f..8dfe2a8 100644
@@ -99,6 +99,8 @@
 					 CONFIG_ENV_SIZE - \
 					 CONFIG_SYS_MALLOC_LEN -	\
 					 0x10000)
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
 #endif /* __CONFIG_H */
include/configs/3c120_devboard.h +2 -0
index 6c9dc3f..2e94b69 100644
@@ -102,6 +102,8 @@
 					 CONFIG_ENV_SIZE - \
 					 CONFIG_SYS_MALLOC_LEN -	\
 					 0x10000)
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
 #endif /* __CONFIG_H */
Signature · 1 line
2.1.4
#2 lore raw

PATCH v2 2/2 nios2: Soup up the shell experience

Hi Marek,

Quoted 31 lines · Marek Vasut

Enable command auto completion and enable $version variable. This makes working with U-Boot far more enjoyable.

---
  include/configs/10m50_devboard.h | 2 ++
  include/configs/3c120_devboard.h | 2 ++
  2 files changed, 4 insertions(+)

V2: Drop the default prompt setting

include/configs/10m50_devboard.h +2 -0
index 608127f..8dfe2a8 100644
@@ -99,6 +99,8 @@
  					 CONFIG_ENV_SIZE - \
  					 CONFIG_SYS_MALLOC_LEN -	\
  					 0x10000)
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_AUTO_COMPLETE
  #define CONFIG_CMDLINE_EDITING
 
  #endif /* __CONFIG_H */
include/configs/3c120_devboard.h +0 -0
index 6c9dc3f..2e94b69 100644

include/configs/3c120_devboard.h line 109

Quoted 8 lines
include/configs/3c120_devboard.h +2 -0
@@ -102,6 +102,8 @@
  					 CONFIG_ENV_SIZE - \
  					 CONFIG_SYS_MALLOC_LEN -	\
  					 0x10000)
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_AUTO_COMPLETE
  #define CONFIG_CMDLINE_EDITING
 
  #endif /* __CONFIG_H */

Applied to u-boot-nios. Thanks.

Best regards,
Thomas

#3 lore raw

PATCH v2 1/2 nios2: Enable support for fitImage

In reply to Marek Vasut

Hi Marek,

Quoted 30 lines · Marek Vasut

The uImage format is legacy for years now, enable support for the fitImage format, which allows combining multiple files (kernel and dtb) into a single file, offers better protection of the payload and so on.

---
  configs/10m50_defconfig | 1 +
  configs/3c120_defconfig | 1 +
  2 files changed, 2 insertions(+)

V2: Move CONFIG_FIT into Kconfig
Drop duplicate CONFIG_OF_LIBFDT definition

configs/10m50_defconfig +1 -0
index 0d18e8d..c179a0f 100644
@@ -25,3 +25,4 @@ CONFIG_ALTERA_TSE=y
  CONFIG_SYS_NS16550=y
  CONFIG_TIMER=y
  CONFIG_ALTERA_TIMER=y
+CONFIG_FIT=y
configs/3c120_defconfig +0 -0
index 8bc13f3..2fdff87 100644

configs/3c120_defconfig CONFIG_ALTERA_JTAG_UART=y · line 29

Quoted 4 lines
configs/3c120_defconfig +1 -0
@@ -26,3 +26,4 @@ CONFIG_ALTERA_JTAG_UART=y
  CONFIG_ALTERA_JTAG_UART_BYPASS=y
  CONFIG_TIMER=y
  CONFIG_ALTERA_TIMER=y
+CONFIG_FIT=y

Amended with savedefconfig and applied to u-boot-nios. Thanks.

Best regards,
Thomas

#4 lore raw

PATCH v2 1/2 nios2: Enable support for fitImage

Quoted 37 lines · Thomas Chou

Hi Marek,

Quoted 34 lines · Marek Vasut

The uImage format is legacy for years now, enable support for the fitImage format, which allows combining multiple files (kernel and dtb) into a single file, offers better protection of the payload and so on.

---

  configs/10m50_defconfig | 1 +
  configs/3c120_defconfig | 1 +
  2 files changed, 2 insertions(+)

V2: Move CONFIG_FIT into Kconfig

Drop duplicate CONFIG_OF_LIBFDT definition

configs/10m50_defconfig +1 -0
index 0d18e8d..c179a0f 100644
@@ -25,3 +25,4 @@ CONFIG_ALTERA_TSE=y
 
  CONFIG_SYS_NS16550=y
  CONFIG_TIMER=y
  CONFIG_ALTERA_TIMER=y
 
+CONFIG_FIT=y
configs/3c120_defconfig +0 -0
index 8bc13f3..2fdff87 100644
@@ -26,3 +26,4 @@ CONFIG_ALTERA_JTAG_UART=y
 
Quoted 7 lines

configs/3c120_defconfig CONFIG_ALTERA_JTAG_UART=y · line 29

Quoted 5 lines
configs/3c120_defconfig +1 -0
  CONFIG_ALTERA_JTAG_UART_BYPASS=y
  CONFIG_TIMER=y
  CONFIG_ALTERA_TIMER=y
 
+CONFIG_FIT=y

Amended with savedefconfig and applied to u-boot-nios. Thanks.

Thanks!

How exactly did you regenerate those defconfigs please ? Did you do just make nnn_config ; make savedefconfig ; cp defconfig configs/nnn_defconfig ?

Best regards,
Marek Vasut

#5 lore raw

PATCH v2 1/2 nios2: Enable support for fitImage

Hi Marek,

Quoted 9 lines · Marek Vasut
Quoted 3 lines
Quoted 1 line

+CONFIG_FIT=y

Amended with savedefconfig and applied to u-boot-nios. Thanks.

Thanks!

How exactly did you regenerate those defconfigs please ? Did you do just make nnn_config ; make savedefconfig ; cp defconfig configs/nnn_defconfig ?

Yes, make nnn_config ; make savedefconfig ; cp defconfig configs/nnn_defconfig .

Best regards,
Thomas

#6 lore raw

PATCH v2 1/2 nios2: Enable support for fitImage

Quoted 1 line · Thomas Chou

Hi Marek,

Hi!

Quoted 5 lines · Marek Vasut
Quoted 4 lines
Quoted 3 lines
Quoted 1 line

+CONFIG_FIT=y

Amended with savedefconfig and applied to u-boot-nios. Thanks.

Quoted 8 lines
Quoted 5 lines

Thanks!

How exactly did you regenerate those defconfigs please ? Did you do just make nnn_config ; make savedefconfig ; cp defconfig configs/nnn_defconfig ?

Yes, make nnn_config ; make savedefconfig ; cp defconfig configs/nnn_defconfig .

Thanks :)

Best regards,
Marek Vasut