From a0841cbe73ad22e5c7a32154495b729a832a6dff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Feb 2014 17:23:27 +0100
Subject: fix disk boot

---
 target/x86/kernel/qemu-i686 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'target')

diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686
index 6138c6ad2..8becb88b7 100644
--- a/target/x86/kernel/qemu-i686
+++ b/target/x86/kernel/qemu-i686
@@ -10,6 +10,9 @@ CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+CONFIG_ATA_BMDMA=y
 CONFIG_ATA_PIIX=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
-- 
cgit v1.2.3


From 08104b518bdb71c9c9cc977fe8c0b4cf7c9a751f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 26 Feb 2014 19:11:05 +0100
Subject: fix disk boot

---
 target/ppc/kernel/qemu-ppc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'target')

diff --git a/target/ppc/kernel/qemu-ppc b/target/ppc/kernel/qemu-ppc
index d3cada6ae..08dd506b5 100644
--- a/target/ppc/kernel/qemu-ppc
+++ b/target/ppc/kernel/qemu-ppc
@@ -30,6 +30,9 @@ CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+CONFIG_ATA_BMDMA=y
 CONFIG_PATA_MACIO=y
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
-- 
cgit v1.2.3


From 809d9eb235b6f8440416157a75a18bdecc1e61ed Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 27 Feb 2014 19:45:17 +0100
Subject: add support for sh and musl

---
 package/musl/Makefile                        | 3 +++
 target/config/Config.in                      | 1 +
 target/sh/Makefile                           | 6 +++---
 target/sh/sys-available/qemu-sh4             | 1 +
 target/sh/sys-available/qemu-sh4eb           | 1 +
 toolchain/gcc/patches/4.7.3/musl-sh.patch    | 2 +-
 toolchain/gcc/patches/4.7.3/musl-sparc.patch | 6 +++---
 toolchain/musl/Makefile                      | 3 +++
 8 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'target')

diff --git a/package/musl/Makefile b/package/musl/Makefile
index ad7ec664f..1de20d37e 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -49,6 +49,9 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 MARCH:=			armhf
 endif
+ifeq ($(CPU_ARCH),sh4)
+MARCH:=			sh
+endif
 
 # do nothing, musl is already build in toolchain directory
 do-install:
diff --git a/target/config/Config.in b/target/config/Config.in
index 68e2eefb0..69afde7f0 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -695,6 +695,7 @@ config ADK_TARGET_LIB_MUSL
 		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_PPC || \
+		ADK_LINUX_SH || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
 	help
diff --git a/target/sh/Makefile b/target/sh/Makefile
index b7160a509..98c5fb3ce 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -26,7 +26,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH),y)
+ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
@@ -35,8 +35,8 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: createinitramfs
 	@cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH),y)
+ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-{CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4
index 54f13fb65..a872b20dc 100644
--- a/target/sh/sys-available/qemu-sh4
+++ b/target/sh/sys-available/qemu-sh4
@@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (superh).
 
diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb
index 70365d7d4..aeffc92b6 100644
--- a/target/sh/sys-available/qemu-sh4eb
+++ b/target/sh/sys-available/qemu-sh4eb
@@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (superh).
 
diff --git a/toolchain/gcc/patches/4.7.3/musl-sh.patch b/toolchain/gcc/patches/4.7.3/musl-sh.patch
index 7738f266e..fbf06082a 100644
--- a/toolchain/gcc/patches/4.7.3/musl-sh.patch
+++ b/toolchain/gcc/patches/4.7.3/musl-sh.patch
@@ -5,7 +5,7 @@ diff -Nur gcc-4.7.3.orig/gcc/config/sh/linux.h gcc-4.7.3/gcc/config/sh/linux.h
  #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh.1"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh.so.1"
  
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
diff --git a/toolchain/gcc/patches/4.7.3/musl-sparc.patch b/toolchain/gcc/patches/4.7.3/musl-sparc.patch
index 228b8522d..7c9214f07 100644
--- a/toolchain/gcc/patches/4.7.3/musl-sparc.patch
+++ b/toolchain/gcc/patches/4.7.3/musl-sparc.patch
@@ -5,8 +5,8 @@ diff -Nur gcc-4.7.3.orig/gcc/config/sparc/linux64.h gcc-4.7.3/gcc/config/sparc/l
  
  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1"
 +
  
  #ifdef SPARC_BI_ARCH
@@ -18,7 +18,7 @@ diff -Nur gcc-4.7.3.orig/gcc/config/sparc/linux.h gcc-4.7.3/gcc/config/sparc/lin
     done.  */
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sparc.1"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sparc.so.1"
  
  #undef  LINK_SPEC
  #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 44ee75775..7382b84da 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -18,6 +18,9 @@ endif
 ifeq ($(CPU_ARCH),microblazeel)
 REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME))
 endif
