summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/image.mk2
-rw-r--r--package/gdb/Makefile2
-rw-r--r--package/libthread_db/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--target/config/Config.in4
-rw-r--r--target/linux/config/Config.in.kernel3
6 files changed, 6 insertions, 9 deletions
diff --git a/mk/image.mk b/mk/image.mk
index 6721549b5..b538e02a8 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -171,7 +171,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
- ${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
+ ${SED} 's/.*CONFIG_\(RD_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
${LINUX_DIR}/.config
( \
echo "CONFIG_BLK_DEV_INITRD=y"; \
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index d8b9a26bd..9fc0b48fa 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -11,8 +11,6 @@ PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib
PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib
PKG_NOPARALLEL:= 1
-PKG_ARCH_DEPENDS:= !m68k
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index a2e14cd10..773c4c8f2 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -19,8 +19,6 @@ PKG_SECTION:= libs
PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER
-PKG_ARCH_DEPENDS:= !m68k
-
NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index c1ad710dc..4c8ab359a 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -16,8 +16,6 @@ PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !m68k
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
diff --git a/target/config/Config.in b/target/config/Config.in
index dfe87bae6..a8b69fb90 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -782,8 +782,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
ADK_LINUX_NATIVE
depends on !ADK_HARDWARE_VBOX
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
- select ADK_KERNEL_BLK_DEV_INITRD
- select ADK_KERNEL_RD_XZ
+ select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K
help
create an read-only initramfs system.
@@ -793,6 +792,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
depends on \
ADK_HARDWARE_QEMU || \
ADK_LINUX_ARM || \
+ ADK_LINUX_M68K || \
ADK_LINUX_MICROBLAZE || \
ADK_LINUX_MIPS || \
ADK_LINUX_PPC || \
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index d928cea09..221a373df 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -7,6 +7,9 @@ config ADK_KERNEL_EXPERIMENTAL
config ADK_KERNEL_BLK_DEV_INITRD
boolean
+config ADK_KERNEL_BLK_DEV_RAM
+ boolean
+
config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
boolean