Merge pull request #267 from kikcho/master

kernel26-olinuxino-ntsc package
This commit is contained in:
Kevin Mihelich 2012-09-21 08:21:28 -07:00
commit 2215e5c6f4
5 changed files with 161 additions and 4 deletions

View file

@ -0,0 +1,39 @@
# Contributor: Kiril Zyapkov <kiril.zyapkov@gmail.com>
buildarch=2
pkgname=imx-bootlets-olinuxino-ntsc
pkgver=10.12.01
pkgrel=4
pkgdesc="Bootlets for the i.MX233 Freescale processor"
arch=(arm)
url="http://freescale.com"
license=('MIT')
makedepends=()
source=("http://download.ossystems.com.br/bsp/freescale/source/imx-bootlets-src-${pkgver}.tar.gz"
"linux_prep-fix-cmdlines.patch"
"linux-fix-paths.patch"
"imx233-olinuxino-maxi.patch")
md5sums=('cf0ab3822dca694b930a051501c1d0e4'
'd764749e7d5461c19924861ad7194395'
'513eee238f4ae169afa855563f5aefbc'
'a3ecd391021d32723c34c955a3e2a0f5')
build() {
cd ${srcdir}/imx-bootlets-src-${pkgver}
patch -Np1 -i ../linux_prep-fix-cmdlines.patch
patch -Np1 -i ../linux-fix-paths.patch
patch -Np1 -i ../imx233-olinuxino-maxi.patch
BOARD=stmp378x_dev make linux_prep boot_prep power_prep
}
package() {
cd ${srcdir}/imx-bootlets-src-${pkgver}
mkdir -p ${pkgdir}/opt/imx-bootlets-olinuxino-ntsc
install -m 0644 linux.bd ${pkgdir}/opt/imx-bootlets-olinuxino-ntsc
install -m 0644 power_prep/power_prep ${pkgdir}/opt/imx-bootlets-olinuxino-ntsc
install -m 0644 boot_prep/boot_prep ${pkgdir}/opt/imx-bootlets-olinuxino-ntsc
install -m 0644 linux_prep/output-target/linux_prep ${pkgdir}/opt/imx-bootlets-olinuxino-ntsc
}
# vim:set ts=2 sw=2 et:

View file

@ -0,0 +1,19 @@
mx23/platform: set machine ID
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
diff --git a/linux_prep/include/mx23/platform.h b/linux_prep/include/mx23/platform.h
index ed58d79..3cbe2eb 100644
--- a/linux_prep/include/mx23/platform.h
+++ b/linux_prep/include/mx23/platform.h
@@ -18,7 +18,7 @@
#define __37XX_PLATFORM_H
#if defined (BOARD_STMP378X_DEV)
-#define MACHINE_ID 0xa45
+#define MACHINE_ID 0x1009
#else
#error "Allocate a machine ID for your board"
#endif

View file

