usbarmory: switch to using kernel zImage

PATCH New andrej at inversepath.com 3 participants 7 messages Jun 20, 2016 – Jun 29, 2016

lore

Share & tools

lore

andrej at inversepath.com

author

2016-06-20 15:21 UTC #0 lore raw

PATCH 1/2 usbarmory: switch to using kernel zImage

From: Andrej Rosano <[email protected]>

Switch to using zImage instead of uImage.

Signed-off-by Andrej Rosano <[email protected]>

---
 include/configs/usbarmory.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

include/configs/usbarmory.h +5 -3

index 8568663..c0e093f 100644
@@ -69,17 +69,19 @@
 #define CONFIG_CMD_FUSE
 #define CONFIG_FSL_IIM
 
-/* Linux boot */
+/* U-Boot memory offsets */
 #define CONFIG_LOADADDR		0x72000000
 #define CONFIG_SYS_TEXT_BASE	0x77800000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
+
+/* Linux boot */
 #define CONFIG_HOSTNAME		usbarmory
 #define CONFIG_BOOTCOMMAND						\
 	"run distro_bootcmd; "						\
 	"setenv bootargs console=${console} ${bootargs_default}; "	\
-	"ext2load mmc 0:1 ${kernel_addr_r} /boot/uImage; "		\
+	"ext2load mmc 0:1 ${kernel_addr_r} /boot/zImage; "		\
 	"ext2load mmc 0:1 ${fdt_addr_r} /boot/${fdtfile}; "		\
-	"bootm ${kernel_addr_r} - ${fdt_addr_r}"
+	"bootz ${kernel_addr_r} - ${fdt_addr_r}"
 
 #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)

Signature · 1 line

2.9.0

andrej at inversepath.com

author

2016-06-20 15:21 UTC #1 lore raw

PATCH 2/2 usbarmory: Add board_run_command() function

From: Andrej Rosano <[email protected]>

Define a default board_run_command() function. This function contains the commands needed to boot the board when CLI is disabled (CONFIG_CMDLINE=n).

Signed-off-by Andrej Rosano <[email protected]>

---
 board/inversepath/usbarmory/usbarmory.c | 31 +++++++++++++++++++++++++++++++
 include/configs/usbarmory.h             | 11 +++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

board/inversepath/usbarmory/usbarmory.c +31 -0

index a809039..a11e3b3 100644
@@ -415,3 +415,34 @@ int checkboard(void)
 	puts("Board: Inverse Path USB armory MkI\n");
 	return 0;
 }
+
+#ifndef CONFIG_CMDLINE
+static char *ext2_argv[] = {
+	"ext2load",
+	"mmc",
+	"0:1",
+	USBARMORY_FIT_ADDR,
+	USBARMORY_FIT_PATH
+};
+
+static char *bootm_argv[] = {
+	"bootm",
+	USBARMORY_FIT_ADDR
+};
+
+int board_run_command(const char *cmdline)
+{
+	printf("%s %s %s %s %s\n", ext2_argv[0], ext2_argv[1], ext2_argv[2],
+	       ext2_argv[3], ext2_argv[4]);
+
+	if (do_ext2load(NULL, 0, 5, ext2_argv) != 0) {
+		udelay(5*1000*1000);
+		return 1;
+	}
+
+	printf("%s %s\n", bootm_argv[0], bootm_argv[1]);
+	do_bootm(NULL, 0, 2, bootm_argv);
+
+	return 1;
+}
+#endif

include/configs/usbarmory.h +7 -4

index c0e093f..5484204 100644
@@ -17,16 +17,13 @@
 #define CONFIG_SYS_FSL_CLK
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO
+#define CONFIG_SYS_NO_FLASH
 
 #include <asm/arch/imx-regs.h>
 
 #include <config_distro_defaults.h>
 
-/* U-Boot commands */
-
 /* U-Boot environment */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_OFFSET	(6 * 64 * 1024)
 #define CONFIG_ENV_SIZE		(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

