diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
deleted file mode 100644
index 1639511362..0000000000
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3.bb
deleted file mode 100644
index cf1542d1e7..0000000000
--- a/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gcc-cross-initial_${PV}.bb
-require gcc-cross-kernel.inc
-
-SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
-
diff --git a/meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3-2.bb
new file mode 100644
index 0000000000..15ef0273b0
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3-2.bb
@@ -0,0 +1,11 @@
+PR = "r0"
+
+inherit sdk
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+
+require gcc_${PV}.bb
+require gcc4-build-sdk.inc
+require gcc-package-sdk.inc
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
deleted file mode 100644
index a9862b3021..0000000000
--- a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require gcc_csl-arm-2005q3.bb
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
-PR = "r0"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-require gcc3-build-cross.inc
-# cross packaging
-require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc_csl-arm-2005q3.bb b/meta/packages/gcc/gcc_csl-arm-2005q3.bb
deleted file mode 100644
index 62b9cc1c48..0000000000
--- a/meta/packages/gcc/gcc_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-BINV = "3.4.4"
-PV = "3.4.4+csl-arm-2005q3"
-PR = "r1"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
-           file://gcc_optab_arm.patch;patch=1"
-
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvjf ./arm-2005q3-2-arm-none-linux-gnueabi/gcc-2005q3-2.tar.bz2
-}
-
-addtask unpack2 after do_unpack before do_patch
-
-require gcc3-build.inc
-
-S = "${WORKDIR}/gcc-2005q3"