From 9f7134beca0fc1cba22e6bea09cd372a6d1952cc Mon Sep 17 00:00:00 2001 From: Marc Andre Tanner Date: Tue, 22 Dec 2009 11:26:02 +0100 Subject: [PATCH] kernel: update to 2.6.32 Use devtmpfs instead of mdev. Special thanks goes to Lars for his work on the kernel. Signed-off-by: Marc Andre Tanner --- download.sh | 2 +- rootfs-overlay/etc/init.d/rcS | 12 +++--------- rootfs-overlay/etc/profile | 3 +-- sources/configs/miniconfig-linux | 18 ++++++++---------- sources/sections/kernel.sh | 3 ++- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/download.sh b/download.sh index f5d2eab..9a740d6 100755 --- a/download.sh +++ b/download.sh @@ -19,7 +19,7 @@ MIRROR_LIST= # a new version of a file, set SHA1= and update the URL, run ./download.sh, # then cut and paste the sha1 from the output and run it again to confirm. -URL='http://git.openmoko.org/?p=kernel.git;a=snapshot;h=a03f58c61cb66164aa40cbf7bf3ff5f24a6f658b;sf=tgz' \ +URL='http://git.openmoko.org/?p=kernel.git;a=snapshot;h=06ac2c30542ba47bfe0ffc15b7868bb049bec053;sf=tgz' \ SHA1= \ RENAME="s/.*h=(.*);.*/kernel-\1.tar.gz/" \ download || dienow diff --git a/rootfs-overlay/etc/init.d/rcS b/rootfs-overlay/etc/init.d/rcS index 58c05c8..cea0f80 100755 --- a/rootfs-overlay/etc/init.d/rcS +++ b/rootfs-overlay/etc/init.d/rcS @@ -4,16 +4,10 @@ mount -t proc proc /proc mount -t sysfs sysfs /sys +mount -t devtmpfs devtmpfs /dev mount -t tmpfs tmpfs /tmp -mount -t tmpfs tmpfs /dev -mkdir /dev/pts -mount -t devpts devpts /dev/pts -#mkdir /dev/shm -#mount -t tmpfs tmpfs /dev/shm -echo /sbin/mdev > /proc/sys/kernel/hotplug -/sbin/mdev -s - -[ ! -d /dev/input ] && mkdir /dev/input +mkdir /dev/pts && mount -t devpts devpts /dev/pts +#mkdir /dev/shm && mount -t tmpfs tmpfs /dev/shm mount -n -o remount,noatime,rw / diff --git a/rootfs-overlay/etc/profile b/rootfs-overlay/etc/profile index 59493d4..526c4cf 100644 --- a/rootfs-overlay/etc/profile +++ b/rootfs-overlay/etc/profile @@ -1,5 +1,4 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin -export TSLIB_TSDEVICE=/dev/input/touchscreen0 -export TSLIB_TSDEVICE=/dev/event1 +export TSLIB_TSDEVICE=/dev/input/event1 export ELM_ENGINE=fb export ELM_FONT_PATH=/usr/share/fonts diff --git a/sources/configs/miniconfig-linux b/sources/configs/miniconfig-linux index 30c6b52..6989c67 100644 --- a/sources/configs/miniconfig-linux +++ b/sources/configs/miniconfig-linux @@ -1,6 +1,5 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y -CONFIG_CLASSIC_RCU=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y CONFIG_RD_GZIP=y @@ -9,14 +8,13 @@ CONFIG_EMBEDDED=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y -CONFIG_STRIP_ASM_SYMS=y +CONFIG_SHMEM=y CONFIG_COMPAT_BRK=y CONFIG_SLAB=y CONFIG_MODULES=y @@ -24,6 +22,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_BLOCK=y CONFIG_IOSCHED_DEADLINE=y +CONFIG_MMU=y CONFIG_ARCH_S3C2410=y CONFIG_S3C24XX_PWM=y CONFIG_S3C_BOOT_UART_FORCE_FIFO=y @@ -39,13 +38,12 @@ CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y CONFIG_CPU_IDLE=y CONFIG_BINFMT_ELF=y -CONFIG_PM=y -CONFIG_SUSPEND=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_DEVTMPFS=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_MTD=y @@ -100,6 +98,8 @@ CONFIG_MFD_GLAMO=y CONFIG_MFD_GLAMO_FB=y CONFIG_MFD_GLAMO_GPIO=y CONFIG_MFD_GLAMO_MCI=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_PCF50633=y CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_BACKLIGHT_LCD_SUPPORT=y @@ -115,10 +115,10 @@ CONFIG_USB_HID=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_USB_GADGET_S3C2410=y CONFIG_USB_ETH=y CONFIG_MMC=y CONFIG_MMC_BLOCK=y @@ -127,7 +127,6 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_GTA02_VIBRATOR=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y @@ -138,8 +137,6 @@ CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y CONFIG_RTC_DRV_PCF50633=y CONFIG_RTC_DRV_S3C=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_PCF50633=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_FILE_LOCKING=y @@ -156,8 +153,9 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_SUMMARY=y CONFIG_PARTITION_ADVANCED=y CONFIG_MSDOS_PARTITION=y +CONFIG_PRINTK_TIME=y +CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_S3C_UART=2 CONFIG_CRYPTO=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_ZLIB=y -CONFIG_CRC7=y diff --git a/sources/sections/kernel.sh b/sources/sections/kernel.sh index 625a3bd..20d0b2e 100644 --- a/sources/sections/kernel.sh +++ b/sources/sections/kernel.sh @@ -22,7 +22,8 @@ make -j $CPUS ARCH="$KARCH" CROSS_COMPILE="$CROSS" CONFIG_DEBUG_SECTION_MISMATCH if [ `grep CONFIG_MODULES=y .config` ]; then - make ARCH=$KARCH modules_install CROSS_COMPILE="$CROSS" INSTALL_MOD_PATH="$ROOT_DIR" || dienow + make ARCH=$KARCH CROSS_COMPILE="$CROSS" modules || dienow + make ARCH=$KARCH INSTALL_MOD_PATH="$ROOT_DIR" modules_install || dienow # remove some broken symlinks from kernel build rm -f $ROOT_DIR/lib/modules/*/build -- 2.11.4.GIT