@@ -101,6 +98,12 @@
 	"console=ttymxc0,115200\0"				\
 	BOOTENV
 
+#ifndef CONFIG_CMDLINE
+#define CONFIG_BOOTARGS "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw"
+#define USBARMORY_FIT_PATH	"/boot/usbarmory.itb"
+#define USBARMORY_FIT_ADDR	"0x70800000"
+#endif
+
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			CSD0_BASE_ADDR

Signature · 1 line

2.9.0

Stefano Babic

2016-06-20 15:46 UTC #2 lore raw

PATCH 2/2 usbarmory: Add board_run_command() function

Hallo Andrej,

Quoted 39 lines · andrej at inversepath.com

From: Andrej Rosano <[email protected]>

Define a default board_run_command() function. This function contains the commands needed to boot the board when CLI is disabled (CONFIG_CMDLINE=n).

Signed-off-by Andrej Rosano <[email protected]>

---
 board/inversepath/usbarmory/usbarmory.c | 31 +++++++++++++++++++++++++++++++
 include/configs/usbarmory.h             | 11 +++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

board/inversepath/usbarmory/usbarmory.c +20 -0

index a809039..a11e3b3 100644
@@ -415,3 +415,34 @@ int checkboard(void)
 	puts("Board: Inverse Path USB armory MkI\n");
 	return 0;
 }
+
+#ifndef CONFIG_CMDLINE
+static char *ext2_argv[] = {
+	"ext2load",
+	"mmc",
+	"0:1",
+	USBARMORY_FIT_ADDR,
+	USBARMORY_FIT_PATH
+};
+
+static char *bootm_argv[] = {
+	"bootm",
+	USBARMORY_FIT_ADDR
+};
+
+int board_run_command(const char *cmdline)
+{
+	printf("%s %s %s %s %s\n", ext2_argv[0], ext2_argv[1], ext2_argv[2],
+	       ext2_argv[3], ext2_argv[4]);
+

board/inversepath/usbarmory/usbarmory.c int checkboard(void) · line 447

Quoted 10 lines

board/inversepath/usbarmory/usbarmory.c +10 -0

+	if (do_ext2load(NULL, 0, 5, ext2_argv) != 0) {
+		udelay(5*1000*1000);
+		return 1;
+	}
+
+	printf("%s %s\n", bootm_argv[0], bootm_argv[1]);
+	do_bootm(NULL, 0, 2, bootm_argv);
+
+	return 1;
+}

I ten to NACK this. You can do exactly the same with a U-Boot script, and if you want to have this as default, you can change your default environment. This is just a wrapper around the hush shell.

Quoted 27 lines

board/inversepath/usbarmory/usbarmory.c +1 -0

+#endif

include/configs/usbarmory.h +1 -4

index c0e093f..5484204 100644
@@ -17,16 +17,13 @@
 #define CONFIG_SYS_FSL_CLK
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO
+#define CONFIG_SYS_NO_FLASH
 
 #include <asm/arch/imx-regs.h>
 
 #include <config_distro_defaults.h>
 
-/* U-Boot commands */
-
 /* U-Boot environment */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_OFFSET	(6 * 64 * 1024)
 #define CONFIG_ENV_SIZE		(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

@@ -101,6 +98,12 @@
 	"console=ttymxc0,115200\0"				\
 	BOOTENV

include/configs/usbarmory.h line 109

Quoted 10 lines

include/configs/usbarmory.h +6 -0

 
+#ifndef CONFIG_CMDLINE
+#define CONFIG_BOOTARGS "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw"
+#define USBARMORY_FIT_PATH	"/boot/usbarmory.itb"
+#define USBARMORY_FIT_ADDR	"0x70800000"
+#endif
+
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			CSD0_BASE_ADDR

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Andrej Rosano

author

2016-06-20 16:18 UTC #3 lore raw

PATCH 2/2 usbarmory: Add board_run_command() function

