diff options
38 files changed, 68 insertions, 147 deletions
diff --git a/mk/build.mk b/mk/build.mk index ee3fbc609..18ade8e77 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -141,7 +141,7 @@ world: mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ $(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh -ifeq ($(ADK_TOOLCHAIN),y) +ifeq ($(ADK_TARGET_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/fixup package/compile else diff --git a/mk/image.mk b/mk/image.mk index 62ac155f8..7e47d8dc7 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -128,7 +128,7 @@ kernel-package: kernel-strip $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_FS}-kernel 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 @@ -150,7 +150,7 @@ ${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) endif diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 3956cf6a5..dd0516a3e 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -8,7 +8,7 @@ FS_CMDLINE:=$(3) endif endef -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) MTDDEV:= root=/dev/mtdblock0 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 8cec76b0e..c8299f775 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --enable-glib \ --with-avahi-user=avahi \ --with-avahi-group=avahi -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) CONFIGURE_ARGS+= --enable-stack-protector else CONFIGURE_ARGS+= --disable-stack-protector diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index ec7e15aab..77d87e97e 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -24,7 +24,7 @@ $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEAS ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) LIBRARIES:= -nodefaultlibs -luClibc++ -lm -lc -lgcc -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) LIBRARIES+= -lssp endif endif diff --git a/package/fltk/Makefile b/package/fltk/Makefile index a3251f5e1..e488912d5 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -28,7 +28,7 @@ $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) LIBRARIES:= -nodefaultlibs -luClibc++ -lm -lc -lgcc -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) LIBRARIES+= -lssp -lssp_nonshared endif endif diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index fde09978b..b727068b3 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -30,7 +30,7 @@ ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc endif -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) LIBRARIES+=-lssp -fstack-protector endif diff --git a/package/libssp/Makefile b/package/libssp/Makefile index 02d755b4b..c1e3dabd7 100644 --- a/package/libssp/Makefile +++ b/package/libssp/Makefile @@ -9,6 +9,9 @@ endif ifeq ($(ADK_TARGET_LIB_UCLIBC),y) include ${TOPDIR}/toolchain/uclibc/Makefile.inc endif +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) +include ${TOPDIR}/toolchain/musl/Makefile.inc +endif PKG_NAME:= libssp PKG_DESCR:= stack smashing protection library diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 3e8a80a38..ef7921c6e 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -24,11 +24,10 @@ CONFIG_STYLE:= manual ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) LIBRARIES:=-nodefaultlibs -luClibc++ -endif - -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) LIBRARIES+=-lssp -lssp_nonshared endif +endif ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \ diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile index a83c0a6e0..c95c43c1a 100644 --- a/package/net-tools/Makefile +++ b/package/net-tools/Makefile @@ -23,9 +23,6 @@ $(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS}, CONFIG_STYLE:= manual INSTALL_STYLE:= manual -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) -TARGET_LDFLAGS+= -lssp -endif do-configure: $(CP) ./files/config.* $(WRKBUILD)/ diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 7c3efda55..645fd3e6c 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) -LIBRARIES+=-lssp -lssp_nonshared -endif - TARGET_CPPFLAGS+= -DNOLUA TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 94f9812f0..74eb3cc16 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal endif -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) CONFIGURE_ARGS+= --with-stackprotect else CONFIGURE_ARGS+= --without-stackprotect @@ -84,10 +84,6 @@ CONFIGURE_ARGS+= --disable-strip \ --with-privsep-path=/var/run/sshd \ --with-ssl-dir="${STAGING_TARGET_DIR}/usr" -ifeq ($(ADK_STATIC),y) -TARGET_CFLAGS+= -static -TARGET_LDFLAGS+= -static -endif openssh-install: ${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh diff --git a/package/sudo/Makefile b/package/sudo/Makefile index 33f346a75..58e005934 100644 --- a/package/sudo/Makefile +++ b/package/sudo/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --without-pam \ --without-sendmail \ --with-env-editor -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) CONFIGURE_ARGS+= --enable-hardening else CONFIGURE_ARGS+= --disable-hardening diff --git a/target/arm/Makefile b/target/arm/Makefile index d5bbd48dd..9ac81e8f1 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -33,7 +33,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -54,7 +54,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -67,7 +67,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/arm/systems/keyasic-ka2000 b/target/arm/systems/keyasic-ka2000 deleted file mode 100644 index c63e73ef7..000000000 --- a/target/arm/systems/keyasic-ka2000 +++ /dev/null @@ -1,16 +0,0 @@ -config ADK_TARGET_SYSTEM_KEYASIC_KA2000 - bool "KeyASIC KA2000 (f.e. Transcend WifiSD)" - select ADK_arm - select ADK_little - select ADK_soft_float - select ADK_eabi - select ADK_keyasic_ka2000 - select ADK_CPU_ARM926EJ_S - select ADK_TOOLCHAIN - select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL - select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL - depends on ADK_BROKEN - help - KeyASIC KA2000 aka Transcend WifiSD. - Build a toolchain only and make all binaries static. - diff --git a/target/config/Config.in b/target/config/Config.in index edabfa5e3..48f7c129c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -30,7 +30,7 @@ config ADK_TARGET_KERNEL_CUSTOMISING choice prompt "Toolchain options" -depends on ADK_TOOLCHAIN +depends on ADK_TARGET_TOOLCHAIN config ADK_TOOLCHAIN_ONLY boolean "Only build toolchain and selected packages" diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 53b61406f..433404cc6 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -60,7 +60,7 @@ config ADK_TARGET_IP config ADK_TARGET_PORT prompt "Set target port for make check" string - default "2222" if ADK_HARDWARE_QEMU + default "2222" if ADK_TARGET_QEMU default "22" help diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 30650f19a..e3f674d78 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -31,7 +31,7 @@ source "target/config/Config.in.scripts" config ADK_RUNTIME_TMPFS_SIZE string "size of /tmp in memory (kB)" - default "16384" if ADK_HARDWARE_QEMU + default "16384" if ADK_TARGET_QEMU default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "32768" if ADK_TARGET_SYSTEM_IBM_X40 default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 4a441de8f..9bf166a36 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -88,7 +88,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA boolean menu "SATA/PATA devices support" -depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_HARDWARE_QEMU +depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU config ADK_KERNEL_PATA_RB532 prompt "CF disk driver for Mikrotik RB532" @@ -232,7 +232,7 @@ config ADK_KERNEL_PATA_PXA endmenu menu "SCSI driver support" -depends on ADK_TARGET_WITH_SCSI || ADK_HARDWARE_QEMU +depends on ADK_TARGET_WITH_SCSI || ADK_TARGET_QEMU config ADK_KERNEL_SCSI_SYM53C8XX_2 prompt "Symbios Logic 53C8XX2 support" diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index c967f0aff..5e153aae1 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -142,7 +142,7 @@ config ADK_KERNEL_NE2K_PCI select ADK_KERNEL_NET_VENDOR_NATSEMI select ADK_KERNEL_NET_VENDOR_8390 select ADK_KERNEL_MII - depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU default y if ADK_TARGET_SYSTEM_QEMU_PPC default n help @@ -164,7 +164,7 @@ config ADK_KERNEL_8139CP select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_VENDOR_REALTEK select ADK_KERNEL_MII - depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n @@ -198,7 +198,7 @@ config ADK_KERNEL_E1000 tristate select ADK_KERNEL_NET_VENDOR_INTEL select ADK_KERNEL_NETDEV_1000 - depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_QEMU_I486 default y if ADK_TARGET_SYSTEM_QEMU_I686 @@ -215,7 +215,7 @@ config ADK_KERNEL_SUNLANCE prompt "AMD Sunlance Ethernet driver" tristate select ADK_KERNEL_NET_VENDOR_AMD - depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU default y if ADK_TARGET_SYSTEM_QEMU_SPARC default n help @@ -225,7 +225,7 @@ config ADK_KERNEL_IBMVETH prompt "IBM Ethernet driver" tristate select ADK_KERNEL_NET_VENDOR_IBM - depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU default y if ADK_TARGET_SYSTEM_QEMU_PPC64 default n help diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 79e558491..6107a0e85 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -1,5 +1,5 @@ menu "Graphic devices support" -depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU +depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU config ADK_KERNEL_VT boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 5b4bbd2a3..ae315190a 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -1,5 +1,5 @@ menu "USB support" -depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU +depends on ADK_TARGET_WITH_USB || ADK_TARGET_QEMU config ADK_KERNEL_USB_SUPPORT boolean diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio index f2eb577cd..06149c757 100644 --- a/target/linux/config/Config.in.virtio +++ b/target/linux/config/Config.in.virtio @@ -1,5 +1,5 @@ menu "Virtio driver support" -depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU +depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_TARGET_QEMU config ADK_KERNEL_VIRTIO boolean diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 7595cf5cf..6efcf777f 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -22,7 +22,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -35,7 +35,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif @@ -44,7 +44,7 @@ ifeq ($(ADK_TARGET_FS),squashfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif @@ -53,7 +53,7 @@ ifeq ($(ADK_TARGET_FS),jffs2) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif diff --git a/target/mips/Makefile b/target/mips/Makefile index 5c9f7f5fc..9779330dd 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -18,7 +18,7 @@ QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0 ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -34,7 +34,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -47,7 +47,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/mips64/Makefile b/target/mips64/Makefile index 39b23cf8d..42f96d27c 100644 --- a/target/mips64/Makefile +++ b/target/mips64/Makefile @@ -41,7 +41,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -63,7 +63,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -71,7 +71,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif @@ -83,7 +83,7 @@ kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} endif -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} diff --git a/target/ppc/Makefile b/target/ppc/Makefile index b3bcfc98e..4966e322e 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -17,7 +17,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -42,7 +42,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index d704c4973..0f0b0c03a 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -17,7 +17,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -42,7 +42,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/sh/Makefile b/target/sh/Makefile index a11856b21..d9fe5034a 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -21,7 +21,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -33,7 +33,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -46,7 +46,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/sparc/Makefile b/target/sparc/Makefile index b0f86317f..0b7dd1ce9 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -16,7 +16,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -28,7 +28,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -41,7 +41,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 9e16607fc..51b1fa89b 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -22,7 +22,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -34,7 +34,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -47,7 +47,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/x86/Makefile b/target/x86/Makefile index 215476eb4..6b00f6aa4 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -28,7 +28,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -49,7 +49,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -62,7 +62,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 46e5f03a6..ee581c751 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -28,7 +28,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -49,7 +49,7 @@ ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -62,7 +62,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/toolchain/Config.in b/toolchain/Config.in deleted file mode 100644 index f80c44841..000000000 --- a/toolchain/Config.in +++ /dev/null @@ -1,54 +0,0 @@ -menu "Toolchain settings" - -config ADK_TOOLCHAIN_GDB - prompt "Enable building of the GNU debugger" - boolean - default y - -config ADK_TOOLCHAIN_GCC_CXX - prompt "Enable building of G++ (C++ language support in GCC)" - boolean - default y - -config ADK_TOOLCHAIN_SSP - prompt "Enable Stack Smashing Protection" - boolean - default y - -config ADK_TOOLCHAIN_USE_SSP - prompt "Use SSP for all packages" - boolean - depends on ADK_TOOLCHAIN_SSP - default n - -config ADK_TOOLCHAIN_LTO - prompt "Enable Link Time Optimization" - boolean - default y - -config ADK_TOOLCHAIN_USE_LTO - prompt "Use Link Time Optimization for all packages" - boolean - depends on ADK_TOOLCHAIN_LTO - default n - -config ADK_TOOLCHAIN_GOLD - prompt "Enable GOLD as linker" - boolean - depends on !ADK_LINUX_MIPS - default n - -config ADK_TOOLCHAIN_USE_GOLD - prompt "Use GOLD as linker for all packages" - boolean - depends on ADK_TOOLCHAIN_GOLD - default n - -config ADK_LINUX_ARM_WITH_THUMB - prompt "Use THUMB2 ARM mode" - boolean - depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC - select ADK_KERNEL_THUMB2_KERNEL - default n - -endmenu diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index d90f4fe3a..1268fa216 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -222,7 +222,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled done; (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION}) -ifeq ($(ADK_TOOLCHAIN_USE_GOLD),y) +ifeq ($(ADK_TARGET_USE_GOLD),y) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) else diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 44f73c1ff..0910bc72d 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -71,7 +71,7 @@ $(WRKBUILD)/.fixup: -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv -ifeq ($(ADK_TOOLCHAIN),y) +ifeq ($(ADK_TARGET_TOOLCHAIN),y) # strip target libs and host tools for toolchain builds PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \ $(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME) diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 7b0eeb104..b49b793f2 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -50,7 +50,7 @@ $(WRKBUILD)/.fixup: $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install # cleanup toolchain -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete -ifeq ($(ADK_TOOLCHAIN),y) +ifeq ($(ADK_TARGET_TOOLCHAIN),y) # strip target libs and host tools for toolchain builds PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \ $(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME) diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile index 94a81391d..90399ae39 100644 --- a/toolchain/uclibc/Makefile +++ b/toolchain/uclibc/Makefile @@ -57,7 +57,7 @@ endif ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y) $(SED) 's/.*\(COMPILE_IN_THUMB_MODE\).*/\1=y/' ${WRKBUILD}/.config endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TARGET_USE_SSP),y) $(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config @@ -118,7 +118,7 @@ endif all install_runtime # cleanup toolchain -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete -ifeq ($(ADK_TOOLCHAIN),y) +ifeq ($(ADK_TARGET_TOOLCHAIN),y) # strip target libs and host tools for toolchain builds PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \ $(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME) |