diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 12 | ||||
| -rw-r--r-- | mk/image.mk | 16 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 20 | ||||
| -rw-r--r-- | mk/vars.mk | 16 | ||||
| -rw-r--r-- | mk/waldux-ver.mk | 16 | ||||
| -rw-r--r-- | mk/waldux.mk | 10 |
6 files changed, 11 insertions, 79 deletions
diff --git a/mk/build.mk b/mk/build.mk index 5c0dbf761..c34b71c01 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -179,18 +179,6 @@ else ifeq ($(ADK_TARGET_OS_BAREMETAL),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final endif -ifeq ($(ADK_TARGET_OS_RTEMS),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/compile target/install target/targethelp -endif -ifeq ($(ADK_TARGET_OS_FROSTED),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile target/install target/targethelp -endif -ifeq ($(ADK_TARGET_OS_ZEPHYR),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/compile target/install target/targethelp -endif -ifeq ($(ADK_TARGET_OS_WALDUX),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index -endif ifeq ($(ADK_TARGET_OS_LINUX),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index endif diff --git a/mk/image.mk b/mk/image.mk index 3021fac91..1cd343701 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -7,7 +7,7 @@ else FAKEROOT:= endif -ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y) +ifeq ($(ADK_TARGET_OS_LINUX),y) # relative paths, like 'mksh' or '../usr/bin/foosh' ifeq (${ADK_BINSH_ASH},y) BINSH:=ash @@ -262,7 +262,7 @@ createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \ echo 'CONFIG_INITRAMFS_IS_LARGE=n'; \ ) >> ${LINUX_DIR}/.config -ifeq ($(ADK_LINUX_KERNEL_COMP_XZ)$(ADK_WALDUX_KERNEL_COMP_XZ),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_XZ),y) echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config @@ -278,7 +278,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_XZ)$(ADK_WALDUX_KERNEL_COMP_XZ),y) echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4)$(ADK_WALDUX_KERNEL_COMP_LZ4),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config @@ -287,7 +287,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4)$(ADK_WALDUX_KERNEL_COMP_LZ4),y) echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZ4=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA)$(ADK_WALDUX_KERNEL_COMP_LZMA),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config @@ -296,7 +296,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA)$(ADK_WALDUX_KERNEL_COMP_LZMA),y) echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_LZO)$(ADK_WALDUX_KERNEL_COMP_LZO),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_LZO),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config @@ -305,7 +305,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZO)$(ADK_WALDUX_KERNEL_COMP_LZO),y) echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP)$(ADK_WALDUX_KERNEL_COMP_GZIP),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config @@ -314,7 +314,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP)$(ADK_WALDUX_KERNEL_COMP_GZIP),y) echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2)$(ADK_WALDUX_KERNEL_COMP_BZIP2),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config @@ -323,7 +323,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2)$(ADK_WALDUX_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE)$(ADK_WALDUX_KERNEL_COMPRESS_NONE),y) +ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index fb7ffc955..bd6d511a1 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -9,15 +9,9 @@ include $(ADK_TOPDIR)/mk/kernel-vars.mk ifeq ($(ADK_TARGET_OS_LINUX),y) KERNEL_MODULES_USED:=$(shell grep ^ADK_LINUX_KERNEL $(ADK_TOPDIR)/.config|grep =m) endif -ifeq ($(ADK_TARGET_OS_WALDUX),y) -KERNEL_MODULES_USED:=$(shell grep ^ADK_WALDUX_KERNEL $(ADK_TOPDIR)/.config|grep =m) -endif ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)) endif -ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) -KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH)) -endif KERNEL_FILE:=$(ADK_TARGET_KERNEL) KERNEL_TARGET:=$(ADK_TARGET_KERNEL) @@ -61,7 +55,7 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK mkdir -p $(LINUX_BUILD_DIR)/kmod-control touch $@ -ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_MINICONFIG),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG),y) $(LINUX_DIR)/.config: $(BUILD_DIR)/.kernelconfig endif @@ -69,15 +63,11 @@ ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH): $(LINUX_DIR)/.config: $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) endif -ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) -$(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH): -$(LINUX_DIR)/.config: $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH) -endif $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-configure.. " echo "-${KERNEL_RELEASE}" >${LINUX_DIR}/localversion -ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_DEFCONFIG),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG),y) ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE) else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) ];then \ @@ -85,12 +75,6 @@ else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) exit 1; \ fi ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=$(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) allnoconfig $(MAKE_TRACE) -else ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) - @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH) ];then \ - echo "no kernel configuration found in $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH)"; \ - exit 1; \ - fi - ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=$(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH) allnoconfig $(MAKE_TRACE) else $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) diff --git a/mk/vars.mk b/mk/vars.mk index eaa8c5333..b81a724a1 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -84,15 +84,6 @@ endif ifeq ($(ADK_TARGET_OS_BAREMETAL),y) GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_SUFFIX) endif -ifeq ($(ADK_TARGET_OS_FROSTED),y) -GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_OS)-$(ADK_TARGET_SUFFIX) -endif -ifeq ($(ADK_TARGET_OS_RTEMS),y) -GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_OS) -endif -ifeq ($(ADK_TARGET_OS_ZEPHYR),y) -GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_OS) -endif TARGET_CROSS:= $(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} @@ -176,7 +167,7 @@ TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float endif endif -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_OS_FROSTED),y) +ifeq ($(ADK_TARGET_BINFMT_FLAT),y) TARGET_LDFLAGS+= -Wl,-elf2flt TARGET_CFLAGS+= -Wl,-elf2flt TARGET_CXXFLAGS+= -Wl,-elf2flt @@ -240,11 +231,6 @@ ifneq ($(ADK_TARGET_USE_GNU_HASHSTYLE),) TARGET_LDFLAGS+= -Wl,--hash-style=gnu endif -# special operating system flags -ifeq ($(ADK_TARGET_OS_FROSTED),y) -TARGET_CFLAGS+= -fPIC -mlong-calls -fno-common -msingle-pic-base -mno-pic-data-is-text-relative -endif - # special architecture optimization flags ifeq ($(ADK_TARGET_ARCH_XTENSA),y) ifeq ($(ADK_TARGET_BIG_ENDIAN),) diff --git a/mk/waldux-ver.mk b/mk/waldux-ver.mk deleted file mode 100644 index a88c4501b..000000000 --- a/mk/waldux-ver.mk +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. -# -# On the various kernel version variables: -# -# KERNEL_FILE_VER: version numbering used for tarball and contained -# top level directory -# KERNEL_RELEASE: OpenADK internal versioning -# KERNEL_VERSION: final kernel version how we want to identify a -# specific kernel - -ifeq ($(ADK_TARGET_WALDUX_KERNEL_VERSION_GIT),y) -KERNEL_FILE_VER:= $(ADK_TARGET_WALDUX_KERNEL_GIT) -KERNEL_RELEASE:= 1 -KERNEL_VERSION:= $(ADK_TARGET_WALDUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) -endif diff --git a/mk/waldux.mk b/mk/waldux.mk deleted file mode 100644 index 15a021a3c..000000000 --- a/mk/waldux.mk +++ /dev/null @@ -1,10 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -PKG_NAME:= waldux -PKG_RELEASE:= $(KERNEL_RELEASE) -ifeq ($(ADK_TARGET_WALDUX_KERNEL_VERSION_GIT),y) -PKG_VERSION:= $(ADK_TARGET_WALDUX_KERNEL_GIT) -PKG_GIT:= $(ADK_TARGET_WALDUX_KERNEL_GIT_TYPE) -PKG_SITES:= $(ADK_TARGET_WALDUX_KERNEL_GIT_REPO) -endif |