From cd99451ff421a3aaf77b7c5bc8fd3968af45766d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 31 May 2010 17:30:14 +0200 Subject: quote PATH, some people use strange directory names --- toolchain/gcc/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'toolchain') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index bd1c69678..c74c841fe 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -51,7 +51,7 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) (cd $(GCC_BUILD_DIR_MINIMAL); rm -f config.cache; \ - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ --enable-languages=c \ @@ -62,12 +62,12 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured: touch $@ $(GCC_BUILD_DIR_MINIMAL)/.compiled: $(GCC_BUILD_DIR_MINIMAL)/.configured - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_MINIMAL) all-gcc touch $@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) install-gcc touch $@ @@ -78,7 +78,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: ln -sf ${STAGING_DIR}/lib $(STAGING_TOOLS)/$(REAL_GNU_TARGET_NAME)/lib mkdir -p $(GCC_BUILD_DIR_INITIAL) (cd $(GCC_BUILD_DIR_INITIAL); rm -f config.cache; \ - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ --enable-languages=c \ @@ -91,19 +91,19 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc touch $@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc install-target-libgcc touch $@ $(GCC_BUILD_DIR_FINAL)/.configured: mkdir -p $(GCC_BUILD_DIR_FINAL) (cd $(GCC_BUILD_DIR_FINAL); rm -f config.cache; \ - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ --enable-languages=c,c++ \ @@ -114,12 +114,12 @@ $(GCC_BUILD_DIR_FINAL)/.configured: touch $@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_FINAL) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install # workaround if you cross-compile binutils @-rm $(STAGING_DIR)/lib/libiberty.a -- cgit v1.2.3 From 91bf2231a22d817d9ec663d9a76464c220adb88f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Jun 2010 17:56:52 +0200 Subject: fix instability problems on my loongson laptop the latest binutils contains the needed options to build a kernel with the needed workarounds. Activate the work arounds. --- target/lemote/Makefile | 7 ++++--- target/lemote/files/boot/boot.cfg | 6 +++--- target/lemote/kernel.config | 8 +++++--- toolchain/binutils/Makefile.inc | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) (limited to 'toolchain') diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 59e2b84b1..d79f1e270 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -7,8 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +KERNEL:=$(LINUX_DIR)/vmlinuz + kernel-install: - @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config @@ -73,7 +75,6 @@ endif ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/lemote/files/boot/boot.cfg b/target/lemote/files/boot/boot.cfg index 2f67fe67b..dd386032b 100644 --- a/target/lemote/files/boot/boot.cfg +++ b/target/lemote/files/boot/boot.cfg @@ -1,7 +1,7 @@ -timeout 4 +timeout 3 default 0 showmenu 1 title Linux - kernel /dev/fs/ext2@wd0/boot/lemote-encrypted-kernel - args no_auto_cmd root=/dev/mapper/root resume=/dev/mapper/swap + kernel /dev/fs/ext2@wd0/boot/vmlinuz-adk + args no_auto_cmd diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config index c109120a0..21df7a57a 100644 --- a/target/lemote/kernel.config +++ b/target/lemote/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Fri May 28 12:08:04 2010 +# Thu Jun 3 15:37:40 2010 # CONFIG_MIPS=y @@ -108,7 +108,9 @@ CONFIG_CPU_LOONGSON2F=y # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set # CONFIG_CPU_CAVIUM_OCTEON is not set -# CONFIG_CPU_LOONGSON2F_WORKAROUNDS is not set +CONFIG_CPU_NOP_WORKAROUNDS=y +CONFIG_CPU_JUMP_WORKAROUNDS=y +CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y CONFIG_SYS_SUPPORTS_ZBOOT=y CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y CONFIG_CPU_LOONGSON2=y @@ -1386,7 +1388,7 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_EARLY_PRINTK=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=tty0 init=/init no_auto_cmd" -CONFIG_CMDLINE_OVERRIDE=y +# CONFIG_CMDLINE_OVERRIDE is not set # # Security options diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index c38f81d7a..7a91b2a69 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -2,8 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= binutils -PKG_VERSION:= 2.20.1 +PKG_VERSION:= 2.20.51 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9cdfb9d6ec0578c166d3beae5e15c4e5 -PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +PKG_MD5SUM:= 70971093cfa11bd943e06eccb2fd8914 +PKG_SITES:= ftp://sourceware.org/pub/binutils/snapshots/ +#PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -- cgit v1.2.3 From 5c6967567427b9d5cbde9057b49a4894177ad559 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Jun 2010 12:33:24 +0200 Subject: fix compile issues on MacOS X host --- toolchain/gmp/Makefile | 3 --- toolchain/mpfr/Makefile | 2 -- 2 files changed, 5 deletions(-) (limited to 'toolchain') diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 5b359b8cf..18dc3f83a 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -15,11 +15,8 @@ $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ - --build=$(GNU_HOST_NAME) \ - --host=$(GNU_HOST_NAME) \ --disable-shared \ --enable-static \ - --disable-nls \ ); touch $@ diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index 67753db9b..9feac6522 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -16,8 +16,6 @@ $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ - --build=$(GNU_HOST_NAME) \ - --host=$(GNU_HOST_NAME) \ --with-gmp-build=$(GMP_BUILD_DIR) \ --disable-shared \ --enable-static \ -- cgit v1.2.3 From 97c636279c04e0d01c64b2ba0a1f76b8a1cc5d48 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 8 Jun 2010 10:40:07 +0200 Subject: fix checksum and some typos --- mk/build.mk | 8 ++++---- toolchain/binutils/Makefile.inc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'toolchain') diff --git a/mk/build.mk b/mk/build.mk index 359569826..0d807076a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -284,9 +284,9 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi - for symbol in ${DEFCONFIG}; do \ + @for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/.defconfig; \ - done; \ + done @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ @@ -355,9 +355,9 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ fi - for symbol in ${DEFCONFIG}; do \ + @for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/all.config; \ - done; \ + done @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 7a91b2a69..0325a2293 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -4,7 +4,7 @@ PKG_NAME:= binutils PKG_VERSION:= 2.20.51 PKG_RELEASE:= 1 -PKG_MD5SUM:= 70971093cfa11bd943e06eccb2fd8914 +PKG_MD5SUM:= 74a7716095e031c8462137ca26ff5472 PKG_SITES:= ftp://sourceware.org/pub/binutils/snapshots/ #PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -- cgit v1.2.3 From 39998a3fc54b00043503526baafe8eb6a11cbc82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Jun 2010 11:05:55 +0200 Subject: disable cloog and ppl support --- toolchain/gcc/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'toolchain') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index c74c841fe..eb86166ff 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -22,6 +22,10 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --disable-sjlj-exceptions \ --disable-libssp \ --disable-libstdcxx-pch \ + --disable-ppl-version-check \ + --disable-cloog-version-check \ + --without-ppl \ + --without-cloog \ --disable-nls ifeq ($(ADK_TARGET_NO_FPU),y) -- cgit v1.2.3