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/x86_64/sys-available/qemu-x86_64 | 1 - 1 file changed, 1 deletion(-) (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 36e3d34b4..2ec93e739 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_MAY_64BIT select ADK_TARGET_KERNEL_BZIMAGE - select ADK_USE_KERNEL_MINICONFIG help Support for Qemu Emulator. -- 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/x86_64/sys-available/qemu-x86_64 | 1 - 1 file changed, 1 deletion(-) (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 2ec93e739..48b6fceab 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_MAY_64BIT select ADK_TARGET_KERNEL_BZIMAGE help Support for Qemu Emulator. -- 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/x86_64/kernel/qemu-x86_64 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index fa22835b8..febf38bcf 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -19,14 +19,6 @@ CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y CONFIG_X86_X32=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_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y @@ -36,5 +28,5 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -- 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/x86_64/kernel/qemu-x86_64 | 3 --- 1 file changed, 3 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index febf38bcf..9c1a14724 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -19,9 +19,6 @@ CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y CONFIG_X86_X32=y -CONFIG_NETDEVICES=y -CONFIG_NET_CORE=y -CONFIG_ETHERNET=y CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y CONFIG_SERIAL_8250=y -- cgit v1.2.3 From 6c26b8016dda0c391a3a513c46998e16ce09cc4d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 09:55:20 +0100 Subject: use gcc 4.7.3 for sparc, 4.8.2 breaks kernel bootup, minor cleanup --- target/x86_64/kernel/qemu-x86_64 | 3 --- 1 file changed, 3 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index 9c1a14724..e0183cc39 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -24,6 +24,3 @@ CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -- 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/x86_64/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'target/x86_64') diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 596f2923f..7087c9ca1 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -20,6 +20,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -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),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -- cgit v1.2.3 From 803b9757e040cc1a9090de4ac5572290c83d31fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 19:04:45 +0100 Subject: remove kernel choice, always use 64 bit for 64bit target --- target/x86_64/kernel/qemu-x86_64 | 1 - 1 file changed, 1 deletion(-) (limited to 'target/x86_64') diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index e0183cc39..baad58c81 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -1,5 +1,4 @@ CONFIG_X86=y -CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_GENERIC_CPU=y CONFIG_PROCESSOR_SELECT=y -- 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/x86_64/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 7087c9ca1..c94c3a1a6 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -21,10 +21,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) 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),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) -- cgit v1.2.3 From ed4403bfb1fe658735a6a9d64c282d599c6b7901 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 21 Mar 2014 23:07:09 +0100 Subject: fix x86_64 toolchain building --- target/x86_64/sys-available/toolchain-x86_64 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index c268e9687..e71829085 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -1,8 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 bool "Toolchain only" select ADK_x86_64 + select ADK_64 select ADK_toolchain_x86_64 select ADK_CPU_X86_64 + select ADK_LINUX_64 select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help -- 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/x86_64/target.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'target/x86_64') diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk index 3eed00bf5..f381673fa 100644 --- a/target/x86_64/target.mk +++ b/target/x86_64/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= x86 CPU_ARCH:= x86_64 -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -- cgit v1.2.3 From 46af98aa4327633d1509d728b3b85e0a4da39c9b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 25 Mar 2014 12:05:56 +0100 Subject: add support for x86_64 toolchain with 32 bit abi --- target/x86_64/sys-available/toolchain-x86_64_32 | 12 ++++++++++++ target/x86_64/sys-available/toolchain-x86_64_x32 | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 target/x86_64/sys-available/toolchain-x86_64_32 create mode 100644 target/x86_64/sys-available/toolchain-x86_64_x32 (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32 new file mode 100644 index 000000000..501c31050 --- /dev/null +++ b/target/x86_64/sys-available/toolchain-x86_64_32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32 + bool "Toolchain only (32 ABI)" + select ADK_x86_64 + select ADK_32 + select ADK_toolchain_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ + help + Build a x86_64 toolchain. + diff --git a/target/x86_64/sys-available/toolchain-x86_64_x32 b/target/x86_64/sys-available/toolchain-x86_64_x32 new file mode 100644 index 000000000..090d474b6 --- /dev/null +++ b/target/x86_64/sys-available/toolchain-x86_64_x32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_X32 + bool "Toolchain only (x32 ABI)" + select ADK_x86_64 + select ADK_x32 + select ADK_toolchain_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ + help + Build a x86_64 toolchain. + -- cgit v1.2.3 From dfba3b8a9ec9ee87a89303958468c90fc3c8fe67 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 26 Mar 2014 12:08:22 +0100 Subject: add all abi combinations for mips64 and x86_64 --- target/x86_64/sys-available/qemu-x86_64_32 | 12 ++++++++++++ target/x86_64/sys-available/qemu-x86_64_x32 | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 target/x86_64/sys-available/qemu-x86_64_32 create mode 100644 target/x86_64/sys-available/qemu-x86_64_x32 (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/qemu-x86_64_32 b/target/x86_64/sys-available/qemu-x86_64_32 new file mode 100644 index 000000000..7af125437 --- /dev/null +++ b/target/x86_64/sys-available/qemu-x86_64_32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_QEMU_X86_64_32 + bool "Qemu Emulator" + select ADK_x86_64 + select ADK_qemu_x86_64 + select ADK_32 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for Qemu Emulator. + diff --git a/target/x86_64/sys-available/qemu-x86_64_x32 b/target/x86_64/sys-available/qemu-x86_64_x32 new file mode 100644 index 000000000..3b1439ce0 --- /dev/null +++ b/target/x86_64/sys-available/qemu-x86_64_x32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_QEMU_X86_64_X32 + bool "Qemu Emulator" + select ADK_x86_64 + select ADK_qemu_x86_64 + select ADK_x32 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for Qemu Emulator. + -- cgit v1.2.3 From dd2393801bcd6775e3b5dc8700ba4a9d5b379f33 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 26 Mar 2014 16:19:53 +0100 Subject: test framework fixes --- target/x86_64/sys-available/qemu-x86_64 | 1 + 1 file changed, 1 insertion(+) (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 48b6fceab..5067a8ecf 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 + select ADK_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU -- cgit v1.2.3 From 52601d4d62823cba78aad0a919bee43ca0690b3b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 Mar 2014 15:03:18 +0100 Subject: add unique description --- target/x86_64/sys-available/qemu-x86_64_32 | 2 +- target/x86_64/sys-available/qemu-x86_64_x32 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/qemu-x86_64_32 b/target/x86_64/sys-available/qemu-x86_64_32 index 7af125437..56ccc9a36 100644 --- a/target/x86_64/sys-available/qemu-x86_64_32 +++ b/target/x86_64/sys-available/qemu-x86_64_32 @@ -1,5 +1,5 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64_32 - bool "Qemu Emulator" + bool "Qemu Emulator (x86_64 with 32 ABI)" select ADK_x86_64 select ADK_qemu_x86_64 select ADK_32 diff --git a/target/x86_64/sys-available/qemu-x86_64_x32 b/target/x86_64/sys-available/qemu-x86_64_x32 index 3b1439ce0..9108c7951 100644 --- a/target/x86_64/sys-available/qemu-x86_64_x32 +++ b/target/x86_64/sys-available/qemu-x86_64_x32 @@ -1,5 +1,5 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64_X32 - bool "Qemu Emulator" + bool "Qemu Emulator (x86_64 with X32 ABI)" select ADK_x86_64 select ADK_qemu_x86_64 select ADK_x32 -- cgit v1.2.3 From 22855e8ea83aa0d349a9b1abed88f8bffac2569b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 Mar 2014 19:11:23 +0100 Subject: x86-64 32bit needs more work, fix armhf --- target/x86_64/sys-available/qemu-x86_64_32 | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 target/x86_64/sys-available/qemu-x86_64_32 (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/qemu-x86_64_32 b/target/x86_64/sys-available/qemu-x86_64_32 deleted file mode 100644 index 56ccc9a36..000000000 --- a/target/x86_64/sys-available/qemu-x86_64_32 +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_X86_64_32 - bool "Qemu Emulator (x86_64 with 32 ABI)" - select ADK_x86_64 - select ADK_qemu_x86_64 - select ADK_32 - select ADK_CPU_X86_64 - select ADK_LINUX_64 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_BZIMAGE - help - Support for Qemu Emulator. - -- 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/x86_64/sys-available/toolchain-x86_64 | 2 +- target/x86_64/sys-available/toolchain-x86_64_32 | 2 +- target/x86_64/sys-available/toolchain-x86_64_x32 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index e71829085..b93b479a1 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32 index 501c31050..9e8297ea4 100644 --- a/target/x86_64/sys-available/toolchain-x86_64_32 +++ b/target/x86_64/sys-available/toolchain-x86_64_32 @@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. diff --git a/target/x86_64/sys-available/toolchain-x86_64_x32 b/target/x86_64/sys-available/toolchain-x86_64_x32 index 090d474b6..22d94171f 100644 --- a/target/x86_64/sys-available/toolchain-x86_64_x32 +++ b/target/x86_64/sys-available/toolchain-x86_64_x32 @@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_X32 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. -- cgit v1.2.3