Merge pull request #202 from kikcho/master

olinuxino: various fixes

alarm/imx-bootlets-olinuxino/PKGBUILD

@@ -1,10 +1,10 @@
-# Maintainer: Kiril Zyapkov <kiril.zyapkov@gmail.com>
+# Contributor: Kiril Zyapkov <kiril.zyapkov@gmail.com>
 
 buildarch=2
 
 pkgname=imx-bootlets-olinuxino
 pkgver=10.12.01
-pkgrel=2
+pkgrel=3
 pkgdesc="Bootlets for the i.MX233 Freescale processor"
 arch=(arm)
 url="http://freescale.com"
@@ -16,7 +16,7 @@ source=("http://download.ossystems.com.br/bsp/freescale/source/imx-bootlets-src-
         "imx233-olinuxino-maxi.patch")
 md5sums=('cf0ab3822dca694b930a051501c1d0e4'
          '5d2ceded7e8ece6245063098090ac4fe'
-         '2d38235c047194c65b6119363be55211'
+         'a0834e59e0448d6944383bb9e7de524c'
          'a3ecd391021d32723c34c955a3e2a0f5')
 
 build() {

alarm/imx-bootlets-olinuxino/linux-fix-paths.patch

@@ -13,7 +13,7 @@ index c4956d0..036a609 100644
 +	power_prep="imx-bootlets-olinuxino/power_prep";
 +	sdram_prep="imx-bootlets-olinuxino/boot_prep";
 +	linux_prep="imx-bootlets-olinuxino/linux_prep";
-+	zImage = "zImage";
++	zImage = "arch/arm/boot/zImage";
  }
  
  section (0) {

core/kernel26-olinuxino/PKGBUILD

@@ -12,7 +12,7 @@ pkgname=('kernel26-olinuxino' 'kernel26-headers-olinuxino')
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6
 pkgver=${_basekernel}.35.3
-pkgrel=4
+pkgrel=5
 makedepends=('xmlto' 'docbook-xsl' 'make' 'git' 'elftosb' 'imx-bootlets-olinuxino')
 optdepends=()
 options=('!strip' '!buildflags' '!makeflags')
@@ -53,7 +53,7 @@ source=(config
         003_Sanitise_ipu_interrupt_return_value.patch
         imx233-olinuxino.patch)
 
-md5sums=('d182fca7e14a186b9790331e03b02892'
+md5sums=('59294a70a3d05931144faed5c885e0ba'
          'bde087470cb0715ca709bd5bcd3803d0'
          'ef8a1cf2d129de1a0a476a0b40e6f291'
          'e086ab0b162d292549f9bf453e07ad2e'
@@ -175,8 +175,10 @@ package_kernel26-olinuxino() {
   
   # get kernel version
   _kernver="$(make kernelrelease)"
-  mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
-  make INSTALL_MOD_PATH=${pkgdir} modules_install
+
+  # Install zImage, System.map and the config for reference
+  mkdir -p ${pkgdir}/{usr/lib/modules,usr/lib/firmware,boot}
+  make INSTALL_MOD_PATH=${pkgdir}/usr modules_install
   #cp arch/$KARCH/boot/uImage ${pkgdir}/boot/uImage
   cp arch/$KARCH/boot/zImage ${pkgdir}/boot/zImage
   cp .config ${pkgdir}/boot/config-${_kernver}
@@ -194,7 +196,7 @@ package_kernel26-olinuxino() {
   elftosb -z -c ./imx-bootlets-olinuxino/linux.bd -o ${pkgdir}/boot/oli-${_kernver}.sb
 
   # remove build and source links
-  rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
+  rm -f ${pkgdir}/usr/lib/modules/${_kernver}/{source,build}
 }
 
 package_kernel26-headers-olinuxino() {

core/kernel26-olinuxino/config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35-4
-# Sat Jul 14 17:57:00 2012
+# Linux kernel version: 2.6.35-5
+# Tue Jul 17 01:04:27 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -631,9 +631,19 @@ CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_LIBERTAS is not set
 # CONFIG_P54_COMMON is not set
 CONFIG_RT2X00=m
-# CONFIG_RT2500USB is not set
-# CONFIG_RT73USB is not set
-# CONFIG_RT2800USB is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+# CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL12XX is not set
 # CONFIG_ZD1211RW is not set
 
@@ -765,7 +775,7 @@ CONFIG_HW_RANDOM=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_HELPER_AUTO=y
 
 #
@@ -777,7 +787,8 @@ CONFIG_I2C_HELPER_AUTO=y
 #
 # CONFIG_I2C_DESIGNWARE is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_MXS is not set
+CONFIG_I2C_MXS=y
+CONFIG_I2C_MXS_SELECT0=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_SIMTEC is not set
@@ -1338,7 +1349,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 # CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
@@ -1613,7 +1624,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set

core/kernel26-olinuxino/kernel26.install

@@ -1,5 +1,5 @@
 KERNEL_NAME=-olinuxino
-KERNEL_VERSION=2.6.35-4-OLinuXino-ARCH+
+KERNEL_VERSION=2.6.35-5-OLinuXino-ARCH+
 
 flush_kernel() {
   echo "Do you want the new kernel flashed onto mmcblk0p1? [y|N] "