From 1e12d8be3fe03d7a967b5d423215bb9caaea5a9c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 24 Jul 2014 06:53:16 +0200 Subject: [PATCH] busybox: remove SYSTEM-to-RAM support, it dont improves much Signed-off-by: Stephan Raue --- packages/sysutils/busybox/package.mk | 4 ---- packages/sysutils/busybox/scripts/init | 19 +------------------ projects/RPi/initramfs/initramfs.conf | 4 ---- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 projects/RPi/initramfs/initramfs.conf diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 240cf3199a..d50abb1bb9 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -232,10 +232,6 @@ makeinstall_init() { touch $INSTALL/etc/fstab ln -sf /proc/self/mounts $INSTALL/etc/mtab - if [ -f $PROJECT_DIR/$PROJECT/initramfs/initramfs.conf ]; then - cp $PROJECT_DIR/$PROJECT/initramfs/initramfs.conf $INSTALL/etc - fi - cp $PKG_DIR/scripts/init $INSTALL chmod 755 $INSTALL/init } diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index d1cb87a355..5f49b15408 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -52,14 +52,6 @@ NBD_DEVS="0" FLASH_FREE_MIN="5" - INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'` - SYSTEM_TORAM_LIMIT=1024000 - - # load any configuration - if [ -f "/etc/initramfs.conf" ]; then - . /etc/initramfs.conf - fi - # hide kernel log messages on console echo '1 4 1 7' > /proc/sys/kernel/printk @@ -124,9 +116,6 @@ nosplash) SPLASH=no ;; - noram) - SYSTEM_TORAM=no - ;; overlay) OVERLAY=yes ;; @@ -603,13 +592,7 @@ prepare_sysroot() { progress "Preparing system" - if [ "$SYSTEM_TORAM" = "no" -o "$INSTALLED_MEMORY" -lt "$SYSTEM_TORAM_LIMIT" ]; then - mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" - else - cp /flash/$IMAGE_SYSTEM /dev/$IMAGE_SYSTEM - mount_part "/dev/$IMAGE_SYSTEM" "/sysroot" "ro,loop" - fi - + mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" mount --move /flash /sysroot/flash if [ -n "$disk" ]; then diff --git a/projects/RPi/initramfs/initramfs.conf b/projects/RPi/initramfs/initramfs.conf deleted file mode 100644 index c5c70d1494..0000000000 --- a/projects/RPi/initramfs/initramfs.conf +++ /dev/null @@ -1,4 +0,0 @@ -# min size to support System to RAM -# default for RaspberryPi we set to 356MB (256MB + appr. image size (100MB) ) -# to be sure we have at least 256MB free - SYSTEM_TORAM_LIMIT=364544