Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 8 insertions, 22 deletions

diff --git a/target/sh/Makefile b/target/sh/Makefile
index 3cf65f614..0d5706eb3 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -22,6 +22,12 @@ ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),initramfsarchive)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
+	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
+endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh
index 5c38a01fb..c8d6e347c 100644
--- a/target/sh/kernel/qemu-sh
+++ b/target/sh/kernel/qemu-sh
@@ -16,22 +16,9 @@ CONFIG_SH_INTC=y
 CONFIG_CMDLINE_OVERWRITE=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-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_PLATFORM=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
 CONFIG_MII=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=y
 CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=2
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4
index 83a645d65..5ebd224be 100644
--- a/target/sh/sys-available/qemu-sh4
+++ b/target/sh/sys-available/qemu-sh4
@@ -4,10 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4
 	select ADK_little
 	select ADK_qemu_sh4
 	select ADK_CPU_SH4
-	select ADK_KERNEL_CPU_LITTLE_ENDIAN
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_USB
-	select ADK_USE_KERNEL_MINICONFIG
 	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 80389775e..f50f96b3e 100644
--- a/target/sh/sys-available/qemu-sh4eb
+++ b/target/sh/sys-available/qemu-sh4eb
@@ -4,10 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB
 	select ADK_big
 	select ADK_qemu_sh4
 	select ADK_CPU_SH4
-	select ADK_KERNEL_CPU_BIG_ENDIAN
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_USB
-	select ADK_USE_KERNEL_MINICONFIG
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (superh).
diff --git a/target/sh/sys-available/toolchain-sh b/target/sh/sys-available/toolchain-sh
index 287401079..b9dedcfd2 100644
--- a/target/sh/sys-available/toolchain-sh
+++ b/target/sh/sys-available/toolchain-sh
@@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH
 	select ADK_toolchain_sh
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TGZ
+	select ADK_TARGET_PACKAGE_TXZ
 	help
 	  Build a superh toolchain (sh4).
 
diff --git a/target/sh/sys-available/toolchain-sheb b/target/sh/sys-available/toolchain-sheb
index 236d4e486..f61547d24 100644
--- a/target/sh/sys-available/toolchain-sheb
+++ b/target/sh/sys-available/toolchain-sheb
@@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SHEB
 	select ADK_toolchain_sheb
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TGZ
+	select ADK_TARGET_PACKAGE_TXZ
 	help
 	  Build a superh toolchain (sh4 big endian).
 
diff --git a/target/sh/target.mk b/target/sh/target.mk
index b5630cced..408dd12c5 100644
--- a/target/sh/target.mk
+++ b/target/sh/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			sh
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)