From 185f430dbf2c36415930941eced92723824950d6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 30 Sep 2019 17:54:28 +0200 Subject: remove unfinished alternative os porting efforts --- toolchain/Makefile | 2 +- toolchain/elf2flt/Makefile.inc | 6 ------ toolchain/gcc/Makefile | 8 ++------ toolchain/newlib/Makefile | 9 -------- toolchain/newlib/Makefile.inc | 8 -------- toolchain/waldux-headers/Makefile | 43 --------------------------------------- 6 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 toolchain/waldux-headers/Makefile (limited to 'toolchain') diff --git a/toolchain/Makefile b/toolchain/Makefile index 09b02c743..ea77cc9e2 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -40,7 +40,7 @@ TARGETS+=newlib CLIB:=newlib endif -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_OS_FROSTED),y) +ifeq ($(ADK_TARGET_BINFMT_FLAT),y) TARGETS+=elf2flt ELF2FLT:=elf2flt-install endif diff --git a/toolchain/elf2flt/Makefile.inc b/toolchain/elf2flt/Makefile.inc index d3feb54a0..6f5fa1273 100644 --- a/toolchain/elf2flt/Makefile.inc +++ b/toolchain/elf2flt/Makefile.inc @@ -12,9 +12,3 @@ PKG_GIT:= branch PKG_RELEASE:= 1 PKG_SITES:= git://git.osdn.net/gitroot/uclinux-h8/elf2flt.git endif -ifeq ($(ADK_TARGET_OS_FROSTED),y) -PKG_VERSION:= master -PKG_GIT:= branch -PKG_RELEASE:= 1 -PKG_SITES:= https://github.com/insane-adding-machines/elf2flt-1.git -endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 77600d6d2..4edb9e862 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -57,7 +57,7 @@ GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ --disable-werror \ --disable-nls -ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y) +ifeq ($(ADK_TARGET_OS_LINUX),y) ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) ifeq ($(ADK_TARGET_WITH_NPTL),y) GCC_FINAL_CONFOPTS:= --enable-tls --enable-threads --enable-libatomic @@ -81,15 +81,11 @@ ifeq ($(ADK_TARGET_OS_BAREMETAL),y) GCC_FINAL_CONFOPTS:= --disable-libatomic endif -ifeq ($(ADK_TARGET_OS_RTEMS),y) -GCC_FINAL_CONFOPTS:= --enable-libatomic -endif - ifeq ($(ADK_TARGET_LIB_NEWLIB),y) GCC_FINAL_CONFOPTS+= --with-newlib endif -ifeq ($(ADK_TARGET_OS_FROSTED)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) GCC_FINAL_CONFOPTS+= --disable-shared else GCC_FINAL_CONFOPTS+= --enable-shared --enable-cxx-flags='-fPIC' diff --git a/toolchain/newlib/Makefile b/toolchain/newlib/Makefile index abe153107..4cd7ce6c6 100644 --- a/toolchain/newlib/Makefile +++ b/toolchain/newlib/Makefile @@ -10,15 +10,6 @@ NEWLIB_CONFIGURE_ARGS:= --enable-newlib-io-long-long \ --enable-newlib-register-fini \ --disable-newlib-supplied-syscalls -ifeq ($(ADK_TARGET_OS_FROSTED),y) -NEWLIB_CONFIGURE_ARGS+= --enable-newlib-fvwrite-in-streamio=no \ - --enable-newlib-fseek-optimization=no \ - --enable-newlib_wide_orient=no \ - --enable-newlib-unbuf-stream-opt=yes -TARGET_CFLAGS+="-DREENTRANT_SYSCALLS_PROVIDED" -endif - - $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ CC='' \ diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc index fb74b9f73..d01745a93 100644 --- a/toolchain/newlib/Makefile.inc +++ b/toolchain/newlib/Makefile.inc @@ -22,11 +22,3 @@ PKG_RELEASE:= 1 PKG_SITES:= https://github.com/jcmvbkbc/newlib-xtensa.git DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -ifeq ($(ADK_TARGET_LIB_NEWLIB_FROSTED),y) -PKG_VERSION:= frosted -PKG_GIT:= branch -PKG_RELEASE:= 1 -PKG_GIT_SUBMODULE:= 1 -PKG_SITES:= https://github.com/insane-adding-machines/newlib.git -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -endif diff --git a/toolchain/waldux-headers/Makefile b/toolchain/waldux-headers/Makefile deleted file mode 100644 index d75dc5135..000000000 --- a/toolchain/waldux-headers/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk -include ../rules.mk -include $(ADK_TOPDIR)/mk/waldux-ver.mk -include $(ADK_TOPDIR)/mk/waldux.mk -include $(ADK_TOPDIR)/mk/buildhlp.mk - -LINUX_DIR=${WRKBUILD} - -include $(ADK_TOPDIR)/mk/kernel-vars.mk - -$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(ADK_TARGET_OS)-$(KERNEL_FILE_VER)/.patched: -ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_APU),y) -ifeq ($(ADK_KERNEL_ROOT_NFS),y) - cd $(DL_DIR) && wget http://distfiles.openadk.org/realtek-firmware-1.1.tar.xz - tar xf $(DL_DIR)/realtek-firmware-1.1.tar.xz \ - --strip-components=2 -C $(WRKSRC)/firmware realtek-firmware-1.1 -endif -endif -ifeq ($(ADK_TARGET_ARCH_XTENSA),y) - tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE).tar \ - --strip-components=1 -C $(WRKSRC) linux -endif - touch $@ - -$(WRKBUILD)/.configured: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(ADK_TARGET_OS)-$(KERNEL_FILE_VER)/.patched - $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ - headers_install -ifeq ($(ADK_TARGET_ARCH_CRIS),y) -ifeq ($(ADK_TARGET_CPU_ARCH),crisv32) - cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v32/arch arch -else - cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v10/arch arch -endif -endif - @-find $(STAGING_TARGET_DIR)/usr/include -name .install -delete - @-find $(STAGING_TARGET_DIR)/usr/include -name ..install.cmd -delete - touch $@ - -include ${ADK_TOPDIR}/mk/toolchain.mk -- cgit v1.2.3