+ifeq ($(CPU_ARCH),sh4)
+REAL_GNU_TARGET_NAME:= $(subst sh4,sh,$(REAL_GNU_TARGET_NAME))
+endif
 
 $(WRKBUILD)/.headers:
 	(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
-- 
cgit v1.2.3


From 94b0c4698a9d50593baa9eba1bb46a829d59ecd7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 28 Feb 2014 09:32:21 +0100
Subject: CONFIG_CC_OPTIMIZE_FOR_SIZE breaks microblaze bootup, remove it for
 now

---
 target/config/Config.in                             |  1 +
 target/linux/kernel.config                          |  3 +--
 target/microblaze/kernel/qemu-microblaze-ml605      | 12 +-----------
 target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 12 +-----------
 4 files changed, 4 insertions(+), 24 deletions(-)

(limited to 'target')

diff --git a/target/config/Config.in b/target/config/Config.in
index 68e2eefb0..e4bea1031 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -49,6 +49,7 @@ config ADK_TARGET_FLOAT
 	default "soft" if ADK_soft_float
 
 config ADK_TARGET_ARM_MODE
+	depends on ADK_LINUX_ARM
 	string
 	default "arm" if ADK_mode_arm
 	default "thumb" if ADK_mode_thumb
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index 97237b382..26205a842 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -2,6 +2,7 @@ CONFIG_DEFAULT_HOSTNAME="openadk"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE=""
 CONFIG_MMU=y
+CONFIG_NO_HZ=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -26,9 +27,7 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
-CONFIG_NO_HZ=y
 CONFIG_PRINTK=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_BUG=n
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605
index 7ae56f8c5..3c331795d 100644
--- a/target/microblaze/kernel/qemu-microblaze-ml605
+++ b/target/microblaze/kernel/qemu-microblaze-ml605
@@ -1,3 +1,4 @@
+CONFIG_MICROBLAZE=y
 CONFIG_PLATFORM_GENERIC=y
 CONFIG_OPT_LIB_FUNCTION=y
 CONFIG_KERNEL_BASE_ADDR=0x50000000
@@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
 CONFIG_XILINX_MICROBLAZE0_USE_FPU=1
 CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a"
-CONFIG_CMDLINE_FORCE=y
 CONFIG_PCI=y
 CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
@@ -20,18 +20,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_XILINX=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_AXI_EMAC=y
-CONFIG_GPIOLIB=y
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_XILINX=y
diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
index 652b68c03..c49b961b3 100644
--- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800
+++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
@@ -1,3 +1,4 @@
+CONFIG_MICROBLAZE=y
 CONFIG_PLATFORM_GENERIC=y
 CONFIG_OPT_LIB_FUNCTION=y
 CONFIG_KERNEL_BASE_ADDR=0x90000000
@@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=0
 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0
 CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d"
-CONFIG_CMDLINE_FORCE=y
 CONFIG_PCI=y
 CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
@@ -17,18 +17,8 @@ CONFIG_OF=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_XILINX=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
-CONFIG_GPIOLIB=y
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_XILINX=y
-- 
cgit v1.2.3


From 89bbde296b0f637b8aeb5e701a9fd10195dc0f41 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Mar 2014 08:56:17 +0100
Subject: cosmetic change avoid a whitespace

---
 target/microblaze/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'target')

diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 7a411aa95..df05d9f6c 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -30,7 +30,7 @@ imageinstall: tools-compile $(BUILD_DIR)/root.squashfs
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),jffs2)
@@ -38,7 +38,7 @@ imageinstall: tools-compile $(FW_DIR)/$(ROOTFSJFFS2)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
@@ -48,7 +48,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -57,6 +57,6 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)'
 endif
 endif
-- 
cgit v1.2.3


From 36b959a9b9a450f0789ecc6d10292efbc1f1eccd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Mar 2014 09:07:37 +0100
Subject: remove armeb, no hardware, no emulator to test, add armhf instead.
 fix some toolchain archive creation issues, remove unneeded files before
 packaging.

---
 mk/build.mk                                |  2 +-
 mk/kernel-ver.mk                           |  2 +-
 mk/vars.mk                                 |  5 -----
 target/arm/sys-available/toolchain-arm     |  4 ++--
 target/arm/sys-available/toolchain-armeb   | 11 -----------
 target/ppc/sys-available/toolchain-ppc     |  1 +
 target/ppc64/sys-available/toolchain-ppc64 |  1 +
 target/tarch.lst                           |  1 -
 toolchain/eglibc/Makefile                  |  7 ++++++-
 toolchain/gcc/Makefile                     |  2 +-
 toolchain/gcc/Makefile.inc                 |  7 -------
 toolchain/glibc/Makefile                   |  6 ++++++
 toolchain/kernel-headers/Makefile          |  2 ++
 toolchain/musl/Makefile                    |  4 ++++
 toolchain/uClibc/Makefile                  |  4 ++++
 15 files changed, 29 insertions(+), 30 deletions(-)
 delete mode 100644 target/arm/sys-available/toolchain-armeb

(limited to 'target')

diff --git a/mk/build.mk b/mk/build.mk
index eadccdcb3..9be651dd0 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -535,7 +535,7 @@ bulktoolchain:
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
-				tar -cJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
 			rm .config; \
 		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
 		    if [ -f .exit ];then break;fi \
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 17f189d04..09362fbae 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
 KERNEL_VERSION:=	3.12.13
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		c5b0775d187bc79992bae17ae781de1e
+KERNEL_MD5SUM:=		345f5883cfb906dac4aef87e303d3a2d
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_13_5),y)
 KERNEL_VERSION:=	3.13.5
