Jelajahi Sumber

enable some packages for m68k, use initrd stuff for aranym

Waldemar Brodkorb 10 tahun lalu
induk
melakukan
eadad3e1d3

+ 1 - 1
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"; \

+ 0 - 2
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}))

+ 0 - 2
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

+ 0 - 2
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

+ 2 - 2
target/config/Config.in

@@ -770,8 +770,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.
 
@@ -781,6 +780,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 || \

+ 3 - 0
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