summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/rootfs.mk5
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c16
-rw-r--r--package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc6
-rw-r--r--package/firefox/patches/patch-netwerk_sctp_src_user_environment_c14
-rw-r--r--package/glibc/Makefile6
-rw-r--r--package/mksh/Makefile5
-rw-r--r--target/arm/Makefile6
-rw-r--r--target/config/Config.in21
-rw-r--r--target/m68k/Makefile6
-rw-r--r--target/microblaze/Makefile7
-rw-r--r--target/mips/Makefile6
-rw-r--r--target/mips/kernel/qemu-mips2
-rw-r--r--target/mips/kernel/qemu-mips642
-rw-r--r--target/mips/kernel/qemu-mipsel2
-rw-r--r--target/packages/pkg-available/test2
-rw-r--r--target/ppc/Makefile6
-rw-r--r--target/ppc64/Makefile6
-rw-r--r--target/sh/Makefile6
-rw-r--r--target/sparc/Makefile6
-rw-r--r--target/sparc64/Makefile25
-rw-r--r--target/sparc64/kernel/qemu-sparc643
-rw-r--r--target/x86/Makefile6
-rw-r--r--target/x86/kernel/qemu-i6863
-rw-r--r--target/x86_64/Makefile6
-rw-r--r--target/x86_64/kernel/qemu-x86_643
-rw-r--r--toolchain/gcc/Makefile.inc5
27 files changed, 147 insertions, 36 deletions
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 812c90680..43cfaa821 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -10,8 +10,12 @@ endef
ifeq ($(ADK_HARDWARE_QEMU),y)
MTDDEV:= root=/dev/mtdblock0
+ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
ROOTFS:= root=/dev/vda1
+else
+ROOTFS:= root=/dev/sda1
+endif
endif
endif
@@ -43,6 +47,7 @@ $(eval $(call rootfs_template,cf,CF,$(ROOTFS)))
$(eval $(call rootfs_template,mmc,MMC,$(ROOTFS)))
$(eval $(call rootfs_template,usb,USB,$(USB)))
$(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
+$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE))
$(eval $(call rootfs_template,initramfs,INITRAMFS))
$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
$(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 1fb663e06..d54996401 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
PKG_VERSION:= 26.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 4
PKG_MD5SUM:= 91ce51cc6474f1269484e5327643a59c
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
index 3a79329a3..f2b55cd6a 100644
--- a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
+++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
@@ -1,6 +1,16 @@
--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2014-02-05 07:19:01.000000000 +0100
-@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id:
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2014-03-16 18:41:03.000000000 +0100
+@@ -45,7 +45,9 @@ static char *RCSSTRING __UNUSED__="$Id:
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #ifndef ANDROID
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
++#endif
+ #include <sys/syslog.h>
+ #else
+ #include <syslog.h>
+@@ -53,7 +55,9 @@ static char *RCSSTRING __UNUSED__="$Id:
#undef __unused
#include <linux/sysctl.h>
#endif
@@ -10,7 +20,7 @@
#ifndef LINUX
#if !defined(__OpenBSD__) && !defined(__NetBSD__)
#include <net/if_var.h>
-@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id:
+@@ -61,14 +65,17 @@ static char *RCSSTRING __UNUSED__="$Id:
#include <net/if_dl.h>
#include <net/if_types.h>
#include <sys/sockio.h>
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
index 809dff52a..5e066a88a 100644
--- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
@@ -1,6 +1,6 @@
--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-12-05 17:07:50.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2014-02-05 07:19:01.000000000 +0100
-@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2014-03-16 10:56:09.000000000 +0100
+@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Available number of cores:%d", number_of_cores_);
@@ -12,7 +12,7 @@
#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
int name[] = {
CTL_HW,
-@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
+@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
"Failed to get number of cores");
number_of_cores_ = 1;
}
diff --git a/package/firefox/patches/patch-netwerk_sctp_src_user_environment_c b/package/firefox/patches/patch-netwerk_sctp_src_user_environment_c
new file mode 100644
index 000000000..a31543c75
--- /dev/null
+++ b/package/firefox/patches/patch-netwerk_sctp_src_user_environment_c
@@ -0,0 +1,14 @@
+--- mozilla-release.orig/netwerk/sctp/src/user_environment.c 2013-12-05 17:07:52.000000000 +0100
++++ mozilla-release/netwerk/sctp/src/user_environment.c 2014-03-16 17:53:08.000000000 +0100
+@@ -35,9 +35,11 @@
+ #include <stdint.h>
+ #if !defined(__Userspace_os_FreeBSD)
+ #if !defined(ANDROID)
++#if defined(__GLIBC__)
+ #include <sys/sysctl.h>
+ #endif
+ #endif
++#endif
+ #include <netinet/sctp_os_userspace.h>
+ #endif
+ #include <user_environment.h>
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 92ccf8cd4..17c49f3af 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -31,10 +31,10 @@ INSTALL_STYLE:= manual
# compile nothing, glibc is already build in toolchain directory
do-install:
${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)
- $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
+ $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \
- $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
- $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
+ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
+ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
done
${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin
$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index c40d9d807..a38b97733 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -21,6 +21,11 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+= -static
+TARGET_LDFLAGS+= -static
+endif
+
TARGET_CPPFLAGS+= -DMKSH_SMALL=1
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 77148e261..a652003eb 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -70,6 +70,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
@echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL) -hda 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)
diff --git a/target/config/Config.in b/target/config/Config.in
index ee6aaa695..79f067bf3 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -251,7 +251,6 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
select ADK_soft_float
select ADK_eabi
select ADK_CPU_XSCALE
- select ADK_TARGET_WITH_VGA
depends on ADK_TARGET_SYSTEM_QEMU_ARM
endchoice
@@ -259,6 +258,7 @@ endchoice
choice
prompt "Qemu Emulation with permanent storage device (disk/flash)"
depends on ADK_HARDWARE_QEMU
+default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE
config ADK_TARGET_QEMU_WITHOUT_BLOCK
boolean "disabled"
@@ -304,7 +304,13 @@ endchoice
choice
prompt "Qemu Emulation using VirtIO drivers"
-depends on ADK_TARGET_SYSTEM_QEMU_SPARC64
+depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
+ ADK_TARGET_SYSTEM_QEMU_I686 || \
+ ADK_TARGET_SYSTEM_QEMU_X86_64
+default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_SPARC64
+
+config ADK_TARGET_QEMU_WITHOUT_VIRTIO
+ boolean "disabled"
config ADK_TARGET_QEMU_WITH_VIRTIO
boolean "enabled"
@@ -314,9 +320,6 @@ config ADK_TARGET_QEMU_WITH_VIRTIO
select ADK_KERNEL_VIRTIO_NET
select ADK_KERNEL_VIRTIO_BLK
-config ADK_TARGET_QEMU_WITHOUT_VIRTIO
- boolean "disabled"
-
endchoice
@@ -757,6 +760,7 @@ config ADK_TARGET_SUFFIX
choice
prompt "Target firmware type"
depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN
+default ADK_TARGET_ROOTFS_INITRAMFSARCHIVE if ADK_PKG_TEST
default ADK_TARGET_ROOTFS_ARCHIVE
config ADK_TARGET_ROOTFS_INITRAMFS
@@ -897,10 +901,17 @@ config ADK_TARGET_ROOTFS_ISO
help
Use this option to create a bootable ISO image.
+config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
+ bool "Archive usable for initramfs creation"
+ help
+ Use this option if your palnning to create a initramfs,
+ useful for adk-test-framework.
+
config ADK_TARGET_ROOTFS_ARCHIVE
bool "Archive usable for different filesystems"
select ADK_HOST_NEED_GENEXT2FS if ADK_HARDWARE_QEMU
select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
+ select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
help
Use this option if your root filesystem is ext2/ext3/ext4/xfs.
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 282cb5496..d68393b84 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -15,6 +15,12 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
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)
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 74f8d3dd0..c60545e56 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -58,5 +58,12 @@ endif
ifeq ($(ADK_TARGET_FS),archive)
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),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
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 68c2ea0fe..9fd479d5d 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -112,6 +112,12 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
@echo "The root parameter have to be changed."
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)
diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips
index 4f5c34fd6..3f06298bf 100644
--- a/target/mips/kernel/qemu-mips
+++ b/target/mips/kernel/qemu-mips
@@ -12,5 +12,3 @@ CONFIG_E1000=y
CONFIG_PHYLIB=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64
index a3accc1a6..d4ef42c15 100644
--- a/target/mips/kernel/qemu-mips64
+++ b/target/mips/kernel/qemu-mips64
@@ -14,5 +14,3 @@ CONFIG_NET_VENDOR_INTEL=y
CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel
index f1f7adcec..e16f008b7 100644
--- a/target/mips/kernel/qemu-mipsel
+++ b/target/mips/kernel/qemu-mipsel
@@ -12,5 +12,3 @@ CONFIG_E1000=y
CONFIG_PHYLIB=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
index ab8e0a75c..7bbbe5310 100644
--- a/target/packages/pkg-available/test
+++ b/target/packages/pkg-available/test
@@ -4,10 +4,12 @@ config ADK_PKG_TEST
select ADK_PACKAGE_STRACE
select ADK_PACKAGE_SOCAT
select ADK_PACKAGE_MAKE
+ select ADK_PACKAGE_FILE
select ADK_KERNEL_BLK_DEV_INITRD
select ADK_KERNEL_COMP_XZ
select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
select ADK_SIMPLE_NETWORK_CONFIG
+ select ADK_KPACKAGE_KMOD_IPV6
default n
help
Package collection used to build adk-test-framework root
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index 3085e98cc..ceb31e5f5 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -22,6 +22,12 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
@echo 'qemu-system-ppc -M mac99 -nographic -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)
diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile
index 2bc6e66cb..0ad0843c0 100644
--- a/target/ppc64/Makefile
+++ b/target/ppc64/Makefile
@@ -22,6 +22,12 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
@echo 'qemu-system-ppc64 -nographic -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)
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)
diff --git a/target/sparc/Makefile b/target/sparc/Makefile
index 6960aed4c..abe521e66 100644
--- a/target/sparc/Makefile
+++ b/target/sparc/Makefile
@@ -21,6 +21,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y)
@echo 'qemu-system-sparc -M SS-5 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"'
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)
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile
index 8fe5ebbcc..0d3dc560b 100644
--- a/target/sparc64/Makefile
+++ b/target/sparc64/Makefile
@@ -9,6 +9,17 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/vmlinux
+QEMU_ARGS:=-M sun4u
+ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHICS),)
+QEMU_ARGS+=-nographic
+endif
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+QEMU_ARGS+=-net nic,model=virtio -net user
+ifeq ($(ADK_TARGET_FS),archive)
+QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0
+endif
+endif
+
ifeq ($(ADK_TARGET_FS),archive)
imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL}
@@ -18,12 +29,14 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
@echo "Use following command to create a QEMU Image:"
@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following command line:"
-ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
- @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
-else
- @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-sparc64 $(QEMU_ARGS) -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)
@@ -32,7 +45,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -41,6 +54,6 @@ imageinstall: createinitramfs
@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL)'
endif
endif
diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64
index e78fd6071..a2b048860 100644
--- a/target/sparc64/kernel/qemu-sparc64
+++ b/target/sparc64/kernel/qemu-sparc64
@@ -12,9 +12,6 @@ CONFIG_OF_NET=y
CONFIG_OF_PCI=y
CONFIG_IOMMU_SUPPORT=y
CONFIG_OF_IOMMU=y
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NE2K_PCI=y
CONFIG_SERIAL_CONSOLE=y
CONFIG_SERIAL_SUNCORE=y
CONFIG_SERIAL_SUNSU=y
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 91c9cef17..489d4dd1d 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -42,6 +42,12 @@ ifeq ($(ADK_HARDWARE_VBOX),y)
@echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
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)"
diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686
index 275b49592..7eb708745 100644
--- a/target/x86/kernel/qemu-i686
+++ b/target/x86/kernel/qemu-i686
@@ -9,6 +9,3 @@ CONFIG_NET_VENDOR_INTEL=y
CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
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)"
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
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 86a0a5992..25e51178a 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -2,8 +2,13 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= gcc
+ifeq ($(ADK_LINUX_SPARC),y)
+PKG_VERSION:= 4.7.3
+PKG_MD5SUM:= 86f428a30379bdee0224e353ee2f999e
+else
PKG_VERSION:= 4.8.2
PKG_MD5SUM:= a3d7d63b9cb6b6ea049469a0c4a43c9d
+endif
PKG_RELEASE:= 1
PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2