diff --git a/mk/vars.mk b/mk/vars.mk
index 427b5b4ec..4fcff2ade 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -82,13 +82,8 @@ endif
 endif
 
 TARGET_CPPFLAGS:=	
-ifeq ($(ADK_LINUX_MICROBLAZE),y)
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(ADK_TARGET_ABI_CFLAGS)
 TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(TARGET_OPTIMIZATION)
-else
-TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS) $(MODE_FLAGS)
-TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) $(MODE_FLAGS)
-endif
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(MODE_FLAGS)
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O1 -Wl,-rpath -Wl,/usr/lib \
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 8ac2da8b6..2cbe76a2e 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	select ADK_arm
 	select ADK_toolchain_arm
 	select ADK_little
+	select ADK_soft_float
 	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  ARM toolchain (little endian).
-
+	  ARM toolchain (soft float).
diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb
deleted file mode 100644
index ad9d2117a..000000000
--- a/target/arm/sys-available/toolchain-armeb
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB
-	bool "Toolchain only (big endian)"
-	select ADK_arm
-	select ADK_toolchain_armeb
-	select ADK_big
-	select ADK_TOOLCHAIN
-	select ADK_EABI
-	select ADK_TARGET_PACKAGE_TGZ
-	help
-	  ARM toolchain (big endian).
-
diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc
index 340834f16..54e35e6a5 100644
--- a/target/ppc/sys-available/toolchain-ppc
+++ b/target/ppc/sys-available/toolchain-ppc
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
 	bool "Toolchain only"
 	select ADK_ppc
 	select ADK_toolchain_ppc
+	select ADK_CPU_PPC
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64
index 5a38c89f0..3615aab85 100644
--- a/target/ppc64/sys-available/toolchain-ppc64
+++ b/target/ppc64/sys-available/toolchain-ppc64
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	bool "Toolchain only"
 	select ADK_ppc64
 	select ADK_toolchain_ppc64
+	select ADK_CPU_PPC64
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
diff --git a/target/tarch.lst b/target/tarch.lst
index 239c496df..e7251f8d2 100644
--- a/target/tarch.lst
+++ b/target/tarch.lst
@@ -1,5 +1,4 @@
 arm
-armeb
 m68k
 microblaze
 microblazeel
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 5ac8e493d..66c326a93 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -84,11 +84,16 @@ $(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so
 		$(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install
 	${INSTALL_DIR} ${STAGING_TARGET_DIR}/etc
 	${INSTALL_DATA} ${WRKBUILD}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/
-	${INSTALL_DATA} ${WRKBUILD}/libc/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/
 	${INSTALL_DATA} ${WRKBUILD}/libc/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/
 	touch $@
 
 $(WRKBUILD)/.fixup:
+	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
+	-find $(STAGING_TARGET_DIR) -type -f -name \*_pic\* -delete
+	rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n
+	rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv
+	PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 2cd720a63..b298b5e77 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -71,7 +71,7 @@ else
 GCC_CONFOPTS+=		--enable-tls
 endif
 
-ifeq ($(ARCH),powerpc)
+ifeq ($(ADK_LINUX_PPC),y)
 ifeq ($(ADK_TARGET_LIBC),uclibc)
 GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-128 --enable-secureplt
 else
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 689de3b63..86a0a5992 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -2,15 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gcc
-
-ifeq ($(ADK_LINUX_MICROBLAZE),y)
 PKG_VERSION:=		4.8.2
 PKG_MD5SUM:=		a3d7d63b9cb6b6ea049469a0c4a43c9d
-else
-PKG_VERSION:=		4.7.3
-PKG_MD5SUM:=		86f428a30379bdee0224e353ee2f999e
-endif
-
 PKG_RELEASE:=		1
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 2fc0015d7..7f304330c 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -69,6 +69,12 @@ $(WRKBUILD)/.installed:
 	touch $@
 
 $(WRKBUILD)/.fixup:
+	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
+	-find $(STAGING_TARGET_DIR) -type f -name \*_pic\* -delete
+	rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n
+	rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv
+	PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index faa75336f..203c68018 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -12,6 +12,8 @@ $(WRKBUILD)/.headers:
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
 		headers_install
+        @-find $(STAGING_DIR)/usr/include -name .install -delete
+        @-find $(STAGING_DIR)/usr/include -name ..install.cmd -delete
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 44ee75775..14f96ab6e 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -54,6 +54,10 @@ $(WRKBUILD)/.fixup:
 	)
 	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
 	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
+	# cleanup toolchain
+	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
+	PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 47084994e..232c3944e 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -118,6 +118,10 @@ endif
 		all install_runtime
 	rm -rf $(STAGING_TARGET_DIR)/lib/libc.so
 	ln -s libc.so.0 $(STAGING_TARGET_DIR)/lib/libc.so
+	# cleanup toolchain
+	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
+	PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
-- 
cgit v1.2.3