eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm

Browse Source 
- Fix for patman with email addresses containing commas
- Bootstage improvements for TPL, SPL
- Various sandbox and dm improvements and fixes
This commit is contained in:
Tom Rini
2019-11-01 09:34:35 -04:00
parent 82679624f9 d60ae4c59d
commit bb1bb4bb5d
21 changed files with 135 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sandbox/cpu/cpu.c
View File

@@ -246,8 +246,7 @@ unsigned int sandbox_read(const void *addr, enum sandboxio_size_t size)
return 0;
}
void sandbox_write(const void *addr, unsigned int val,
enum sandboxio_size_t size)
void sandbox_write(void *addr, unsigned int val, enum sandboxio_size_t size)
{
struct sandbox_state *state = state_get_current();

11
arch/sandbox/include/asm/io.h
View File

@@ -46,8 +46,7 @@ static inline void unmap_sysmem(const void *vaddr)
phys_addr_t map_to_sysmem(const void *ptr);
unsigned int sandbox_read(const void *addr, enum sandboxio_size_t size);
void sandbox_write(const void *addr, unsigned int val,
enum sandboxio_size_t size);
void sandbox_write(void *addr, unsigned int val, enum sandboxio_size_t size);
#define readb(addr) sandbox_read((const void *)addr, SB_SIZE_8)
#define readw(addr) sandbox_read((const void *)addr, SB_SIZE_16)
@@ -55,11 +54,11 @@ void sandbox_write(const void *addr, unsigned int val,
#ifdef CONFIG_SANDBOX64
#define readq(addr) sandbox_read((const void *)addr, SB_SIZE_64)
#endif
#define writeb(v, addr) sandbox_write((const void *)addr, v, SB_SIZE_8)
#define writew(v, addr) sandbox_write((const void *)addr, v, SB_SIZE_16)
#define writel(v, addr) sandbox_write((const void *)addr, v, SB_SIZE_32)
#define writeb(v, addr) sandbox_write((void *)addr, v, SB_SIZE_8)
#define writew(v, addr) sandbox_write((void *)addr, v, SB_SIZE_16)
#define writel(v, addr) sandbox_write((void *)addr, v, SB_SIZE_32)
#ifdef CONFIG_SANDBOX64
#define writeq(v, addr) sandbox_write((const void *)addr, v, SB_SIZE_64)
#define writeq(v, addr) sandbox_write((void *)addr, v, SB_SIZE_64)
#endif
/*

11
arch/sandbox/include/asm/test.h
View File

@@ -213,4 +213,15 @@ int sandbox_get_pci_ep_irq_count(struct udevice *dev);
*/
uint sandbox_pci_read_bar(u32 barval, int type, uint size);
/**
* sandbox_set_enable_memio() - Enable readl/writel() for sandbox
*
* Normally these I/O functions do nothing with sandbox. Certain tests need them
* to work as for other architectures, so this function can be used to enable
* them.
*
* @enable: true to enable, false to disable
*/
void sandbox_set_enable_memio(bool enable);
#endif