@ -0,0 +1,19 @@
diff --git a/linux.bd b/linux.bd
index c4956d0..036a609 100644
--- a/linux.bd
+++ b/linux.bd
@@ -4,10 +4,10 @@ options {
flags = 0x01;
}
sources {
- power_prep="./power_prep/power_prep";
- sdram_prep="./boot_prep/boot_prep";
- linux_prep="./linux_prep/output-target/linux_prep";
- zImage = "./zImage";
+ power_prep="imx-bootlets-olinuxino-ntsc/power_prep";
+ sdram_prep="imx-bootlets-olinuxino-ntsc/boot_prep";
+ linux_prep="imx-bootlets-olinuxino-ntsc/linux_prep";
+ zImage = "arch/arm/boot/zImage";
}
section (0) {

View file

@ -0,0 +1,30 @@
imx-bootlets: Fix cmdlines for Linux boot
This adapt the cmdlines for the partitioning layout used on the
generated SD cards.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
diff --git a/linux_prep/cmdlines/iMX28_EVK.txt b/linux_prep/cmdlines/iMX28_EVK.txt
index 6bc36b9..6cf89a0 100644
--- a/linux_prep/cmdlines/iMX28_EVK.txt
+++ b/linux_prep/cmdlines/iMX28_EVK.txt
@@ -1 +1 @@
-console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait
+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
diff --git a/linux_prep/cmdlines/stmp378x_dev.txt b/linux_prep/cmdlines/stmp378x_dev.txt
index 9a717eb..fdb7390 100644
--- a/linux_prep/cmdlines/stmp378x_dev.txt
+++ b/linux_prep/cmdlines/stmp378x_dev.txt
@@ -1,6 +1,3 @@
-console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait lcd_panel=lms430 no_console_suspend
-console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait lcd_panel=lms350
-console=ttyAM0,115200 ssp1=spi1 ubi.mtd=2 root=ubi0:rootfs0 rootfstype=ubifs lcd_panel=lms430
-
-
-
+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc lcd_panel=tvenc_ntsc no_console_suspend
+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc lcd_panel=lms350
+console=ttyAMA0,115200 ssp1=spi1 ubi.mtd=2 root=ubi0:rootfs0 rootfstype=ubifs lcd_panel=lms430

View file

@ -8,12 +8,12 @@
buildarch=2
pkgbase="kernel26-olinuxino"
pkgname=('kernel26-olinuxino' 'kernel26-headers-olinuxino')
pkgname=('kernel26-olinuxino' 'kernel26-olinuxino-ntsc' 'kernel26-headers-olinuxino')
_kernelname=${pkgname#kernel26}
_basekernel=2.6
pkgver=${_basekernel}.35.3
pkgrel=7
makedepends=('xmlto' 'docbook-xsl' 'make' 'git' 'elftosb' 'imx-bootlets-olinuxino')
makedepends=('xmlto' 'docbook-xsl' 'make' 'git' 'elftosb' 'imx-bootlets-olinuxino' 'imx-bootlets-olinuxino-ntsc')
optdepends=()
options=('!strip' '!buildflags' '!makeflags')
arch=('arm')
@ -87,14 +87,15 @@ build() {
}
package_kernel26-olinuxino() {
pkgdesc="The Linux Kernel and modules for iMX233-OLinuXino-Maxi"
pkgdesc="The Linux Kernel and modules for iMX233-OLinuXino-Maxi with PAL video output"
groups=('base')
depends=('coreutils' 'module-init-tools')
replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
'alsa-driver' 'ieee80211' 'hostap-driver26'
'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm')
'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm'
'kernel26-olinuxino-ntsc')
provides=("kernel26=${pkgver}" "linux=${pkgver}")
install=kernel26.install
KARCH=arm
@ -134,6 +135,55 @@ package_kernel26-olinuxino() {
mv "$pkgdir/lib" "$pkgdir/usr"
}
package_kernel26-olinuxino-ntsc() {
pkgdesc="The Linux Kernel and modules for iMX233-OLinuXino-Maxi"
groups=('base')
depends=('coreutils' 'module-init-tools')
replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
'alsa-driver' 'ieee80211' 'hostap-driver26'
'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm'
'kernel26-olinuxino')
provides=("kernel26=${pkgver}" "linux=${pkgver}")
install=kernel26.install
KARCH=arm
cd ${srcdir}/${__gitname}
# get kernel version
_kernver="$(make kernelrelease)"
# Install zImage, System.map and the config for reference
mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
make INSTALL_MOD_PATH="${pkgdir}" modules_install
#cp arch/$KARCH/boot/uImage ${pkgdir}/boot/uImage
cp arch/$KARCH/boot/zImage ${pkgdir}/boot/zImage
cp .config ${pkgdir}/boot/config-${_kernver}
cp System.map System.map-${_kernver}
# set correct depmod command for install
sed \
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-i $startdir/kernel26.install
# Generate an imx233 boot image
msg "Generating sdcard image ..."
ln -sf /opt/imx-bootlets-olinuxino-ntsc
elftosb -z -c ./imx-bootlets-olinuxino-ntsc/linux.bd -o ${pkgdir}/boot/oli-${_kernver}.sb
# remove build and source links
rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
# move module tree /lib -> /usr/lib
mkdir -p "${pkgdir}/usr"
mv "$pkgdir/lib" "$pkgdir/usr"
}
package_kernel26-headers-olinuxino() {
pkgdesc="Header files and scripts for building modules for kernel26 for iMX233-OLinuXino-Maxi"
provides=("kernel26-headers=${pkgver}" "linux-headers=${pkgver}")