diff --git a/packages/linux/unpack b/packages/linux/unpack index de85c8e0ab..a8eb97f9dc 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -20,24 +20,17 @@ cp $KERNEL_CFG_FILE $LINUX/.config sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_DIR/config/initramfs\"|" \ $LINUX/.config -if [ "$DEVTOOLS" = yes ]; then - echo "CONFIG_FRAMEBUFFER_CONSOLE=y" >> $LINUX/.config - echo "CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y" >> $LINUX/.config - echo "CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=n" >> $LINUX/.config - echo "CONFIG_FONTS=n" >> $LINUX/.config -fi - if [ "$PPP_DAEMON" = yes ]; then echo "CONFIG_PPP=m" >> $LINUX/.config echo "CONFIG_PPP_MULTILINK=n" >> $LINUX/.config - echo "CONFIG_PPP_FILTER=n" >> $LINUX/.config - echo "CONFIG_PPP_ASYNC=m" >> $LINUX/.config - echo "CONFIG_PPP_SYNC_TTY=m" >> $LINUX/.config - echo "CONFIG_PPP_DEFLATE=n" >> $LINUX/.config - echo "CONFIG_PPP_BSDCOMP=n" >> $LINUX/.config - echo "CONFIG_PPP_MPPE=n" >> $LINUX/.config - echo "CONFIG_PPPOE=y" >> $LINUX/.config - echo "CONFIG_PPPOL2TP=n" >> $LINUX/.config + echo "CONFIG_PPP_FILTER=n" >> $LINUX/.config + echo "CONFIG_PPP_ASYNC=m" >> $LINUX/.config + echo "CONFIG_PPP_SYNC_TTY=m" >> $LINUX/.config + echo "CONFIG_PPP_DEFLATE=n" >> $LINUX/.config + echo "CONFIG_PPP_BSDCOMP=n" >> $LINUX/.config + echo "CONFIG_PPP_MPPE=n" >> $LINUX/.config + echo "CONFIG_PPPOE=y" >> $LINUX/.config + echo "CONFIG_PPPOL2TP=n" >> $LINUX/.config fi # copy some extra firmware to linux tree diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index c9f3809bd0..e74c3123a7 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1592,7 +1592,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 597c7d9a64..567e8dbfc2 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1740,7 +1740,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 62fd273c41..3c60dc6fd5 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc6 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1674,7 +1674,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE is not set diff --git a/projects/generic/linux/linux.i386.conf b/projects/generic/linux/linux.i386.conf index 960086408a..01659035b9 100644 --- a/projects/generic/linux/linux.i386.conf +++ b/projects/generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1869,7 +1869,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE is not set diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf index d141c5eded..26facdf3ec 100644 --- a/projects/intel/linux/linux.i386.conf +++ b/projects/intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1707,7 +1707,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE is not set diff --git a/projects/intel/linux/linux.x86_64.conf b/projects/intel/linux/linux.x86_64.conf index 130cb6ff65..e1740c8a03 100644 --- a/projects/intel/linux/linux.x86_64.conf +++ b/projects/intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc6 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1643,7 +1643,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE is not set