summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-11-10 10:26:53 -0700
committerSimon Glass <sjg@chromium.org>2013-11-21 16:54:26 -0700
commit0eb2acee394b16dd734f5f48b2cbf2f22065d060 (patch)
treecd502638e2cc88710bf27d591679bd284906ad7b
parentcbe5cdfcd31633edce4ee78ebc008b922de571e3 (diff)
downloadu-boot-imx-0eb2acee394b16dd734f5f48b2cbf2f22065d060.zip
u-boot-imx-0eb2acee394b16dd734f5f48b2cbf2f22065d060.tar.gz
u-boot-imx-0eb2acee394b16dd734f5f48b2cbf2f22065d060.tar.bz2
sandbox: config: Don't use 64-bit physical memory
Sandbox uses an emulated memory map which is quite small. We don't need the CONFIG_PHYS_64BIT option since we can address memory with a 32-bit offset into our ram_buf. Adjust the phys_addr_t and phys_size_t types accordingly. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Hung-ying Tyan <tyanh@chromium.org>
-rw-r--r--arch/sandbox/include/asm/types.h4
-rw-r--r--include/configs/sandbox.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h
index 88c84ba..6d3eb1f 100644
--- a/arch/sandbox/include/asm/types.h
+++ b/arch/sandbox/include/asm/types.h
@@ -48,8 +48,8 @@ typedef unsigned long long u64;
#define BITS_PER_LONG CONFIG_SANDBOX_BITS_PER_LONG
typedef unsigned long dma_addr_t;
-typedef unsigned long phys_addr_t;
-typedef unsigned long phys_size_t;
+typedef u32 phys_addr_t;
+typedef u32 phys_size_t;
#endif /* __KERNEL__ */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 0884ad3..a4edc62 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -75,7 +75,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x00000000
#define CONFIG_SYS_MEMTEST_START 0x00100000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1000)
-#define CONFIG_PHYS_64BIT
#define CONFIG_SYS_FDT_LOAD_ADDR 0x1000000
/* Size of our emulated memory */