dde_ipxe: explicitly support x86_64
Fixes some obvious warnings and (maybe) hidden bugs.
This commit is contained in:
parent
d0a68f055f
commit
b91c06feb7
|
@ -16,9 +16,7 @@ SRC_C += $(addprefix drivers/net/, pcnet32.c intel.c eepro100.c realtek.c mii.c)
|
||||||
|
|
||||||
INC_DIR += $(LIB_DIR)/include \
|
INC_DIR += $(LIB_DIR)/include \
|
||||||
$(CONTRIB_DIR)/include $(CONTRIB_DIR) \
|
$(CONTRIB_DIR)/include $(CONTRIB_DIR) \
|
||||||
$(CONTRIB_DIR)/arch/x86/include \
|
$(CONTRIB_DIR)/arch/x86/include
|
||||||
$(CONTRIB_DIR)/arch/i386/include \
|
|
||||||
$(CONTRIB_DIR)/arch/i386/include/pcbios
|
|
||||||
|
|
||||||
CC_WARN = -Wall -Wno-address
|
CC_WARN = -Wall -Wno-address
|
||||||
CC_OPT += $(addprefix -fno-builtin-, putchar toupper tolower)
|
CC_OPT += $(addprefix -fno-builtin-, putchar toupper tolower)
|
||||||
|
@ -38,3 +36,5 @@ vpath dde.c $(LIB_DIR)
|
||||||
vpath dummies.c $(LIB_DIR)
|
vpath dummies.c $(LIB_DIR)
|
||||||
|
|
||||||
vpath %.c $(CONTRIB_DIR)
|
vpath %.c $(CONTRIB_DIR)
|
||||||
|
|
||||||
|
# vi: set ft=make :
|
|
@ -0,0 +1,4 @@
|
||||||
|
include $(REP_DIR)/lib/mk/dde_ipxe_nic.inc
|
||||||
|
|
||||||
|
INC_DIR += $(CONTRIB_DIR)/arch/i386/include \
|
||||||
|
$(CONTRIB_DIR)/arch/i386/include/pcbios
|
|
@ -0,0 +1,7 @@
|
||||||
|
include $(REP_DIR)/lib/mk/dde_ipxe_nic.inc
|
||||||
|
|
||||||
|
INC_DIR += $(CONTRIB_DIR)/arch/x86_64/include \
|
||||||
|
$(CONTRIB_DIR)/arch/x86_64/include/efi
|
||||||
|
|
||||||
|
# take remaining parts from i386
|
||||||
|
INC_DIR += $(CONTRIB_DIR)/arch/i386/include
|
|
@ -58,7 +58,7 @@ static inline void *alloc_from_slab(size_t size)
|
||||||
else if (alloc_size <= 20480)
|
else if (alloc_size <= 20480)
|
||||||
p = dde_kit_slab_alloc(slabs[SLAB_20480]);
|
p = dde_kit_slab_alloc(slabs[SLAB_20480]);
|
||||||
else
|
else
|
||||||
LOG("allocation of size %d too big", size);
|
LOG("allocation of size %zd too big", size);
|
||||||
|
|
||||||
if (p) {
|
if (p) {
|
||||||
*p = alloc_size;
|
*p = alloc_size;
|
||||||
|
@ -202,7 +202,7 @@ void iounmap(volatile const void *io_addr)
|
||||||
|
|
||||||
void * ioremap(unsigned long bus_addr, size_t len)
|
void * ioremap(unsigned long bus_addr, size_t len)
|
||||||
{
|
{
|
||||||
LOG("bus_addr = %p len = %x", (void *)bus_addr, len);
|
LOG("bus_addr = %p len = %zx", (void *)bus_addr, len);
|
||||||
dde_kit_addr_t vaddr;
|
dde_kit_addr_t vaddr;
|
||||||
|
|
||||||
int ret = dde_kit_request_mem(bus_addr, len, 0, &vaddr);
|
int ret = dde_kit_request_mem(bus_addr, len, 0, &vaddr);
|
||||||
|
|
Loading…
Reference in New Issue