diff --git a/build/jam/board/beagle/BoardSetup b/build/jam/board/beagle/BoardSetup
index 8932a1050c..3f431ae4d4 100644
--- a/build/jam/board/beagle/BoardSetup
+++ b/build/jam/board/beagle/BoardSetup
@@ -62,8 +62,6 @@ HAIKU_BOARD_SDIMAGE_FILES =
 # gcc flags for the specific cpu
 #
 
-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_$(HAIKU_PACKAGING_ARCH)
 	+= -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
 HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)
diff --git a/build/jam/board/neo_freerunner/BoardSetup b/build/jam/board/neo_freerunner/BoardSetup
index 502f5103f4..65021621e3 100644
--- a/build/jam/board/neo_freerunner/BoardSetup
+++ b/build/jam/board/neo_freerunner/BoardSetup
@@ -69,8 +69,6 @@ HAIKU_BOARD_SDIMAGE_FILES =
 # gcc flags for the specific cpu
 #
 
-HAIKU_KERNEL_CCFLAGS += -mcpu=arm920t ;
-HAIKU_KERNEL_C++FLAGS += -mcpu=arm920t ;
 HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=arm920t ;
 HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=arm920t ;
 
diff --git a/build/jam/board/overo/BoardSetup b/build/jam/board/overo/BoardSetup
index 0eedb01ca3..a972a9c104 100644
--- a/build/jam/board/overo/BoardSetup
+++ b/build/jam/board/overo/BoardSetup
@@ -58,8 +58,6 @@ HAIKU_BOARD_SDIMAGE_FILES =
 # gcc flags for the specific cpu
 #
 
-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_$(HAIKU_PACKAGING_ARCH)
 	+= -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
 HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)
diff --git a/build/jam/board/raspberry_pi/BoardSetup b/build/jam/board/raspberry_pi/BoardSetup
index 46a6683281..57e2e32170 100644
--- a/build/jam/board/raspberry_pi/BoardSetup
+++ b/build/jam/board/raspberry_pi/BoardSetup
@@ -46,8 +46,6 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
 # gcc flags for the specific cpu
 #
 
-HAIKU_KERNEL_CCFLAGS += -mtune=arm1176jzf-s ;
-HAIKU_KERNEL_C++FLAGS += -mtune=arm1176jzf-s ;
 HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mtune=arm1176jzf-s ;
 HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mtune=arm1176jzf-s ;
 
diff --git a/build/jam/board/verdex/BoardSetup b/build/jam/board/verdex/BoardSetup
index 24f0d3098c..72cbfeef7c 100644
--- a/build/jam/board/verdex/BoardSetup
+++ b/build/jam/board/verdex/BoardSetup
@@ -68,11 +68,9 @@ HAIKU_BOARD_SDIMAGE_FILES =
 # gcc flags for the specific cpu
 #
 
-HAIKU_KERNEL_CCFLAGS += -mcpu=xscale -D__XSCALE__ ;
-HAIKU_KERNEL_C++FLAGS += -mcpu=xscale -D__XSCALE__ ;
-HAIKU_CCFLAGS += -mcpu=xscale -D__XSCALE__ ;
-HAIKU_C++FLAGS += -mcpu=xscale -D__XSCALE__ ;
-TARGET_ASFLAGS += -mcpu=xscale -D__XSCALE__ ;
+HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
+HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
+TARGET_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
 
 # Workaround for ld using 32k for alignment despite forcing it in the config...
 # should definitely not be needed!