i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix passing flags from BoardSetup

Browse Source 
* since we include BoardSetup earlier now, the TARGET_* flags were discarded. Use HAIKU_* instead.
* Add variables to hold the default entry point and the desired uimage OS emulation.
This commit is contained in:
François Revol
2012-05-18 01:22:50 +02:00
parent 7ca2da76f0
commit 55cf6de91b
6 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/board/beagle/BoardSetup
+7 -4
View File
@@ -13,6 +13,9 @@ HAIKU_BOARD_LOADER_BASE = 0x80008000 ;
HAIKU_BOARD_LOADER_ENTRY_RAW = 0x80008000 ;
HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80008008 ;
HAIKU_BOARD_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_NBSD) ;
HAIKU_BOARD_LOADER_FAKE_OS = netbsd ;
# load address for haiku_loader uimage
# (must be different than real load address)
HAIKU_BOARD_LOADER_UIBASE = 0x84000000 ;
@@ -59,9 +62,9 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu
#
TARGET_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
TARGET_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
TARGET_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
TARGET_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
build/jam/board/neo_freerunner/BoardSetup
+9 -6
View File
@@ -12,6 +12,9 @@ HAIKU_BOARD_LOADER_BASE = 0x32000000 ;
HAIKU_BOARD_LOADER_ENTRY_RAW = 0x32000000 ;
HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x32000008 ;
HAIKU_BOARD_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_NBSD) ;
HAIKU_BOARD_LOADER_FAKE_OS = netbsd ;
# load address for haiku_loader uimage
# (must be different than real load address)
HAIKU_BOARD_LOADER_UIBASE = 0x34000000 ;
@@ -66,17 +69,17 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu
#
TARGET_KERNEL_CCFLAGS += -mcpu=arm920t ;
TARGET_KERNEL_C++FLAGS += -mcpu=arm920t ;
TARGET_CCFLAGS += -mcpu=arm920t ;
TARGET_C++FLAGS += -mcpu=arm920t ;
HAIKU_KERNEL_CCFLAGS += -mcpu=arm920t ;
HAIKU_KERNEL_C++FLAGS += -mcpu=arm920t ;
HAIKU_CCFLAGS += -mcpu=arm920t ;
HAIKU_C++FLAGS += -mcpu=arm920t ;
# Workaround for ld using 32k for alignment despite forcing it in the config...
# should definitely not be needed!
TARGET_KERNEL_LINKFLAGS +=
HAIKU_KERNEL_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ;
TARGET_LINKFLAGS +=
HAIKU_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ;
build/jam/board/overo/BoardSetup
+7 -4
View File
@@ -13,6 +13,9 @@ HAIKU_BOARD_LOADER_BASE = 0x80008000 ;
HAIKU_BOARD_LOADER_ENTRY_RAW = 0x80008000 ;
HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80008008 ;
HAIKU_BOARD_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_NBSD) ;
HAIKU_BOARD_LOADER_FAKE_OS = netbsd ;
# load address for haiku_loader uimage
# (must be different than real load address)
HAIKU_BOARD_LOADER_UIBASE = 0x84000000 ;
@@ -55,9 +58,9 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu
#
TARGET_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
TARGET_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
TARGET_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
TARGET_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
build/jam/board/raspberry_pi/BoardSetup
+6 -6
View File
@@ -41,17 +41,17 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
# gcc flags for the specific cpu
#
TARGET_KERNEL_CCFLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
TARGET_KERNEL_C++FLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
TARGET_CCFLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
TARGET_C++FLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
HAIKU_KERNEL_CCFLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
HAIKU_KERNEL_C++FLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
HAIKU_CCFLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
HAIKU_C++FLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp ;
# Workaround for ld using 32k for alignment despite forcing it in the config...
# should definitely not be needed!
TARGET_KERNEL_LINKFLAGS +=
HAIKU_KERNEL_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ;
TARGET_LINKFLAGS +=
HAIKU_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ;
build/jam/board/sam460ex/BoardSetup
+7 -6
View File
@@ -14,8 +14,9 @@ HAIKU_BOOT_PLATFORM = u-boot ;
HAIKU_BOARD_LOADER_BASE = 0x00000000 ;
# entry points (raw binary, and netbsd loader emulation)
HAIKU_BOARD_LOADER_ENTRY_LINUX = 0x00000000 ;
#HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x00000008 ;
#HAIKU_BOARD_LOADER_ENTRY_RAW = 0x00000010 ;
HAIKU_BOARD_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_LINUX) ;
HAIKU_BOARD_LOADER_FAKE_OS = linux ;
# load address for haiku_loader uimage
# (must be different than real load address)
@@ -27,8 +28,8 @@ HAIKU_BOARD_LOADER_STACK_BASE = 0x02000000 ;
# gcc flags for the specific cpu
#
TARGET_KERNEL_CCFLAGS += -mtune=440 -msoft-float ;
TARGET_KERNEL_C++FLAGS += -mtune=440 -msoft-float ;
TARGET_CCFLAGS += -mtune=440 -msoft-float ;
TARGET_C++FLAGS += -mtune=440 -msoft-float ;
HAIKU_KERNEL_CCFLAGS += -mcpu=440 -mtune=440 -msoft-float ;
HAIKU_KERNEL_C++FLAGS += -mcpu=440 -mtune=440 -msoft-float ;
HAIKU_CCFLAGS += -mcpu=440 -mtune=440 -msoft-float ;
HAIKU_C++FLAGS += -mcpu=440 -mtune=440 -msoft-float ;
build/jam/board/verdex/BoardSetup
+9 -6
View File
@@ -12,6 +12,9 @@ HAIKU_BOARD_LOADER_BASE = 0xa2000000 ;
HAIKU_BOARD_LOADER_ENTRY_RAW = 0xa2000000 ;
HAIKU_BOARD_LOADER_ENTRY_NBSD = 0xa2000008 ;
HAIKU_BOARD_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_NBSD) ;
HAIKU_BOARD_LOADER_FAKE_OS = netbsd ;
# load address for haiku_loader uimage
# (must be different than real load address)
HAIKU_BOARD_LOADER_UIBASE = 0xa4000000 ;
@@ -65,17 +68,17 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu
#
TARGET_KERNEL_CCFLAGS += -mcpu=xscale ;
TARGET_KERNEL_C++FLAGS += -mcpu=xscale ;
TARGET_CCFLAGS += -mcpu=xscale ;
TARGET_C++FLAGS += -mcpu=xscale ;
HAIKU_KERNEL_CCFLAGS += -mcpu=xscale ;
HAIKU_KERNEL_C++FLAGS += -mcpu=xscale ;
HAIKU_CCFLAGS += -mcpu=xscale ;
HAIKU_C++FLAGS += -mcpu=xscale ;
# Workaround for ld using 32k for alignment despite forcing it in the config...
# should definitely not be needed!
TARGET_KERNEL_LINKFLAGS +=
HAIKU_KERNEL_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ;
TARGET_LINKFLAGS +=
HAIKU_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ;