more xtensa improvements

mk/image.mk

@@ -186,6 +186,13 @@ ifeq ($(ADK_KERNEL_COMP_XZ),y)
 		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_XZ=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_XZ=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_X86=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_POWERPC=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_IA64=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_ARM=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_ARMTHUMB=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_LZ4),y)
 		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config

package/busybox/Config.in.manual

@@ -125,6 +125,7 @@ config ADK_PACKAGE_BUSYBOX_MINIMAL
 	select BUSYBOX_GREP
 	select BUSYBOX_HALT
 	select BUSYBOX_INIT
+	select BUSYBOX_WHICH
 	select BUSYBOX_WHOAMI
 
 config ADK_PACKAGE_BUSYBOX_ALL

package/busybox/Makefile

@@ -56,9 +56,6 @@ do-configure:
 			;; \
 		esac \
 	done
-ifeq ($(ADK_TARGET_WITHOUT_MMU),y)
-	echo 'CONFIG_NOMMU=y' >> ${WRKBUILD}/.config
-endif
 	$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
 
 do-build:

package/libpthread/Makefile

@@ -32,10 +32,12 @@ libpthread-install:
 ifneq ($(ADK_TARGET_LIB_MUSL),y)
 ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
 ifneq ($(ADK_TARGET_WITHOUT_THREADS),y)
+ifneq ($(ADK_TARGET_BINFMT_FLAT),y)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 endif
 endif
 endif
+endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

target/config/Config.in.kernelfmt

@@ -10,9 +10,6 @@ config ADK_TARGET_KERNEL_ZIMAGE
 config ADK_TARGET_KERNEL_LINUXBIN
 	bool
 
-config ADK_TARGET_KERNEL_IMAGE_ELF
-	bool
-
 config ADK_TARGET_KERNEL_IMAGE
 	bool
 
@@ -30,7 +27,6 @@ config ADK_TARGET_KERNEL
 	default "uImage" if ADK_TARGET_KERNEL_UIMAGE
 	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
 	default "Image" if ADK_TARGET_KERNEL_IMAGE
-	default "Image.elf" if ADK_TARGET_KERNEL_IMAGE_ELF
 	default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN
 	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
 	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE

target/config/Config.in.xtensa

@@ -8,6 +8,7 @@ depends on ADK_TARGET_ARCH_XTENSA
 config ADK_TARGET_XTENSA_DC233C
 	bool "dc233c"
 	select ADK_KERNEL_XTENSA_VARIANT_DC233C
+	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
 	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_NPTL
@@ -16,13 +17,23 @@ config ADK_TARGET_XTENSA_DC233C
 config ADK_TARGET_XTENSA_DC232B
 	bool "dc232b"
 	select ADK_KERNEL_XTENSA_VARIANT_DC232B
+	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
+config ADK_TARGET_XTENSA_FSF
+	bool "fsf"
+	select ADK_KERNEL_XTENSA_VARIANT_FSF
+	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_TARGET_BIG_ENDIAN
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+
 config ADK_TARGET_XTENSA_DE212
 	bool "de212"
 	select ADK_KERNEL_XTENSA_VARIANT_CUSTOM
+	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
@@ -33,4 +44,5 @@ config ADK_TARGET_XTENSA
 	string
 	default "dc233c" if ADK_TARGET_XTENSA_DC233C
 	default "dc232b" if ADK_TARGET_XTENSA_DC232B
+	default "fsf" if ADK_TARGET_XTENSA_FSF
 	default "de212" if ADK_TARGET_XTENSA_DE212

target/xtensa/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/mk/kernel-build.mk
 include $(ADK_TOPDIR)/mk/image.mk
 
-ifeq ($(ADK_TARGET_KERNEL_IMAGE_ELF),y)
+ifeq ($(ADK_TARGET_XTENSA_DE212),y)
 KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf
 else
 KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage

target/xtensa/systems/qemu-xtensa

@@ -2,7 +2,6 @@ config ADK_TARGET_SYSTEM_QEMU_XTENSA
 	bool "Qemu Emulator"
 	select ADK_CPU_XTENSA
 	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_HOST_BUILD_U_BOOT
 	help

toolchain/kernel-headers/Makefile

@@ -21,7 +21,7 @@ ifeq ($(ADK_KERNEL_ROOT_NFS),y)
 endif
 endif
 ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
-	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \
+	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_XTENSA).tar \
 		--strip-components=1 -C $(WRKSRC) linux
 endif
 ifneq ($(ADK_DISABLE_KERNEL_PATCHES),y)