On Mon, 2013-12-16 at 17:08 +0100, Albert ARIBAUD wrote:
Hi Ian,
On Sun, 17 Nov 2013 15:17:43 +0000, Ian Campbell ijc@hellion.org.uk wrote:
The main purpose of this is to disable the use of the virtualisation extensions which Qemu does not emulate.
Also enable a few additional commands and the u-boot API.
This works for me with: $ dd if=/dev/zero of=pflash0.img bs=1M count=64 $ dd if=/dev/zero of=pflash1.img bs=1M count=64 $ qemu-system-arm -M vexpress-a15 -cpu cortex-a15 -kernel u-boot -m 1024m -sd mmc.img -nographic -pflash pflash0.img -pflash pflash1.img
(for some reason both pflash images are needed for saveenv to work)
Please split the above as follows:
a short problem and solution description in the commit message, above the commit message delimiter '---';
anything else (examples, comments, etc) below the commit delimiter.
I was intentionally including the qemu command line in the main body of the commit message since I was adding a target specifically for use with qemu. But this has now become a bit moot (see below).
+#define CONFIG_CMD_ECHO
Here and below, you are adding commands generally, i.e. not specifically for the new boards you're creating. I'd rather have this in a separate patch.
Sorry, I should have split this out in the first place.
But actually in the meantime I've discovered that the vexpress-a9 version of uboot works just fine on qemu -M vexpress-a9 (I guess I'm just used to working with a15's so it didn't initially occur to me!)
With that in mind here is the patch which just adds the extra commands.
8<--------------
From 74dcd48580f6cb713b70a204151f07c4de5db3b4 Mon Sep 17 00:00:00 2001
From: Ian Campbell ijc@hellion.org.uk Date: Sun, 17 Nov 2013 15:10:06 +0000 Subject: [PATCH] vexpress: Enable some additional config options
Primarily CONFIG_API, which is useful for running grub on top of u-boot. CONFIG_API requires SYS_MMC_MAX_DEVICE to be set.
Also enable CMD_EXT2 and CMD_ECHO.
Signed-off-by: Ian Campbell ijc@hellion.org.uk Cc: albert.u.boot@aribaud.net --- v2: Dropped addition of vexpress qemu variant. Using Uboot for vexpress_ca9x4 on qemu-system-arm -M vexpress-a9 is sufficient, so there is no need for a special variant of the ca14 uboot. --- include/configs/vexpress_common.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 7e78f8a..d39eb5b 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -157,6 +157,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PXE #define CONFIG_MENU +#define CONFIG_CMD_ECHO #define CONFIG_CMD_ELF #define CONFIG_CMD_ENV #define CONFIG_CMD_FLASH @@ -164,6 +165,7 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_NET #define CONFIG_CMD_PING +#define CONFIG_CMD_EXT2 #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_RUN #define CONFIG_CMD_BOOTZ @@ -176,6 +178,7 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ARM_PL180_MMCI #define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI +#define CONFIG_SYS_MMC_MAX_DEVICE 1 #define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000
@@ -253,6 +256,7 @@ #define CONFIG_SYS_FLASH_BASE0 V2M_NOR0 #define CONFIG_SYS_FLASH_BASE1 V2M_NOR1 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE0 +#define CONFIG_API
/* Timeout values in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */