mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
removed core/linux-udoo
This commit is contained in:
Kevin Mihelich
parent
a0be5262d2
commit
d53314469e
4 changed files with 0 additions and 4615 deletions
|
|
@ -1,273 +0,0 @@
|
||||||
# i.MX6 UDOO
|
|
||||||
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
||||||
|
|
||||||
buildarch=4
|
|
||||||
|
|
||||||
pkgbase=linux-udoo
|
|
||||||
_commit=3b2c06e36493bd5002a4a67ca443debb70bb2703
|
|
||||||
_srcname=Kernel_Unico-${_commit}
|
|
||||||
_kernelname=${pkgbase#linux}
|
|
||||||
_desc="i.MX6 UDOO"
|
|
||||||
pkgver=3.0.35
|
|
||||||
pkgrel=9
|
|
||||||
arch=('armv7h')
|
|
||||||
url="https://github.com/UDOOboard/Kernel_Unico"
|
|
||||||
license=('GPL2')
|
|
||||||
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git')
|
|
||||||
options=('!strip')
|
|
||||||
source=("https://github.com/UDOOboard/Kernel_Unico/archive/${_commit}.tar.gz"
|
|
||||||
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
|
|
||||||
'config'
|
|
||||||
'memset.patch')
|
|
||||||
md5sums=('29a7170da2765315997fb4b3be5135b4'
|
|
||||||
'4f0254ce4cfc813314b2f1628878e0c1'
|
|
||||||
'39be2896f0b968d61a19b33da75ce6e0')
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
cd "${srcdir}/${_srcname}"
|
|
||||||
|
|
||||||
cat "${srcdir}/config" > ./.config
|
|
||||||
|
|
||||||
# Fix memset for GCC 4.8
|
|
||||||
patch -Np1 -i ../memset.patch
|
|
||||||
|
|
||||||
# AUFS patches
|
|
||||||
cp -ru "${srcdir}/aufs3-standalone/Documentation" .
|
|
||||||
cp -ru "${srcdir}/aufs3-standalone/fs" .
|
|
||||||
cp -ru "${srcdir}/aufs3-standalone/include/linux/aufs_type.h" ./include/linux
|
|
||||||
|
|
||||||
patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch
|
|
||||||
patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
|
|
||||||
patch -Np1 -i ../aufs3-standalone/aufs3-proc_map.patch
|
|
||||||
patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
|
|
||||||
|
|
||||||
# add pkgrel to extraversion
|
|
||||||
sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile
|
|
||||||
|
|
||||||
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
|
||||||
sed -i '2iexit 0' scripts/depmod.sh
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd "${srcdir}/${_srcname}"
|
|
||||||
|
|
||||||
LDFLAGS=""
|
|
||||||
|
|
||||||
# get kernel version
|
|
||||||
make prepare
|
|
||||||
|
|
||||||
# load configuration
|
|
||||||
# Configure the kernel. Replace the line below with one of your choice.
|
|
||||||
#make menuconfig # CLI menu for configuration
|
|
||||||
#make nconfig # new CLI menu for configuration
|
|
||||||
#make xconfig # X-based configuration
|
|
||||||
#make oldconfig # using old config from previous kernel version
|
|
||||||
# ... or manually edit .config
|
|
||||||
|
|
||||||
# Copy back our configuration (use with new kernel version)
|
|
||||||
#cp ./.config ../${pkgbase}.config
|
|
||||||
|
|
||||||
####################
|
|
||||||
# stop here
|
|
||||||
# this is useful to configure the kernel
|
|
||||||
#msg "Stopping build"
|
|
||||||
#return 1
|
|
||||||
####################
|
|
||||||
|
|
||||||
#yes "" | make config
|
|
||||||
|
|
||||||
# build!
|
|
||||||
make ${MAKEFLAGS} uImage modules
|
|
||||||
}
|
|
||||||
|
|
||||||
_package() {
|
|
||||||
pkgdesc="The Linux Kernel and modules - ${_desc}"
|
|
||||||
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
|
|
||||||
optdepends=('crda: to set the correct wireless channels of your country')
|
|
||||||
provides=('kernel26' "linux=${pkgver}" 'aufs_friendly')
|
|
||||||
conflicts=('linux')
|
|
||||||
install=${pkgname}.install
|
|
||||||
|
|
||||||
cd "${srcdir}/${_srcname}"
|
|
||||||
|
|
||||||
KARCH=arm
|
|
||||||
|
|
||||||
# get kernel version
|
|
||||||
_kernver="$(make kernelrelease)"
|
|
||||||
_basekernel=${_kernver%%-*}
|
|
||||||
_basekernel=${_basekernel%.*}
|
|
||||||
|
|
||||||
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
|
|
||||||
make INSTALL_MOD_PATH="${pkgdir}" modules_install
|
|
||||||
cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
|
|
||||||
|
|
||||||
# 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}/${pkgname}.install"
|
|
||||||
|
|
||||||
# remove build and source links
|
|
||||||
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
|
|
||||||
# remove the firmware
|
|
||||||
rm -rf "${pkgdir}/lib/firmware"
|
|
||||||
# gzip -9 all modules to save 100MB of space
|
|
||||||
find "${pkgdir}" -name '*.ko' |xargs -P 2 -n 1 gzip -9
|
|
||||||
# make room for external modules
|
|
||||||
ln -s "../extramodules-${_basekernel}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
|
|
||||||
# add real version for building modules and running depmod from post_install/upgrade
|
|
||||||
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}"
|
|
||||||
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version"
|
|
||||||
|
|
||||||
# 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-headers() {
|
|
||||||
pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
|
|
||||||
provides=("linux-headers=${pkgver}")
|
|
||||||
conflicts=('linux-headers')
|
|
||||||
|
|
||||||
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
|
|
||||||
|
|
||||||
cd "${pkgdir}/usr/lib/modules/${_kernver}"
|
|
||||||
ln -sf ../../../src/linux-${_kernver} build
|
|
||||||
|
|
||||||
cd "${srcdir}/${_srcname}"
|
|
||||||
install -D -m644 Makefile \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
|
|
||||||
install -D -m644 kernel/Makefile \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
|
|
||||||
install -D -m644 .config \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/.config"
|
|
||||||
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
|
|
||||||
|
|
||||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
|
||||||
media net pcmcia scsi sound trace video xen; do
|
|
||||||
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
|
|
||||||
done
|
|
||||||
|
|
||||||
# copy arch includes for external modules
|
|
||||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
|
|
||||||
cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
|
|
||||||
# mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-mx6
|
|
||||||
# cp -a arch/$KARCH/mach-mx6/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-mx6/
|
|
||||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-mxc
|
|
||||||
cp -a arch/$KARCH/plat-mxc/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-mxc/
|
|
||||||
|
|
||||||
# copy files necessary for later builds, like nvidia and vmware
|
|
||||||
cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
|
|
||||||
cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
|
|
||||||
|
|
||||||
# fix permissions on scripts dir
|
|
||||||
chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
|
|
||||||
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
|
|
||||||
|
|
||||||
cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
|
||||||
|
|
||||||
if [ "${CARCH}" = "i686" ]; then
|
|
||||||
cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
|
|
||||||
|
|
||||||
# add headers for lirc package
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
|
|
||||||
|
|
||||||
cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
|
|
||||||
|
|
||||||
for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
|
|
||||||
cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# add docbook makefile
|
|
||||||
install -D -m644 Documentation/DocBook/Makefile \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
|
|
||||||
|
|
||||||
# add dm headers
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
|
||||||
cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
|
||||||
|
|
||||||
# add inotify.h
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
|
|
||||||
cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
|
|
||||||
|
|
||||||
# add wireless headers
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
|
||||||
cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
|
||||||
|
|
||||||
# add dvb headers for external modules
|
|
||||||
# in reference to:
|
|
||||||
# http://bugs.archlinux.org/task/9912
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
|
|
||||||
cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
|
|
||||||
# and...
|
|
||||||
# http://bugs.archlinux.org/task/11194
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
|
||||||
cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
|
||||||
|
|
||||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
|
||||||
# in reference to:
|
|
||||||
# http://bugs.archlinux.org/task/13146
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
|
|
||||||
# add dvb headers
|
|
||||||
# in reference to:
|
|
||||||
# http://bugs.archlinux.org/task/20402
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
|
|
||||||
cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
|
|
||||||
cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
|
|
||||||
cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
|
|
||||||
|
|
||||||
# add xfs and shmem for aufs building
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
|
|
||||||
cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
|
|
||||||
|
|
||||||
# copy in Kconfig files
|
|
||||||
for i in `find . -name "Kconfig*"`; do
|
|
||||||
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
|
|
||||||
cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
|
|
||||||
done
|
|
||||||
|
|
||||||
chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
|
|
||||||
find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
|
|
||||||
|
|
||||||
# strip scripts directory
|
|
||||||
find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
|
|
||||||
case "$(file -bi "${binary}")" in
|
|
||||||
*application/x-sharedlib*) # Libraries (.so)
|
|
||||||
/usr/bin/strip ${STRIP_SHARED} "${binary}";;
|
|
||||||
*application/x-archive*) # Libraries (.a)
|
|
||||||
/usr/bin/strip ${STRIP_STATIC} "${binary}";;
|
|
||||||
*application/x-executable*) # Binaries
|
|
||||||
/usr/bin/strip ${STRIP_BINARIES} "${binary}";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# remove unneeded architectures
|
|
||||||
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
|
|
||||||
}
|
|
||||||
|
|
||||||
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
|
||||||
for _p in ${pkgname[@]}; do
|
|
||||||
eval "package_${_p}() {
|
|
||||||
_package${_p#${pkgbase}}
|
|
||||||
}"
|
|
||||||
done
|
|
||||||
md5sums=('59310fc672941ec0276815bd52283126'
|
|
||||||
'SKIP'
|
|
||||||
'524715274cbd30abdecf81bd2938a2bc'
|
|
||||||
'39be2896f0b968d61a19b33da75ce6e0')
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,17 +0,0 @@
|
||||||
# arg 1: the new package version
|
|
||||||
# arg 2: the old package version
|
|
||||||
|
|
||||||
KERNEL_NAME=-udoo
|
|
||||||
KERNEL_VERSION=3.0.35-1-ARCH
|
|
||||||
|
|
||||||
post_install () {
|
|
||||||
# updating module dependencies
|
|
||||||
echo ">>> Updating module dependencies. Please wait ..."
|
|
||||||
depmod ${KERNEL_VERSION}
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
# updating module dependencies
|
|
||||||
echo ">>> Updating module dependencies. Please wait ..."
|
|
||||||
depmod ${KERNEL_VERSION}
|
|
||||||
}
|
|
||||||
|
|
@ -1,204 +0,0 @@
|
||||||
--- a/arch/arm/lib/memset.S
|
|
||||||
+++ b/arch/arm/lib/memset.S
|
|
||||||
@@ -19,9 +19,9 @@
|
|
||||||
1: subs r2, r2, #4 @ 1 do we have enough
|
|
||||||
blt 5f @ 1 bytes to align with?
|
|
||||||
cmp r3, #2 @ 1
|
|
||||||
- strltb r1, [r0], #1 @ 1
|
|
||||||
- strleb r1, [r0], #1 @ 1
|
|
||||||
- strb r1, [r0], #1 @ 1
|
|
||||||
+ strltb r1, [ip], #1 @ 1
|
|
||||||
+ strleb r1, [ip], #1 @ 1
|
|
||||||
+ strb r1, [ip], #1 @ 1
|
|
||||||
add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
|
|
||||||
/*
|
|
||||||
* The pointer is now aligned and the length is adjusted. Try doing the
|
|
||||||
@@ -29,10 +29,14 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
ENTRY(memset)
|
|
||||||
- ands r3, r0, #3 @ 1 unaligned?
|
|
||||||
+/*
|
|
||||||
+ * Preserve the contents of r0 for the return value.
|
|
||||||
+ */
|
|
||||||
+ mov ip, r0
|
|
||||||
+ ands r3, ip, #3 @ 1 unaligned?
|
|
||||||
bne 1b @ 1
|
|
||||||
/*
|
|
||||||
- * we know that the pointer in r0 is aligned to a word boundary.
|
|
||||||
+ * we know that the pointer in ip is aligned to a word boundary.
|
|
||||||
*/
|
|
||||||
orr r1, r1, r1, lsl #8
|
|
||||||
orr r1, r1, r1, lsl #16
|
|
||||||
@@ -43,29 +47,28 @@ ENTRY(memset)
|
|
||||||
#if ! CALGN(1)+0
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * We need an extra register for this loop - save the return address and
|
|
||||||
- * use the LR
|
|
||||||
+ * We need 2 extra registers for this loop - use r8 and the LR
|
|
||||||
*/
|
|
||||||
- str lr, [sp, #-4]!
|
|
||||||
- mov ip, r1
|
|
||||||
+ stmfd sp!, {r8, lr}
|
|
||||||
+ mov r8, r1
|
|
||||||
mov lr, r1
|
|
||||||
|
|
||||||
2: subs r2, r2, #64
|
|
||||||
- stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time.
|
|
||||||
- stmgeia r0!, {r1, r3, ip, lr}
|
|
||||||
- stmgeia r0!, {r1, r3, ip, lr}
|
|
||||||
- stmgeia r0!, {r1, r3, ip, lr}
|
|
||||||
+ stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time.
|
|
||||||
+ stmgeia ip!, {r1, r3, r8, lr}
|
|
||||||
+ stmgeia ip!, {r1, r3, r8, lr}
|
|
||||||
+ stmgeia ip!, {r1, r3, r8, lr}
|
|
||||||
bgt 2b
|
|
||||||
- ldmeqfd sp!, {pc} @ Now <64 bytes to go.
|
|
||||||
+ ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go.
|
|
||||||
/*
|
|
||||||
* No need to correct the count; we're only testing bits from now on
|
|
||||||
*/
|
|
||||||
tst r2, #32
|
|
||||||
- stmneia r0!, {r1, r3, ip, lr}
|
|
||||||
- stmneia r0!, {r1, r3, ip, lr}
|
|
||||||
+ stmneia ip!, {r1, r3, r8, lr}
|
|
||||||
+ stmneia ip!, {r1, r3, r8, lr}
|
|
||||||
tst r2, #16
|
|
||||||
- stmneia r0!, {r1, r3, ip, lr}
|
|
||||||
- ldr lr, [sp], #4
|
|
||||||
+ stmneia ip!, {r1, r3, r8, lr}
|
|
||||||
+ ldmfd sp!, {r8, lr}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
@@ -74,54 +77,54 @@ ENTRY(memset)
|
|
||||||
* whole cache lines at once.
|
|
||||||
*/
|
|
||||||
|
|
||||||
- stmfd sp!, {r4-r7, lr}
|
|
||||||
+ stmfd sp!, {r4-r8, lr}
|
|
||||||
mov r4, r1
|
|
||||||
mov r5, r1
|
|
||||||
mov r6, r1
|
|
||||||
mov r7, r1
|
|
||||||
- mov ip, r1
|
|
||||||
+ mov r8, r1
|
|
||||||
mov lr, r1
|
|
||||||
|
|
||||||
cmp r2, #96
|
|
||||||
- tstgt r0, #31
|
|
||||||
+ tstgt ip, #31
|
|
||||||
ble 3f
|
|
||||||
|
|
||||||
- and ip, r0, #31
|
|
||||||
- rsb ip, ip, #32
|
|
||||||
- sub r2, r2, ip
|
|
||||||
- movs ip, ip, lsl #(32 - 4)
|
|
||||||
- stmcsia r0!, {r4, r5, r6, r7}
|
|
||||||
- stmmiia r0!, {r4, r5}
|
|
||||||
- tst ip, #(1 << 30)
|
|
||||||
- mov ip, r1
|
|
||||||
- strne r1, [r0], #4
|
|
||||||
+ and r8, ip, #31
|
|
||||||
+ rsb r8, r8, #32
|
|
||||||
+ sub r2, r2, r8
|
|
||||||
+ movs r8, r8, lsl #(32 - 4)
|
|
||||||
+ stmcsia ip!, {r4, r5, r6, r7}
|
|
||||||
+ stmmiia ip!, {r4, r5}
|
|
||||||
+ tst r8, #(1 << 30)
|
|
||||||
+ mov r8, r1
|
|
||||||
+ strne r1, [ip], #4
|
|
||||||
|
|
||||||
3: subs r2, r2, #64
|
|
||||||
- stmgeia r0!, {r1, r3-r7, ip, lr}
|
|
||||||
- stmgeia r0!, {r1, r3-r7, ip, lr}
|
|
||||||
+ stmgeia ip!, {r1, r3-r8, lr}
|
|
||||||
+ stmgeia ip!, {r1, r3-r8, lr}
|
|
||||||
bgt 3b
|
|
||||||
- ldmeqfd sp!, {r4-r7, pc}
|
|
||||||
+ ldmeqfd sp!, {r4-r8, pc}
|
|
||||||
|
|
||||||
tst r2, #32
|
|
||||||
- stmneia r0!, {r1, r3-r7, ip, lr}
|
|
||||||
+ stmneia ip!, {r1, r3-r8, lr}
|
|
||||||
tst r2, #16
|
|
||||||
- stmneia r0!, {r4-r7}
|
|
||||||
- ldmfd sp!, {r4-r7, lr}
|
|
||||||
+ stmneia ip!, {r4-r7}
|
|
||||||
+ ldmfd sp!, {r4-r8, lr}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
4: tst r2, #8
|
|
||||||
- stmneia r0!, {r1, r3}
|
|
||||||
+ stmneia ip!, {r1, r3}
|
|
||||||
tst r2, #4
|
|
||||||
- strne r1, [r0], #4
|
|
||||||
+ strne r1, [ip], #4
|
|
||||||
/*
|
|
||||||
* When we get here, we've got less than 4 bytes to zero. We
|
|
||||||
* may have an unaligned pointer as well.
|
|
||||||
*/
|
|
||||||
5: tst r2, #2
|
|
||||||
- strneb r1, [r0], #1
|
|
||||||
- strneb r1, [r0], #1
|
|
||||||
+ strneb r1, [ip], #1
|
|
||||||
+ strneb r1, [ip], #1
|
|
||||||
tst r2, #1
|
|
||||||
- strneb r1, [r0], #1
|
|
||||||
+ strneb r1, [ip], #1
|
|
||||||
mov pc, lr
|
|
||||||
ENDPROC(memset)
|
|
||||||
--- a/arch/arm/lib/memset.S
|
|
||||||
+++ b/arch/arm/lib/memset.S
|
|
||||||
@@ -14,31 +14,15 @@
|
|
||||||
|
|
||||||
.text
|
|
||||||
.align 5
|
|
||||||
- .word 0
|
|
||||||
-
|
|
||||||
-1: subs r2, r2, #4 @ 1 do we have enough
|
|
||||||
- blt 5f @ 1 bytes to align with?
|
|
||||||
- cmp r3, #2 @ 1
|
|
||||||
- strltb r1, [ip], #1 @ 1
|
|
||||||
- strleb r1, [ip], #1 @ 1
|
|
||||||
- strb r1, [ip], #1 @ 1
|
|
||||||
- add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
|
|
||||||
-/*
|
|
||||||
- * The pointer is now aligned and the length is adjusted. Try doing the
|
|
||||||
- * memset again.
|
|
||||||
- */
|
|
||||||
|
|
||||||
ENTRY(memset)
|
|
||||||
-/*
|
|
||||||
- * Preserve the contents of r0 for the return value.
|
|
||||||
- */
|
|
||||||
- mov ip, r0
|
|
||||||
- ands r3, ip, #3 @ 1 unaligned?
|
|
||||||
- bne 1b @ 1
|
|
||||||
+ ands r3, r0, #3 @ 1 unaligned?
|
|
||||||
+ mov ip, r0 @ preserve r0 as return value
|
|
||||||
+ bne 6f @ 1
|
|
||||||
/*
|
|
||||||
* we know that the pointer in ip is aligned to a word boundary.
|
|
||||||
*/
|
|
||||||
- orr r1, r1, r1, lsl #8
|
|
||||||
+1: orr r1, r1, r1, lsl #8
|
|
||||||
orr r1, r1, r1, lsl #16
|
|
||||||
mov r3, r1
|
|
||||||
cmp r2, #16
|
|
||||||
@@ -127,4 +111,13 @@ ENTRY(memset)
|
|
||||||
tst r2, #1
|
|
||||||
strneb r1, [ip], #1
|
|
||||||
mov pc, lr
|
|
||||||
+
|
|
||||||
+6: subs r2, r2, #4 @ 1 do we have enough
|
|
||||||
+ blt 5b @ 1 bytes to align with?
|
|
||||||
+ cmp r3, #2 @ 1
|
|
||||||
+ strltb r1, [ip], #1 @ 1
|
|
||||||
+ strleb r1, [ip], #1 @ 1
|
|
||||||
+ strb r1, [ip], #1 @ 1
|
|
||||||
+ add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
|
|
||||||
+ b 1b
|
|
||||||
ENDPROC(memset)
|
|
||||||
Loading…
Reference in a new issue