diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:32:10 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:32:10 +0100 |
commit | b700bbdede249dd290dc67ff2ebdaf730e3ffa6a (patch) | |
tree | 53c9e6bbdee8b73c4061d0132776791a8ab46787 /target | |
parent | 9e358d94cc283c8022091e67fe3ca0580301a62a (diff) |
move target/tools to tools, use ADK_HOST_NEED variable to build a tool, when required. Add archivers to tools, remove prereq checks for them. Rename host_ dir in preparation for shared openadk source via nfs/smb from different host systems. Make some abi cleanup
Diffstat (limited to 'target')
55 files changed, 74 insertions, 5534 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 68e2eefb0..f59bdd5b7 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -118,6 +118,17 @@ config ADK_n64 config ADK_TARGET_ABI string + default "o32" if ADK_o32 + default "n32" if ADK_n32 + default "n64" if ADK_n64 + default "32" if ADK_32 + default "x32" if ADK_x32 + default "64" if ADK_64 + default "eabi" if ADK_EABI + default "eabihf" if ADK_EABIHF + +config ADK_TARGET_MIPS_ABI + string default "32" if ADK_o32 default "n32" if ADK_n32 default "64" if ADK_n64 @@ -650,6 +661,7 @@ config ADK_TARGET_LIB_EGLIBC prompt "Embedded GNU C library" boolean select ADK_eglibc + select ADK_HOST_NEED_GPERF depends on \ ADK_LINUX_ARM || \ ADK_LINUX_ARMEB || \ @@ -719,6 +731,11 @@ config ADK_TARGET_SUFFIX default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI + default "n64" if ADK_n64 + default "n32" if ADK_n32 + default "o32" if ADK_o32 + default "32" if ADK_32 + default "x32" if ADK_x32 default "gnu" choice @@ -767,6 +784,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" select ADK_KERNEL_SQUASHFS + select ADK_HOST_NEED_SQUASHFS depends on ADK_TARGET_WITH_MTD help highly compressed read-only filesystem for MTD flash systems. @@ -775,6 +793,7 @@ config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_JFFS2 + select ADK_HOST_NEED_JFFS2 depends on ADK_TARGET_WITH_MTD help compressed read-write filesystem for MTD flash systems. @@ -833,6 +852,7 @@ config ADK_TARGET_ROOTFS_GENEXT2FS depends on ADK_TARGET_WITH_CF select ADK_KERNEL_EXT2_FS select ADK_KERNEL_SCSI + select ADK_HOST_NEED_GENEXT2FS help Use this option if you have a compact flash based system. (ext2 filesystem is used.) @@ -853,6 +873,8 @@ config ADK_TARGET_ROOTFS_ISO select ADK_KERNEL_JOLIET select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV_SR + select ADK_HOST_NEED_MKISOFS + select ADK_HOST_NEED_SYSLINUX depends on ADK_HOST_LINUX depends on ADK_LINUX_X86 help @@ -860,6 +882,7 @@ config ADK_TARGET_ROOTFS_ISO 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 depends on !ADK_LINUX_MICROBLAZE help diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 31246458d..cf92eadee 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -1,3 +1,43 @@ +config ADK_HOST_NEED_MKISOFS + boolean + default n + +config ADK_HOST_NEED_SYSLINUX + boolean + default n + +config ADK_HOST_NEED_GPERF + boolean + default n + +config ADK_HOST_NEED_SQUASHFS + boolean + default n + +config ADK_HOST_NEED_JFFS2 + boolean + default n + +config ADK_HOST_NEED_GENEXT2FS + boolean + default n + +config ADK_HOST_NEED_LZOP + boolean + default n + +config ADK_HOST_NEED_LZMA + boolean + default n + +config ADK_HOST_NEED_BZIP2 + boolean + default n + +config ADK_HOST_NEED_XZ + boolean + default n + config ADK_TOOLS_ADDPATTERN_ARGS string default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index db1ab5c57..d928cea09 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -11,18 +11,22 @@ config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE boolean config ADK_KERNEL_INITRAMFS_COMPRESSION_XZ + select ADK_HOST_NEED_XZ boolean config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA + select ADK_HOST_NEED_LZMA boolean config ADK_KERNEL_INITRAMFS_COMPRESSION_LZO + select ADK_HOST_NEED_LZOP boolean -config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP +config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 + select ADK_HOST_NEED_BZIP2 boolean -config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 +config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP boolean config ADK_KERNEL_RD_GZIP diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 7a411aa95..c3b6dfa7e 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -9,11 +9,6 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) -tools-compile: - $(MAKE) -C ../tools/mtd-utils all - $(MAKE) -C ../tools/xz all - $(MAKE) -C ../tools/squashfs all - ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) MODEL:=petalogix-ml605 DTB:=-dtb target/microblaze/ml605.dtb @@ -24,7 +19,7 @@ DTB:= endif ifeq ($(ADK_TARGET_FS),squashfs) -imageinstall: tools-compile $(BUILD_DIR)/root.squashfs +imageinstall: $(BUILD_DIR)/root.squashfs qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @@ -34,7 +29,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) endif endif ifeq ($(ADK_TARGET_FS),jffs2) -imageinstall: tools-compile $(FW_DIR)/$(ROOTFSJFFS2) +imageinstall: $(FW_DIR)/$(ROOTFSJFFS2) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" diff --git a/target/mips/Makefile b/target/mips/Makefile index 31cbc319a..5ebbe5d7d 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -11,16 +11,8 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id -tools-compile: - $(MAKE) -C ../tools/trx all - $(MAKE) -C ../tools/addpattern all - $(MAKE) -C ../tools/srec2bin all - $(MAKE) -C ../tools/squashfs all - $(MAKE) -C ../tools/lzma all - $(MAKE) -C ../tools/lzma-loader all - ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) -kernel-install: tools-compile +kernel-install: ${TARGET_CROSS}objcopy ${OSTRIP} -S ${LINUX_DIR}/vmlinuz.elf \ ${BUILD_DIR}/${TARGET_KERNEL} @@ -39,7 +31,7 @@ endif endif ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y) -kernel-install: tools-compile +kernel-install: ${TARGET_CROSS}objcopy -S -O srec $(KERNEL) $(LINUX_DIR)/vmlinux.srec PATH='${TARGET_PATH}' srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin (dd if=/dev/zero bs=16 count=1; cat $(LINUX_DIR)/vmlinux.bin) > $(LINUX_DIR)/vmlinux.tmp @@ -56,7 +48,7 @@ kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) -kernel-install: tools-compile +kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) ${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs diff --git a/target/tools/addpattern/Makefile b/target/tools/addpattern/Makefile deleted file mode 100644 index 596daeb52..000000000 --- a/target/tools/addpattern/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/rules.mk - -all: addpattern.c - $(CC_FOR_BUILD) $(FLAGS_FOR_BUILD) -o ${STAGING_HOST_DIR}/bin/addpattern addpattern.c diff --git a/target/tools/addpattern/addpattern.c b/target/tools/addpattern/addpattern.c deleted file mode 100644 index 8133bf26e..000000000 --- a/target/tools/addpattern/addpattern.c +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (C) 2004 Manuel Novoa III <mjn3@codepoet.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* July 29, 2004 - * - * This is a hacked replacement for the 'addpattern' utility used to - * create wrt54g .bin firmware files. It isn't pretty, but it does - * the job for me. - * - * Extensions: - * -v allows setting the version string on the command line. - * -{0|1} sets the (currently ignored) hw_ver flag in the header - * to 0 or 1 respectively. - */ - -/* January 12, 2005 - * - * Modified by rodent at rodent dot za dot net - * Support added for the new WRT54G v2.2 and WRT54GS v1.1 "flags" - * Without the flags set to 0x7, the above units will refuse to flash. - * - * Extensions: - * -{0|1|2} sets {0|1} sets hw_ver flag to 0/1. {2} sets hw_ver to 1 - * and adds the new hardware "flags" for the v2.2/v1.1 units -*/ - -/* January 1, 2007 - * - * Modified by juan.i.gonzalez at subdown dot net - * Support added for the AG241v2 and similar - * - * Extensions: - * -r #.# adds revision hardware flags. AG241v2 and similar. - * - * AG241V2 firmware sets the hw_ver to 0x44. - * - * Example: -r 2.0 - * - * Convert 2.0 to 20 to be an integer, and add 0x30 to skip special ASCII - * #define HW_Version ((HW_REV * 10) + 0x30) -> from cyutils.h -*/ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <unistd.h> -#include <sys/stat.h> - -/**********************************************************************/ - -#define CODE_ID "U2ND" /* from code_pattern.h */ -#define CODE_PATTERN "W54S" /* from code_pattern.h */ -#define PBOT_PATTERN "PBOT" - -#define CYBERTAN_VERSION "v3.37.2" /* from cyutils.h */ - -/* WRT54G v2.2 and WRT54GS v1.1 "flags" (from 3.37.32 firmware cyutils.h) */ -#define SUPPORT_4712_CHIP 0x0001 -#define SUPPORT_INTEL_FLASH 0x0002 -#define SUPPORT_5325E_SWITCH 0x0004 - -struct code_header { /* from cyutils.h */ - char magic[4]; - char res1[4]; /* for extra magic */ - char fwdate[3]; - char fwvern[3]; - char id[4]; /* U2ND */ - char hw_ver; /* 0: for 4702, 1: for 4712 -- new in 2.04.3 */ - char unused; - unsigned char flags[2]; /* SUPPORT_ flags new for 3.37.2 (WRT54G v2.2 and WRT54GS v1.1) */ - unsigned char res2[10]; -} ; - -/**********************************************************************/ - -void usage(void) __attribute__ (( __noreturn__ )); - -void usage(void) -{ - fprintf(stderr, "Usage: addpattern [-i trxfile] [-o binfile] [-p pattern] [-g] [-b] [-v v#.#.#] [-r #.#] [-{0|1|2|4}] -h\n"); - exit(EXIT_FAILURE); -} - -int main(int argc, char **argv) -{ - char buf[1024]; /* keep this at 1k or adjust garbage calc below */ - struct code_header *hdr; - FILE *in = stdin; - FILE *out = stdout; - char *ifn = NULL; - char *ofn = NULL; - char *pattern = CODE_PATTERN; - char *pbotpat = PBOT_PATTERN; - char *version = CYBERTAN_VERSION; - int gflag = 0; - int pbotflag = 0; - int c; - int v0, v1, v2; - size_t off, n; - time_t t; - struct tm *ptm; - - hdr = (struct code_header *) buf; - memset(hdr, 0, sizeof(struct code_header)); - - while ((c = getopt(argc, argv, "i:o:p:gbv:0124hr:")) != -1) { - switch (c) { - case 'i': - ifn = optarg; - break; - case 'o': - ofn = optarg; - break; - case 'p': - pattern = optarg; - break; - case 'g': - gflag = 1; - break; - case 'b': - pbotflag = 1; - break; - case 'v': /* extension to allow setting version */ - version = optarg; - break; - case '0': - hdr->hw_ver = 0; - break; - case '1': - hdr->hw_ver = 1; - break; - case '2': /* new 54G v2.2 and 54GS v1.1 flags */ - hdr->hw_ver = 1; - hdr->flags[0] |= SUPPORT_4712_CHIP; - hdr->flags[0] |= SUPPORT_INTEL_FLASH; - hdr->flags[0] |= SUPPORT_5325E_SWITCH; - break; - case '4': - /* V4 firmware sets the flags to 0x1f */ - hdr->hw_ver = 0; - hdr->flags[0] = 0x1f; - break; - case 'r': - hdr->hw_ver = (char)(atof(optarg)*10)+0x30; - break; - - case 'h': - default: - usage(); - } - } - - if (optind != argc || optind == 1) { - fprintf(stderr, "illegal arg \"%s\"\n", argv[optind]); - usage(); - } - - if (strlen(pattern) != 4) { - fprintf(stderr, "illegal pattern \"%s\": length != 4\n", pattern); - usage(); - } - - if (ifn && !(in = fopen(ifn, "r"))) { - fprintf(stderr, "can not open \"%s\" for reading\n", ifn); - usage(); - } - - if (ofn && !(out = fopen(ofn, "w"))) { - fprintf(stderr, "can not open \"%s\" for writing\n", ofn); - usage(); - } - - if (time(&t) == (time_t)(-1)) { - fprintf(stderr, "time call failed\n"); - return EXIT_FAILURE; - } - - ptm = localtime(&t); - - if (3 != sscanf(version, "v%d.%d.%d", &v0, &v1, &v2)) { - fprintf(stderr, "bad version string \"%s\"\n", version); - return EXIT_FAILURE; - } - - memcpy(&hdr->magic, pattern, 4); - if (pbotflag) - memcpy(&hdr->res1, pbotpat, 4); - hdr->fwdate[0] = ptm->tm_year % 100; - hdr->fwdate[1] = ptm->tm_mon + 1; - hdr->fwdate[2] = ptm->tm_mday; - hdr->fwvern[0] = v0; - hdr->fwvern[1] = v1; - hdr->fwvern[2] = v2; - memcpy(&hdr->id, CODE_ID, strlen(CODE_ID)); - - off = sizeof(struct code_header); - - fprintf(stderr, "writing firmware v%d.%d.%d on %d/%d/%d (y/m/d)\n", - v0, v1, v2, - hdr->fwdate[0], hdr->fwdate[1], hdr->fwdate[2]); - - - while ((n = fread(buf + off, 1, sizeof(buf)-off, in) + off) > 0) { - off = 0; - if (n < sizeof(buf)) { - if (ferror(in)) { - FREAD_ERROR: - fprintf(stderr, "fread error\n"); - return EXIT_FAILURE; - } - if (gflag) { - gflag = sizeof(buf) - n; - memset(buf + n, 0xff, gflag); - n = sizeof(buf); - } - } - if (!fwrite(buf, n, 1, out)) { - FWRITE_ERROR: - fprintf(stderr, "fwrite error\n"); - return EXIT_FAILURE; - } - } - - if (ferror(in)) { - goto FREAD_ERROR; - } - - if (fflush(out)) { - goto FWRITE_ERROR; - } - - fclose(in); - fclose(out); - - return EXIT_SUCCESS; -} diff --git a/target/tools/lzma-loader/.svn/entries b/target/tools/lzma-loader/.svn/entries deleted file mode 100644 index 2934ab892..000000000 --- a/target/tools/lzma-loader/.svn/entries +++ /dev/null @@ -1,300 +0,0 @@ -10 - -dir -29646 -svn://svn.openwrt.org/openwrt/trunk/target/linux/brcm47xx/image/lzma-loader/src -svn://svn.openwrt.org/openwrt - - - -2010-12-02T21:27:54.805904Z -24217 -hauke - - - - - - - - - - - - - - -3c298f89-4303-0410-b956-a3cf2f4a3e73 - -head.S -file - - - - -2011-11-10T10:12:04.000000Z -566bfb5f462e85d45d1d0c4faca0dadd -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -3585 - -decompress.c -file - - - - -2011-11-10T10:12:04.000000Z -b9ae9d76bf7f1f35ce46b5e496a02aa1 -2010-12-02T21:27:54.805904Z -24217 -hauke - - - - - - - - - - - - - - - - - - - - - -5426 - -LzmaDecode.c -file - - - - -2011-11-10T10:12:04.000000Z -14403972ddbcfadbe017a6aeb3e8fae1 -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -17104 - -decompress.lds.in -file - - - - -2011-11-10T10:12:04.000000Z -c80cc6ad34b26e0af3c1d764218a3a61 -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -186 - -loader.lds.in -file - - - - -2011-11-10T10:12:04.000000Z -f06b23d31242fb56a60b864b741c1266 -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -151 - -LzmaDecode.h -file - - - - -2011-11-10T10:12:04.000000Z -12fcb710de789e54587079c021ae5e33 -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -2465 - -Makefile -file - - - - -2011-11-10T10:12:04.000000Z -61400e27cb7c0099046d83e2146e0053 -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -2325 - -README -file - - - - -2011-11-10T10:12:04.000000Z -b29e81088cc18e92dede243f094c4134 -2010-06-26T20:41:49.877730Z -21945 -nbd - - - - - - - - - - - - - - - - - - - - - -2464 - diff --git a/target/tools/lzma-loader/.svn/text-base/LzmaDecode.c.svn-base b/target/tools/lzma-loader/.svn/text-base/LzmaDecode.c.svn-base deleted file mode 100644 index 951700bdd..000000000 --- a/target/tools/lzma-loader/.svn/text-base/LzmaDecode.c.svn-base +++ /dev/null @@ -1,663 +0,0 @@ -/* - LzmaDecode.c - LZMA Decoder - - LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25) - http://www.7-zip.org/ - - LZMA SDK is licensed under two licenses: - 1) GNU Lesser General Public License (GNU LGPL) - 2) Common Public License (CPL) - It means that you can select one of these two licenses and - follow rules of that license. - - SPECIAL EXCEPTION: - Igor Pavlov, as the author of this code, expressly permits you to - statically or dynamically link your code (or bind by name) to the - interfaces of this file without subjecting your linked code to the |