diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-05 09:56:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-05 09:56:51 +0200 |
| commit | ac8c5646edab042496ff11852505d2d1bca9b116 (patch) | |
| tree | bc15286d8dd0e3f2cad19a35a522bcec8d9d01c9 | |
| parent | 5c60d504c0f94471ebc5bd0d5e5785de9fa2acc1 (diff) | |
allow building of aranym eglibc/glibc images
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | target/m68k/kernel.config | 43 | ||||
| -rw-r--r-- | target/m68k/target.mk | 2 |
3 files changed, 14 insertions, 33 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 9d373653a..77500a403 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -66,7 +66,7 @@ ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab endif ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y) - $(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab + $(SED) 's#ttyS#nfcon#g' $(IDIR_BASE_FILES)/etc/inittab endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ diff --git a/target/m68k/kernel.config b/target/m68k/kernel.config index 7fa647489..f20c2239a 100644 --- a/target/m68k/kernel.config +++ b/target/m68k/kernel.config @@ -55,21 +55,22 @@ CONFIG_TINY_RCU=y # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set +# CONFIG_NAMESPACES is not set CONFIG_UIDGID_CONVERTED=y # CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -844,29 +845,7 @@ CONFIG_TMPFS=y # CONFIG_TMPFS_XATTR is not set # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_LOGFS is not set -# CONFIG_CRAMFS is not set -# CONFIG_SQUASHFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_MINIX_FS_BIG_ENDIAN_16BIT_INDEXED is not set -# CONFIG_OMFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_PSTORE is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -# CONFIG_F2FS_FS is not set +# CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NLS is not set @@ -1064,8 +1043,10 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set # CONFIG_CRC8 is not set +CONFIG_ZLIB_INFLATE=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set +CONFIG_DECOMPRESS_GZIP=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y CONFIG_DQL=y diff --git a/target/m68k/target.mk b/target/m68k/target.mk index 3d63ffa73..732363b2a 100644 --- a/target/m68k/target.mk +++ b/target/m68k/target.mk @@ -1,5 +1,5 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= m68k CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_OPTIMIZATION:= -O0 -pipe +TARGET_OPTIMIZATION:= -O2 -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) |