Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 11 insertions, 96 deletions

diff --git a/mk/build.mk b/mk/build.mk
index ce0f88ae0..b6de5f992 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -80,7 +80,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_KERNEL_DEBUG_WITH_KGDB=n
 
 noconfig_targets:=	menuconfig \
-			guiconfig \
 			_config \
 			_mconfig \
 			distclean \
@@ -150,9 +149,6 @@ world:
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
 	${BASH} ${TOPDIR}/scripts/update-pkg
-ifeq ($(ADK_NATIVE),y)
-	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
-else
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile
@@ -162,7 +158,6 @@ endif
 else
 	$(MAKE) -f mk/build.mk tools/install toolchain/fixup target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
-endif
 
 package_index:
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@@ -350,26 +345,6 @@ endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
 endif
-ifeq ($(ADKtype),ibm-x40)
-	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
-	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
-ifeq ($(ADKtype),lemote-yeelong)
-	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
-	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/mips/sys-available/$(ADKtype) > \
-		target/mips/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/mips/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.system.default"' > target/config/Config.in.system
@@ -440,24 +415,6 @@ endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
 endif
-ifeq ($(ADKtype),ibm-x40)
-	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
-ifeq ($(ADKtype),lemote-yeelong)
-	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.system.default"' > target/config/Config.in.system
@@ -506,15 +463,6 @@ menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
 	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
 
-guiconfig: $(CONFIG)/gconf defconfig .menu package/Config.in.auto
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
-	@if [ ! -f .config ];then \
-		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
-	fi
-	@$(CONFIG)/gconf $(CONFIG_CONFIG_IN)
-	${POSTCONFIG}
-
 _config: $(CONFIG)/conf .menu package/Config.in.auto
 	-@touch .config
 	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
@@ -561,8 +509,8 @@ test-framework:
 	for libc in uclibc glibc musl;do \
 		mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \
 		( \
-			for arch in arm mips mipsel mips64 mips64el ppc ppc64 sparc sparc64 i686 x86_64;do \
-				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \
+			for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \
+				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#"); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
 				$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 0b3e7ddbb..3285e891d 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -1,13 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1
-ifneq ($(ADK_NATIVE),y)
-KERNEL_MAKE_OPTS+=	CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1 \
+			CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
 			CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
 			HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \
 			CONFIG_SHELL='${SHELL}'
-endif
+
 ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
 ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
 			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \
diff --git a/mk/package.mk b/mk/package.mk
index d5d48c1e1..8439d88eb 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -25,13 +25,12 @@ CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
-			${HOST_CONFIGURE_OPTS} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
 			ac_cv_func_realloc_0_nonnull=yes \
-			ac_cv_func_malloc_0_nonnull=yes
-ifeq ($(ADK_NATIVE),)
-CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} cross_compiling=yes
-endif
+			ac_cv_func_malloc_0_nonnull=yes \
+			cross_compiling=yes \
+			${HOST_CONFIGURE_OPTS} \
+			${TARGET_CONFIGURE_OPTS}
 
 CONFIGURE_PROG?=	configure
 MAKE_FILE?=		Makefile
@@ -57,12 +56,8 @@ MAKE_ENV+=		$(GCC_CHECK) \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
 			${HOST_CONFIGURE_OPTS} \
-			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
-ifeq ($(ADK_NATIVE),)
-MAKE_ENV+=		${TARGET_CONFIGURE_OPTS}
-else
-MAKE_ENV+=		M4=m4
-endif
+			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
+			${TARGET_CONFIGURE_OPTS}
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
 FAKE_FLAGS+=		${XAKE_FLAGS}
diff --git a/mk/python.mk b/mk/python.mk
index 1ef92e664..56008760a 100644
--- a/mk/python.mk
+++ b/mk/python.mk
@@ -1,8 +1,3 @@
 PYTHON_VERSION=2.7
-ifeq ($(ADK_NATIVE),)
 PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib
 PYTHON:=${STAGING_HOST_DIR}/usr/bin/python
-else
-PYTHON_LIBDIR:=/usr/lib
-PYTHON:=/usr/bin/python
-endif
diff --git a/mk/vars.mk b/mk/vars.mk
index 3798757bc..8f3022634 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,11 +18,6 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
-# use headers and foo-config from system
-ifeq ($(ADK_NATIVE),y)
-STAGING_TARGET_DIR:=
-SCRIPT_TARGET_DIR:=	/usr/bin
-else
 ifeq ($(ADK_TARGET_ABI),)
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
@@ -35,7 +30,6 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 endif
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
-endif
 STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
@@ -60,15 +54,9 @@ else
 GCC_CHECK:=
 endif
 
-ifeq ($(ADK_NATIVE),y) 
-TARGET_CROSS:=
-TARGET_COMPILER_PREFIX?=
-CONFIGURE_TRIPLE:=	
-else
 TARGET_CROSS:=		$(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)-
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
 CONFIGURE_TRIPLE:=	--build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
-endif
 
 ifneq ($(strip ${ADK_USE_CCACHE}),)
 TARGET_COMPILER_PREFIX=ccache ${TARGET_CROSS}
@@ -105,12 +93,6 @@ TARGET_LDFLAGS+=	-Wl,--secure-plt
 endif
 endif
 
-ifneq ($(ADK_NATIVE),)
-TARGET_CPPFLAGS:=
-TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
-TARGET_LDFLAGS:=
-endif
-
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
@@ -198,11 +180,7 @@ PKG_INSTALL:=		PKG_INSTROOT=$(TARGET_DIR) \
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/pkg
 endif
 
-ifeq ($(ADK_NATIVE),y)
-RSTRIP:=		prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh
-else
 RSTRIP:=		PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh
-endif
 
 STATCMD:=$(shell if stat -qs .>/dev/null 2>&1; then echo 'stat -f %z';else echo 'stat -c %s';fi)