From 6f2c1e1ed1d9ac59e8dda23d151d0085888498e8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Dec 2013 19:07:22 +0100 Subject: add support for microblaze architecture, tested with qemu-system-microblaze{,el} --- mk/kernel-build.mk | 4 ++++ mk/vars.mk | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'mk') diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 3f055e255..59a68eb88 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -7,6 +7,10 @@ include ${TOPDIR}/mk/kernel-vars.mk KERNEL_FILE:=$(ADK_TARGET_KERNEL) KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +ifeq ($(ADK_TARGET_KERNEL_LINUXBIN),y) +KERNEL_FILE:=vmlinux +KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +endif ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y) KERNEL_FILE:=vmlinux KERNEL_TARGET:=$(ADK_TARGET_KERNEL) diff --git a/mk/vars.mk b/mk/vars.mk index 50e02a204..9f4f8f0b9 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -75,8 +75,13 @@ TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld 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) TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) +endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -- cgit v1.2.3 From d8eb95ffc8cd8ca910032ad21aa400755b538b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 13 Dec 2013 12:55:35 +0100 Subject: fix build --- mk/build.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 0b3d2cc73..baaf459c8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -572,8 +572,9 @@ release: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; break;fi \ done + if [ -f .exit ];then rm .exit;exit 1;fi # build all target architecture, target systems and libc combinations bulk: -- cgit v1.2.3 From 3a26d8a1629c063d336d61e0fcf622056499204e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Dec 2013 12:36:02 +0100 Subject: do not build openafs at the moment --- mk/build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index baaf459c8..ad2d42b40 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -36,6 +36,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PACKAGE_LIBSSP=n \ + ADK_PACKAGE_OPENAFS=n \ ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ -- cgit v1.2.3 From 0e14700702f06f09f25bc861e2642a6d42da982b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Dec 2013 14:09:00 +0100 Subject: need to merge third patch from Phil manually. disable on non Linux hosts --- mk/image.mk | 13 +++++++++++++ mk/rootfs.mk | 1 + 2 files changed, 14 insertions(+) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 2273b4af7..7c519d7f5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -121,12 +121,14 @@ INITRAMFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +ROOTFSISO= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso else TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso endif ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package @@ -197,5 +199,16 @@ endif $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) +${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package + mkdir -p ${TARGET_DIR}/boot/syslinux + cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \ + ${TARGET_DIR}/boot/syslinux + echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \ + ${TARGET_DIR}/boot/syslinux/isolinux.cfg + ${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \ + -b boot/syslinux/isolinux.bin \ + -c boot/syslinux/boot.cat -no-emul-boot \ + -boot-load-size 4 -boot-info-table ${TARGET_DIR} + imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-* diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 283c87aa7..18d4f83dc 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -52,5 +52,6 @@ $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS))) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) +$(eval $(call rootfs_template,iso,ISO)) export ADK_TARGET_FS -- cgit v1.2.3 From 081a0d8a8e175d92b4f0d86466f2ec68537bb868 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 17 Dec 2013 17:01:32 +0100 Subject: fix vfat support, use correct codepage and iocharset --- mk/kernel-ver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 0cfc73006..e4c368af5 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) KERNEL_VERSION:= 3.11.10 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= edbf88eb7f7d34dbd5d3887726790755 +KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif ifeq ($(ADK_KERNEL_VERSION_3_11_10),y) KERNEL_VERSION:= 3.11.10 -- cgit v1.2.3