diff options
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/image.mk | 8 | ||||
| -rw-r--r-- | mk/rootfs.mk | 6 | ||||
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rw-r--r-- | package/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 2 | ||||
| -rw-r--r-- | toolchain/Config.in | 2 |
7 files changed, 17 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index 04cd5e3ce..13e287d89 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -44,6 +44,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_DEVELOPMENT=n \ ADK_TOOLCHAIN_USE_SSP=n \ ADK_TOOLCHAIN_USE_LTO=n \ + ADK_TOOLCHAIN_GOLD=n \ ADK_TOOLCHAIN_USE_GOLD=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ @@ -236,6 +237,7 @@ root_clean: @$(TRACE) root_clean rm -rf $(TARGET_DIR) mkdir -p $(TARGET_DIR) + touch $(TARGET_DIR)/.adk # Do a per-package clean here, too. This way stale headers and # libraries from target_*/ get wiped away, which keeps diff --git a/mk/image.mk b/mk/image.mk index 9e755ad1a..9f3fd5eef 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -138,17 +138,17 @@ ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar. ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}.iso endif -${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package +${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} +${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} +${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk env PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ @@ -156,7 +156,7 @@ ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \ ${ADK_COMPRESSION_TOOL} -c >$@ -${BUILD_DIR}/root.squashfs: ${TARGET_DIR} +${BUILD_DIR}/root.squashfs: ${TARGET_DIR}/.adk ${STAGING_HOST_DIR}/usr/bin/mksquashfs ${TARGET_DIR} \ ${BUILD_DIR}/root.squashfs -comp xz \ -nopad -noappend -root-owned $(MAKE_TRACE) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index dae0e5805..3c434b038 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -44,9 +44,9 @@ endif $(eval $(call rootfs_template,usb,USB,$(USB))) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) -$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE)) -$(eval $(call rootfs_template,initramfs,INITRAMFS)) -$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) +$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfs,INITRAMFS,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK,rootfstype=tmpfs)) $(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) diff --git a/mk/vars.mk b/mk/vars.mk index 2f2ecc134..f3911044f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -138,7 +138,7 @@ ifneq ($(ADK_DEBUG),) ifeq ($(ADK_DEBUG_OPTS),y) TARGET_CFLAGS+= -g3 -fno-omit-frame-pointer $(ADK_TARGET_CFLAGS_OPT) else -TARGET_CFLAGS+= -g3 -fno-omit-frame-pointer +TARGET_CFLAGS+= -O0 -g3 -fno-omit-frame-pointer endif else TARGET_CPPFLAGS+= -DNDEBUG diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 6a3f60fdd..838ed551d 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -100,7 +100,11 @@ $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE})) #$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) +ifeq ($(ADK_DEBUG),y) +TARGET_CFLAGS:= $(subst O0,O2,$(TARGET_CFLAGS)) +else TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) +endif TARGET_CPPFLAGS+= -D_POSIX_SOURCE -D_GNU_SOURCE ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index dd7c96dc5..9f1328809 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -106,6 +106,7 @@ config ADK_KERNEL_SCSI_SUNESP config ADK_KERNEL_PATA_MACIO select ADK_KERNEL_SCSI select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_SFF select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD @@ -114,6 +115,7 @@ config ADK_KERNEL_PATA_MACIO config ADK_KERNEL_PATA_PLATFORM select ADK_KERNEL_SCSI select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_SFF select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD diff --git a/toolchain/Config.in b/toolchain/Config.in index 9ae0142db..3a0306ac4 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -36,7 +36,7 @@ config ADK_TOOLCHAIN_GOLD prompt "Enable GOLD as linker" boolean depends on !ADK_LINUX_MIPS - default y + default n config ADK_TOOLCHAIN_USE_GOLD prompt "Use GOLD as linker for all packages" |