From 09b14f1366a09c2d5e20a4e051e2ea83a61fff9b Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 10 Nov 2012 14:05:16 -0600 Subject: [PATCH] usb kevent 2 now affects the original beagle use 8192 and rename as generic usbnet_mem Signed-off-by: Robert Nelson --- mk_mmc.sh | 24 +++++++++++++----------- scripts/debian-finish.sh | 4 ++-- scripts/ubuntu-finish.sh | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 81939d3..d0da8fe 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1096,8 +1096,8 @@ function initrd_fixes { #work around for the kevent smsc95xx issue touch ${TEMPDIR}/initrd-tree/etc/sysctl.conf - if [ "${smsc95xx_mem}" ] ; then - echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> ${TEMPDIR}/initrd-tree/etc/sysctl.conf + if [ "${usbnet_mem}" ] ; then + echo "vm.min_free_kbytes = ${usbnet_mem}" >> ${TEMPDIR}/initrd-tree/etc/sysctl.conf fi } @@ -1367,7 +1367,7 @@ function populate_boot { dtb_addr=${dtb_addr} dtb_file=${dtb_file} - smsc95xx_mem=${smsc95xx_mem} + usbnet_mem=${usbnet_mem} __EOF__ @@ -1514,7 +1514,7 @@ function check_uboot_type { KERNEL_SEL="STABLE" boot="bootz" unset boot_scr_wrapper - unset smsc95xx_mem + unset usbnet_mem unset dd_seek unset dd_bs boot_partition_size="50" @@ -1526,6 +1526,7 @@ function check_uboot_type { is_omap KERNEL_SEL="TESTING" #dtb_file="omap3-beagle.dtb" + usbnet_mem="8192" echo "-----------------------------" echo "Warning: Support for the Original BeagleBoard Ax/Bx is broken.. (board locks up during hardware detect)" echo "Please use the Demo Images Instead" @@ -1537,6 +1538,7 @@ function check_uboot_type { is_omap KERNEL_SEL="TESTING" #dtb_file="omap3-beagle.dtb" + usbnet_mem="8192" echo "-----------------------------" echo "Warning: Support for the BeagleBoard C1/C2 is broken.. (board locks up during hardware detect)" echo "Please use the Demo Images Instead" @@ -1548,7 +1550,7 @@ function check_uboot_type { BOOTLOADER="BEAGLEBOARD_XM" is_omap KERNEL_SEL="TESTING" - smsc95xx_mem="16384" + usbnet_mem="16384" #dtb_file="omap3-beagle.dtb" ;; beagle_xm_kms) @@ -1556,7 +1558,7 @@ function check_uboot_type { BOOTLOADER="BEAGLEBOARD_XM" is_omap KERNEL_SEL="TESTING" - smsc95xx_mem="16384" + usbnet_mem="16384" #dtb_file="omap3-beagle.dtb" USE_KMS=1 @@ -1615,7 +1617,7 @@ function check_uboot_type { #dtb_file="omap4-panda.dtb" VIDEO_OMAP_RAM="16MB" KMS_VIDEOB="video=HDMI-A-1" - smsc95xx_mem="16384" + usbnet_mem="16384" ;; panda_dtb) SYSTEM="panda_dtb" @@ -1623,7 +1625,7 @@ function check_uboot_type { is_omap VIDEO_OMAP_RAM="16MB" KMS_VIDEOB="video=HDMI-A-1" - smsc95xx_mem="32768" + usbnet_mem="32768" dtb_file="omap4-panda.dtb" EXPERIMENTAL_KERNEL=1 @@ -1637,7 +1639,7 @@ function check_uboot_type { #dtb_file="omap4-panda.dtb" VIDEO_OMAP_RAM="16MB" KMS_VIDEOB="video=HDMI-A-1" - smsc95xx_mem="32768" + usbnet_mem="32768" ;; panda_es_dtb) SYSTEM="panda_es_dtb" @@ -1646,7 +1648,7 @@ function check_uboot_type { KERNEL_SEL="TESTING" VIDEO_OMAP_RAM="16MB" KMS_VIDEOB="video=HDMI-A-1" - smsc95xx_mem="32768" + usbnet_mem="32768" dtb_file="omap4-pandaES.dtb" need_dtbs=1 @@ -1661,7 +1663,7 @@ function check_uboot_type { USE_KMS=1 unset HAS_OMAPFB_DSS2 KMS_VIDEOB="video=HDMI-A-1" - smsc95xx_mem="32768" + usbnet_mem="32768" KERNEL_SEL="TESTING" ;; diff --git a/scripts/debian-finish.sh b/scripts/debian-finish.sh index 4783ce0..1a38ce3 100644 --- a/scripts/debian-finish.sh +++ b/scripts/debian-finish.sh @@ -68,8 +68,8 @@ else echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /etc/fstab fi -if [ "x${smsc95xx_mem}" != "x" ] ; then - echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> /etc/sysctl.conf +if [ "x${usbnet_mem}" != "x" ] ; then + echo "vm.min_free_kbytes = ${usbnet_mem}" >> /etc/sysctl.conf fi cat > /etc/e2fsck.conf <<-__EOF__ diff --git a/scripts/ubuntu-finish.sh b/scripts/ubuntu-finish.sh index 04ccf6c..b51114a 100644 --- a/scripts/ubuntu-finish.sh +++ b/scripts/ubuntu-finish.sh @@ -116,8 +116,8 @@ else echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /etc/fstab fi -if [ "x${smsc95xx_mem}" != "x" ] ; then - echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> /etc/sysctl.conf +if [ "x${usbnet_mem}" != "x" ] ; then + echo "vm.min_free_kbytes = ${usbnet_mem}" >> /etc/sysctl.conf fi cat > /etc/init/board_tweaks.conf <<-__EOF__