Hi Stefano,

Quoted 48 lines · Stefano Babic

Hallo Andrej,

Quoted 45 lines · andrej at inversepath.com

From: Andrej Rosano <[email protected]>

Define a default board_run_command() function. This function contains the commands needed to boot the board when CLI is disabled (CONFIG_CMDLINE=n).

Signed-off-by Andrej Rosano <[email protected]>

---
 board/inversepath/usbarmory/usbarmory.c | 31 +++++++++++++++++++++++++++++++
 include/configs/usbarmory.h             | 11 +++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

board/inversepath/usbarmory/usbarmory.c +26 -0

index a809039..a11e3b3 100644
@@ -415,3 +415,34 @@ int checkboard(void)
 	puts("Board: Inverse Path USB armory MkI\n");
 	return 0;
 }
+
+#ifndef CONFIG_CMDLINE
+static char *ext2_argv[] = {
+	"ext2load",
+	"mmc",
+	"0:1",
+	USBARMORY_FIT_ADDR,
+	USBARMORY_FIT_PATH
+};
+
+static char *bootm_argv[] = {
+	"bootm",
+	USBARMORY_FIT_ADDR
+};
+
+int board_run_command(const char *cmdline)
+{
+	printf("%s %s %s %s %s\n", ext2_argv[0], ext2_argv[1], ext2_argv[2],
+	       ext2_argv[3], ext2_argv[4]);
+
+	if (do_ext2load(NULL, 0, 5, ext2_argv) != 0) {
+		udelay(5*1000*1000);
+		return 1;
+	}
+
+	printf("%s %s\n", bootm_argv[0], bootm_argv[1]);

Quoted 8 lines

board/inversepath/usbarmory/usbarmory.c int checkboard(void) · line 447
Quoted 4 lines
board/inversepath/usbarmory/usbarmory.c +4 -0
+	do_bootm(NULL, 0, 2, bootm_argv);
+
+	return 1;
+}
I ten to NACK this. You can do exactly the same with a U-Boot script, and if you want to have this as default, you can change your default environment. This is just a wrapper around the hush shell.

The intention of the patch is to boot the kernel while having the CLI disabled (CONFIG_CMDLINE=n). The U-Boot script needs the CLI to be enabled AFAIK.

It is better having the CLI disabled when using the Verified Boot, otherwise there are chances to bypass the FIT image verification (e.g. using md/mw commands in case are available):

https://github.com/inversepath/usbarmory/blob/master/software/secure_boot/u-boot-2016.05_patches/0003-Disable-CLI.patch

Andrej

Quoted 29 lines

board/inversepath/usbarmory/usbarmory.c +1 -0

+#endif

include/configs/usbarmory.h +1 -4

index c0e093f..5484204 100644
@@ -17,16 +17,13 @@
 #define CONFIG_SYS_FSL_CLK
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO
+#define CONFIG_SYS_NO_FLASH
 
 #include <asm/arch/imx-regs.h>
 
 #include <config_distro_defaults.h>
 
-/* U-Boot commands */
-
 /* U-Boot environment */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_OFFSET	(6 * 64 * 1024)
 #define CONFIG_ENV_SIZE		(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

@@ -101,6 +98,12 @@
 	"console=ttymxc0,115200\0"				\
 	BOOTENV

Quoted 20 lines

include/configs/usbarmory.h line 109

Quoted 10 lines

include/configs/usbarmory.h +6 -0

+#ifndef CONFIG_CMDLINE
+#define CONFIG_BOOTARGS "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw"
+#define USBARMORY_FIT_PATH	"/boot/usbarmory.itb"
+#define USBARMORY_FIT_ADDR	"0x70800000"
+#endif
+
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			CSD0_BASE_ADDR

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

--
Andrej Rosano Inverse Path Srl
<[email protected]> http://www.inversepath.com

0x01939B21 5BB8 574E 68E8 D841 E18F D5E9 CEAD E0CF 0193 9B21

