From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Date: Sat, 30 Nov 2013 09:21:35 +0000 Subject: [U-Boot] [PATCH 2/2] vexpress: Add vexpress qemu variant In-Reply-To: <1384701463-22899-2-git-send-email-ijc@hellion.org.uk> References: <1384701463-22899-2-git-send-email-ijc@hellion.org.uk> Message-ID: <1385803295.23632.35.camel@dagon.hellion.org.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Ping? On Sun, 2013-11-17 at 15:17 +0000, Ian Campbell 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) > > Signed-off-by: Ian Campbell > Cc: albert.u.boot at aribaud.net > --- > boards.cfg | 1 + > include/configs/vexpress_ca15_tc2.h | 2 ++ > include/configs/vexpress_common.h | 4 ++++ > 3 files changed, 7 insertions(+) > > diff --git a/boards.cfg b/boards.cfg > index caba64e..6e2fccc 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -245,6 +245,7 @@ Active arm arm926ejs versatile armltd versatile > Active arm arm946es - armltd integrator integratorap_cm946es integratorap:CM946ES Linus Walleij > Active arm arm946es - armltd integrator integratorcp_cm946es integratorcp:CM946ES Linus Walleij > Active arm armv7 - armltd vexpress vexpress_ca15_tc2 - - > +Active arm armv7 - armltd vexpress vexpress_ca15_tc2_qemu vexpress_ca15_tc2:ARCH_VEXPRESS_QEMU - > Active arm armv7 - armltd vexpress vexpress_ca5x2 - Matt Waddel > Active arm armv7 - armltd vexpress vexpress_ca9x4 - Matt Waddel > Active arm armv7 am33xx isee igep0033 am335x_igep0033 - Enric Balletbo i Serra > diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h > index 982f4a7..ccdb3c5 100644 > --- a/include/configs/vexpress_ca15_tc2.h > +++ b/include/configs/vexpress_ca15_tc2.h > @@ -18,6 +18,8 @@ > #define CONFIG_SYSFLAGS_ADDR 0x1c010030 > #define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR > > +#ifndef CONFIG_ARCH_VEXPRESS_QEMU > #define CONFIG_ARMV7_VIRT > +#endif > > #endif > diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h > index 7e78f8a..fbb9993 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 2 > #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 */