summaryrefslogtreecommitdiff
path: root/arch/sandbox
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-07-04 11:57:49 -0600
committerSimon Glass <sjg@chromium.org>2016-07-14 20:40:24 -0600
commita7d9caecd770684e6e189dfa24240145ba29379e (patch)
treec4b415454e413765e4fef789571f69c3a55ba495 /arch/sandbox
parentf4289cbd8a8d607399b507cb695b46cd771d6c1b (diff)
downloadu-boot-imx-a7d9caecd770684e6e189dfa24240145ba29379e.zip
u-boot-imx-a7d9caecd770684e6e189dfa24240145ba29379e.tar.gz
u-boot-imx-a7d9caecd770684e6e189dfa24240145ba29379e.tar.bz2
sandbox: Don't use PCI in SPL
PCI is not supported in SPL for sandbox, so avoid using it. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox')
-rw-r--r--arch/sandbox/cpu/cpu.c2
-rw-r--r--arch/sandbox/lib/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 4975eb2..2def722 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -57,7 +57,7 @@ int cleanup_before_linux_select(int flags)
void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
{
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && !defined(CONFIG_SPL_BUILD)
unsigned long plen = len;
void *ptr;
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 96761e2..7820c55 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -8,5 +8,7 @@
#
obj-y += interrupts.o
+ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_PCI) += pci_io.o
+endif
obj-$(CONFIG_CMD_BOOTM) += bootm.o