Stefano Babic

2016-06-27 10:38 UTC #4 lore raw

PATCH 2/2 usbarmory: Add board_run_command() function

Hi Andrej,

Quoted 11 lines · Andrej Rosano

Quoted 4 lines
I ten to NACK this. You can do exactly the same with a U-Boot script, and if you want to have this as default, you can change your default environment. This is just a wrapper around the hush shell.
The intention of the patch is to boot the kernel while having the CLI disabled (CONFIG_CMDLINE=n). The U-Boot script needs the CLI to be enabled AFAIK.
It is better having the CLI disabled when using the Verified Boot, otherwise there are chances to bypass the FIT image verification (e.g. using md/mw commands in case are available):

Why is it not enough to disable the CONSOLE ? I mean, if there is no user interface (and this is done in a lot of ways, for example setting stdin / stdout), there is no ways to bypass it because the interface is not availabel. Or is there some other security issues I am not aware of ?

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Simon Glass

2016-06-28 18:43 UTC #5 lore raw

PATCH 2/2 usbarmory: Add board_run_command() function

Hi,

Quoted 12 lines · Stefano Babic

Hi Andrej,
Quoted 8 lines · Andrej Rosano
Quoted 4 lines
I ten to NACK this. You can do exactly the same with a U-Boot script, and if you want to have this as default, you can change your default environment. This is just a wrapper around the hush shell.
The intention of the patch is to boot the kernel while having the CLI disabled (CONFIG_CMDLINE=n). The U-Boot script needs the CLI to be enabled AFAIK.

Quoted 8 lines

Quoted 3 lines
It is better having the CLI disabled when using the Verified Boot, otherwise there are chances to bypass the FIT image verification (e.g. using md/mw commands in case are available):
Why is it not enough to disable the CONSOLE ? I mean, if there is no user interface (and this is done in a lot of ways, for example setting stdin / stdout), there is no ways to bypass it because the interface is not availabel. Or is there some other security issues I am not aware of ?

It is an extra level of security - providing a very simple command execution instead of the general CLI. That is actually the original purpose of board_run_command(). E.g. for Chrome OS we had an option to either run the normal CLI or a simple (secure) one. Also see cli_process_fdt() which provides for a 'bootsecure' mode, controlled from the FDT.

Regards,
Simon

Stefano Babic

2016-06-29 09:20 UTC #6 lore raw

PATCH 2/2 usbarmory: Add board_run_command() function

Hi Simon,

Quoted 24 lines · Simon Glass

Hi,
Quoted 12 lines · Stefano Babic
Hi Andrej,
Quoted 8 lines · Andrej Rosano
Quoted 4 lines
I ten to NACK this. You can do exactly the same with a U-Boot script, and if you want to have this as default, you can change your default environment. This is just a wrapper around the hush shell.
The intention of the patch is to boot the kernel while having the CLI disabled (CONFIG_CMDLINE=n). The U-Boot script needs the CLI to be enabled AFAIK.
Quoted 8 lines
Quoted 3 lines
It is better having the CLI disabled when using the Verified Boot, otherwise there are chances to bypass the FIT image verification (e.g. using md/mw commands in case are available):
Why is it not enough to disable the CONSOLE ? I mean, if there is no user interface (and this is done in a lot of ways, for example setting stdin / stdout), there is no ways to bypass it because the interface is not availabel. Or is there some other security issues I am not aware of ?

Quoted 6 lines

It is an extra level of security - providing a very simple command execution instead of the general CLI. That is actually the original purpose of board_run_command(). E.g. for Chrome OS we had an option to either run the normal CLI or a simple (secure) one. Also see cli_process_fdt() which provides for a 'bootsecure' mode, controlled from the FDT.

I see, thanks for explanation. My fear is that the process diverges and boards start to embed U-Boot scripts inside the code, letting them not very maintainable. But I have understood the issue and I put this patch for merging in my queue.

Best regards,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================