From bc561e500e22bc9d953fd9a80144f80295a4cbbd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 09:28:19 +0100 Subject: convert to miniconfig only miniconfig is used for all targets. aranym support is still broken/experimental. 32 bit kernel support for 64 targets need to be fixed. tested on usb boot on ibm-x40 --- target/sh/sys-available/qemu-sh4 | 2 -- target/sh/sys-available/qemu-sh4eb | 2 -- 2 files changed, 4 deletions(-) (limited to 'target/sh') diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index 83a645d65..03880e66d 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -4,10 +4,8 @@ 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..a4af4ede2 100644 --- a/target/sh/sys-available/qemu-sh4eb +++ b/target/sh/sys-available/qemu-sh4eb @@ -4,10 +4,8 @@ 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). -- cgit v1.2.3 From 2ecd16cdc29599a1b4d62ee0b0aa4c88aa146de4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 08:35:43 +0100 Subject: remove ADK_TARGET_WITH from qemu configs, is more dynamic. remove device node creation for initramfs. --- target/sh/sys-available/qemu-sh4 | 1 - target/sh/sys-available/qemu-sh4eb | 1 - 2 files changed, 2 deletions(-) (limited to 'target/sh') diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index 03880e66d..5ebd224be 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4 select ADK_qemu_sh4 select ADK_CPU_SH4 select ADK_HARDWARE_QEMU - 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 a4af4ede2..f50f96b3e 100644 --- a/target/sh/sys-available/qemu-sh4eb +++ b/target/sh/sys-available/qemu-sh4eb @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB select ADK_qemu_sh4 select ADK_CPU_SH4 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_USB select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). -- cgit v1.2.3 From a4d9f84daa3c1d5195daf4e85cdc5d2fc1a98d5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 23:07:55 +0100 Subject: disable block driver for qemu emulators, can be activated via menuconfig --- target/sh/kernel/qemu-sh | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'target/sh') diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh index 5c38a01fb..e701ac3b0 100644 --- a/target/sh/kernel/qemu-sh +++ b/target/sh/kernel/qemu-sh @@ -16,14 +16,6 @@ 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 @@ -33,5 +25,3 @@ 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 -- cgit v1.2.3 From 521eddfc1e29218e26e3080c095a519ea3f8156d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 09:36:25 +0100 Subject: optimize miniconfigs, enable netstuff by default --- target/sh/kernel/qemu-sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'target/sh') diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh index e701ac3b0..c8d6e347c 100644 --- a/target/sh/kernel/qemu-sh +++ b/target/sh/kernel/qemu-sh @@ -16,10 +16,7 @@ CONFIG_SH_INTC=y CONFIG_CMDLINE_OVERWRITE=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=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 -- cgit v1.2.3 From 718043e164f93e243dad589af63ab68dbc0c7050 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 14:25:05 +0100 Subject: fix boot from disk for qemu targets --- target/sh/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'target/sh') diff --git a/target/sh/Makefile b/target/sh/Makefile index 3cf65f614..160ed6b74 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)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" +endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) -- cgit v1.2.3 From d714919ee99c1ef6a2b7cc369b1c78624ad956fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 18 Mar 2014 01:35:19 +0100 Subject: use archive without kernel --- target/sh/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/sh') diff --git a/target/sh/Makefile b/target/sh/Makefile index 160ed6b74..0d5706eb3 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -23,10 +23,10 @@ ifneq ($(ADK_HARDWARE_QEMU),) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +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)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) -- cgit v1.2.3 From a0ad2f92a9133af67883899615eeb760f47f8bff Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 20:44:22 +0100 Subject: make optimiztion compiler flags configurable, default -Os -pipe --- target/sh/target.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'target/sh') 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) -- cgit v1.2.3 From 28e9a68b020cdbde0e1e71a4967bee0bc26a0890 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 10:33:08 +0100 Subject: use xz instead of gzip, remove grub for qemu, add it only to ibm-x40 --- target/sh/sys-available/toolchain-sh | 2 +- target/sh/sys-available/toolchain-sheb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/sh') 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). -- cgit v1.2.3