mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86
This commit is contained in:
commit
74279d3761
9 changed files with 24 additions and 15 deletions
|
@ -10,5 +10,7 @@
|
|||
obj-y := cpu.o os.o start.o state.o
|
||||
|
||||
# os.c is build in the system environment, so needs standard includes
|
||||
$(obj)os.o: ALL_CFLAGS := $(filter-out -nostdinc,$(ALL_CFLAGS))
|
||||
$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,$(CPPFLAGS))
|
||||
$(obj)os.o: ALL_CFLAGS := $(BASE_CPPFLAGS) \
|
||||
$(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
|
||||
$(obj).depend.os: CPPFLAGS := $(BASE_CPPFLAGS) \
|
||||
$(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <getopt.h>
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <termios.h>
|
||||
|
@ -136,7 +137,7 @@ void os_usleep(unsigned long usec)
|
|||
usleep(usec);
|
||||
}
|
||||
|
||||
u64 __attribute__((no_instrument_function)) os_get_nsec(void)
|
||||
uint64_t __attribute__((no_instrument_function)) os_get_nsec(void)
|
||||
{
|
||||
#if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK)
|
||||
struct timespec tp;
|
||||
|
|
|
@ -38,6 +38,6 @@ static inline void unmap_sysmem(const void *vaddr)
|
|||
}
|
||||
|
||||
/* Map from a pointer to our RAM buffer */
|
||||
phys_addr_t map_to_sysmem(void *ptr);
|
||||
phys_addr_t map_to_sysmem(const void *ptr);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -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__ */
|
||||
|
||||
|
|
|
@ -250,11 +250,16 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
|
|||
endif
|
||||
endif
|
||||
|
||||
# Sandbox needs the base flags and includes, so keep them around
|
||||
BASE_CPPFLAGS := $(CPPFLAGS)
|
||||
|
||||
ifneq ($(OBJTREE),$(SRCTREE))
|
||||
CPPFLAGS += -I$(OBJTREE)/include
|
||||
BASE_INCLUDE_DIRS := $(OBJTREE)/include
|
||||
endif
|
||||
|
||||
CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
|
||||
BASE_INCLUDE_DIRS += $(TOPDIR)/include $(SRCTREE)/arch/$(ARCH)/include
|
||||
|
||||
CPPFLAGS += $(patsubst %, -I%, $(BASE_INCLUDE_DIRS))
|
||||
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
|
||||
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
|
||||
|
||||
|
|
|
@ -923,7 +923,7 @@ static inline void unmap_sysmem(const void *vaddr)
|
|||
{
|
||||
}
|
||||
|
||||
static inline phys_addr_t map_to_sysmem(void *ptr)
|
||||
static inline phys_addr_t map_to_sysmem(const void *ptr)
|
||||
{
|
||||
return (phys_addr_t)(uintptr_t)ptr;
|
||||
}
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
#ifndef __OS_H__
|
||||
#define __OS_H__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
struct sandbox_state;
|
||||
|
||||
/**
|
||||
|
@ -116,7 +118,7 @@ void os_usleep(unsigned long usec);
|
|||
*
|
||||
* \return A monotonic increasing time scaled in nano seconds
|
||||
*/
|
||||
u64 os_get_nsec(void);
|
||||
uint64_t os_get_nsec(void);
|
||||
|
||||
/**
|
||||
* Parse arguments and update sandbox state.
|
||||
|
|
|
@ -86,10 +86,10 @@ fdt_addr_t fdtdec_get_addr_size(const void *blob, int node,
|
|||
size = (fdt_size_t *)((char *)cell +
|
||||
sizeof(fdt_addr_t));
|
||||
*sizep = fdt_size_to_cpu(*size);
|
||||
debug("addr=%p, size=%p\n", (void *)addr,
|
||||
(void *)*sizep);
|
||||
debug("addr=%08lx, size=%08x\n",
|
||||
(ulong)addr, *sizep);
|
||||
} else {
|
||||
debug("%p\n", (void *)addr);
|
||||
debug("%08lx\n", (ulong)addr);
|
||||
}
|
||||
return addr;
|
||||
}
|
||||
|
@ -611,7 +611,7 @@ int fdtdec_decode_region(const void *blob, int node,
|
|||
if (!cell || (len != sizeof(fdt_addr_t) * 2))
|
||||
return -1;
|
||||
|
||||
*ptrp = (void *)fdt_addr_to_cpu(*cell);
|
||||
*ptrp = map_sysmem(fdt_addr_to_cpu(*cell), *size);
|
||||
*size = fdt_size_to_cpu(cell[1]);
|
||||
debug("%s: size=%zx\n", __func__, *size);
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue