From 4474e9d6d63081789958748be553db1ebad844a0 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 12 Aug 2013 11:10:00 +0200 Subject: [PATCH] seoul: add intel82576vf for 64bit --- ports/src/vancouver/device_model_registry.cc | 3 +-- ports/src/vancouver/nova_user_env.cc | 2 +- ports/src/vancouver/target.inc | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/src/vancouver/device_model_registry.cc b/ports/src/vancouver/device_model_registry.cc index 6fd298a24b..1de2622464 100644 --- a/ports/src/vancouver/device_model_registry.cc +++ b/ports/src/vancouver/device_model_registry.cc @@ -80,9 +80,8 @@ MODEL_INFO(vga, "io_base", "fb_size") MODEL_INFO(pmtimer, "io_port") MODEL_INFO(pcihostbridge, "bus_num", "bus_count", "io_base", "mem_base") -#ifndef __x86_64__ MODEL_INFO(intel82576vf, "promisc", "mem_mmio", "mem_msix", "txpoll_us", "rx_map") -#endif + MODEL_INFO(ahci, "mem", "irq", "bdf") MODEL_INFO(drive, "sigma0drive", "controller", "port") diff --git a/ports/src/vancouver/nova_user_env.cc b/ports/src/vancouver/nova_user_env.cc index 9761c13f01..35c8988497 100644 --- a/ports/src/vancouver/nova_user_env.cc +++ b/ports/src/vancouver/nova_user_env.cc @@ -115,7 +115,7 @@ void *operator new[](size_t size) void *operator new[](size_t size, Aligned const alignment) { - unsigned int align = alignment.alignment; + size_t align = alignment.alignment; void *res = heap_alloc(size + align); if (res) Genode::memset(res, 0, size + align); diff --git a/ports/src/vancouver/target.inc b/ports/src/vancouver/target.inc index a180035ef5..b4a76ba96a 100644 --- a/ports/src/vancouver/target.inc +++ b/ports/src/vancouver/target.inc @@ -21,7 +21,6 @@ EXECUTOR_SRC_CC += $(notdir $(wildcard $(VANCOUVER_DIR)/executor/*.cc)) SERVICE_SRC_CC += sink.cc ifneq ($(filter x86_64, $(SPECS)),) -FILTER_OUT += model/intel82576vf.cc CC_CXX_OPT += -mcmodel=large endif @@ -38,6 +37,8 @@ INC_DIR += $(NOVA_INCLUDE_DIR) CC_WARN += -Wno-parentheses CC_CXX_OPT += -std=gnu++11 +CC_CXX_OPT += -march=core2 +CC_CXX_OPT += -mssse3 vpath %.cc $(VANCOUVER_DIR) vpath %.cc $(CONTRIB_DIR)