mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
Merge branch 'kernel-update' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into kernel-update
This commit is contained in:
Arne Fitzenreiter
3753
config/kernel/kernel.config.armv5tel-ipfire-omap
Normal file
3753
config/kernel/kernel.config.armv5tel-ipfire-omap
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# #
|
# #
|
||||||
# IPFire.org - A linux based firewall #
|
# IPFire.org - A linux based firewall #
|
||||||
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
|
# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# This program is free software: you can redistribute it and/or modify #
|
||||||
# it under the terms of the GNU General Public License as published by #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -26,6 +26,9 @@ include Config
|
|||||||
|
|
||||||
VER = 006
|
VER = 006
|
||||||
|
|
||||||
|
# Version of the omap kernel
|
||||||
|
KVER3 = `grep "^VER " $(DIR_SRC)/lfs/linux3 | sed "s| ||g" | cut -d"=" -f2`
|
||||||
|
|
||||||
THISAPP = dracut-$(VER)
|
THISAPP = dracut-$(VER)
|
||||||
DL_FILE = $(THISAPP).tar.bz2
|
DL_FILE = $(THISAPP).tar.bz2
|
||||||
DL_FROM = $(URL_IPFIRE)
|
DL_FROM = $(URL_IPFIRE)
|
||||||
@@ -97,6 +100,10 @@ ifeq "$(MACHINE_TYPE)" "arm"
|
|||||||
# kirkwood kernel
|
# kirkwood kernel
|
||||||
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-kirkwood.img $(KVER)-ipfire-kirkwood
|
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-kirkwood.img $(KVER)-ipfire-kirkwood
|
||||||
cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
|
cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
|
||||||
|
|
||||||
|
# omap kernel
|
||||||
|
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER3)-omap.img $(KVER3)-ipfire-omap
|
||||||
|
cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER3)-omap.img uInit-ipfire-omap
|
||||||
else
|
else
|
||||||
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
|
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
|
||||||
endif
|
endif
|
||||||
|
|||||||
285
lfs/linux3
Normal file
285
lfs/linux3
Normal file
@@ -0,0 +1,285 @@
|
|||||||
|
###############################################################################
|
||||||
|
# #
|
||||||
|
# IPFire.org - A linux based firewall #
|
||||||
|
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
|
||||||
|
# #
|
||||||
|
# This program is free software: you can redistribute it and/or modify #
|
||||||
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or #
|
||||||
|
# (at your option) any later version. #
|
||||||
|
# #
|
||||||
|
# This program is distributed in the hope that it will be useful, #
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||||
|
# GNU General Public License for more details. #
|
||||||
|
# #
|
||||||
|
# You should have received a copy of the GNU General Public License #
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||||
|
# #
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Definitions
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
include Config
|
||||||
|
|
||||||
|
PATCHLEVEL = .23
|
||||||
|
VER = 2.6.40.23
|
||||||
|
|
||||||
|
XVERS = 3.0.23
|
||||||
|
XVERSION = 2
|
||||||
|
XPATCHLEVEL = 6
|
||||||
|
XSUBLEVEL = 40
|
||||||
|
XEXTRAVERSION = .23
|
||||||
|
|
||||||
|
THISAPP = linux-$(VER)
|
||||||
|
DL_FILE = linux-$(XVERS).tar.bz2
|
||||||
|
DL_FROM = $(URL_IPFIRE)
|
||||||
|
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||||
|
CFLAGS =
|
||||||
|
CXXFLAGS =
|
||||||
|
|
||||||
|
PAK_VER = 20
|
||||||
|
DEPS = ""
|
||||||
|
|
||||||
|
# Normal build or XEN build.
|
||||||
|
#
|
||||||
|
|
||||||
|
VERSUFIX=ipfire$(KCFG)
|
||||||
|
|
||||||
|
ifeq "$(HEADERS)" "1"
|
||||||
|
ifeq "$(TOOLS)" "1"
|
||||||
|
TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools
|
||||||
|
HEADERS_PREFIX = /tools
|
||||||
|
else
|
||||||
|
TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)
|
||||||
|
HEADERS_PREFIX = /usr
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(MACHINE_TYPE)" "arm"
|
||||||
|
HEADERS_ARCH=arm
|
||||||
|
else
|
||||||
|
HEADERS_ARCH=x86
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(KCFG)" ""
|
||||||
|
LASTKERNEL=1
|
||||||
|
endif
|
||||||
|
ifeq "$(KCFG)" "-kirkwood"
|
||||||
|
LASTKERNEL=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Top-level Rules
|
||||||
|
###############################################################################
|
||||||
|
objects =$(DL_FILE) \
|
||||||
|
netfilter-layer7-v2.22.tar.gz \
|
||||||
|
patch-2.6.16-nath323-1.3.bz2 \
|
||||||
|
reiser4-for-2.6.32.patch.bz2 \
|
||||||
|
xen-patches-2.6.32-2f.tar.bz2
|
||||||
|
|
||||||
|
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
|
||||||
|
netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
|
||||||
|
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
|
||||||
|
reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
|
||||||
|
xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
|
||||||
|
|
||||||
|
$(DL_FILE)_MD5 = 4905e6a50e4074a1529a14f792636d40
|
||||||
|
netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
|
||||||
|
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
|
||||||
|
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
|
||||||
|
xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b
|
||||||
|
|
||||||
|
install : $(TARGET)
|
||||||
|
|
||||||
|
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||||
|
|
||||||
|
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||||
|
|
||||||
|
md5 : $(subst %,%_MD5,$(objects))
|
||||||
|
|
||||||
|
dist:
|
||||||
|
@$(PAK)
|
||||||
|
###############################################################################
|
||||||
|
# Downloading, checking, md5sum
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||||
|
@$(CHECK)
|
||||||
|
|
||||||
|
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||||
|
@$(LOAD)
|
||||||
|
|
||||||
|
$(subst %,%_MD5,$(objects)) :
|
||||||
|
@$(MD5)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Installation Details
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||||
|
@$(PREBUILD)
|
||||||
|
@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||||
|
|
||||||
|
# Change version from 3.x to 2.6.4x
|
||||||
|
cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^VERSION =.*$$/VERSION = $(XVERSION)/g" Makefile
|
||||||
|
cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^PATCHLEVEL =.*$$/PATCHLEVEL = $(XPATCHLEVEL)/g" Makefile
|
||||||
|
cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^SUBLEVEL =.*$$/SUBLEVEL = $(XSUBLEVEL)/g" Makefile
|
||||||
|
cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^EXTRAVERSION =.*$$/EXTRAVERSION = $(XEXTRAVERSION)/g" Makefile
|
||||||
|
mv $(DIR_SRC)/linux-$(XVERS) $(DIR_SRC)/linux-$(VER)
|
||||||
|
|
||||||
|
ln -svf linux-$(VER) $(DIR_SRC)/linux
|
||||||
|
|
||||||
|
ifeq "$(KCFG)" "-xen"
|
||||||
|
# Apply gentoo Xen patches
|
||||||
|
mkdir -p $(DIR_SRC)/xen-patches
|
||||||
|
cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
|
||||||
|
|
||||||
|
for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
|
||||||
|
echo "*********** [Patch: $$x]"; \
|
||||||
|
cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \
|
||||||
|
done
|
||||||
|
rm -rf $(DIR_SRC)/xen-patches
|
||||||
|
|
||||||
|
# Linux Intermediate Queueing Device
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
|
||||||
|
else
|
||||||
|
# Linux Intermediate Queueing Device
|
||||||
|
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Not report deprecated syscall 1.23 (for kudzu)
|
||||||
|
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
|
||||||
|
|
||||||
|
# Reiser4 (don't check if fail (some patches are already in xen patchset)
|
||||||
|
# -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
|
||||||
|
|
||||||
|
# ipp2p 0.8.2-pomng
|
||||||
|
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
|
||||||
|
|
||||||
|
# Layer7-patch
|
||||||
|
# cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.22
|
||||||
|
# cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
|
||||||
|
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch
|
||||||
|
|
||||||
|
# Add some more LED triggers
|
||||||
|
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
|
||||||
|
|
||||||
|
# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
|
||||||
|
|
||||||
|
# Fix uevent PHYSDEVDRIVER
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
|
||||||
|
|
||||||
|
ifeq "$(KCFG)" "-kirkwood"
|
||||||
|
# Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_kirkwood_setups.patch
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(MACHINE_TYPE)" "arm"
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch
|
||||||
|
|
||||||
|
# Reverse some asm optimizations that are incompatible with older gcc
|
||||||
|
cd $(DIR_APP) && patch -p1 -R < $(DIR_SRC)/src/patches/linux-2.6-arm-asm-constraint.patch
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(KCFG)" "-omap"
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/panda-usb-power.patch
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/panda-i2c.patch
|
||||||
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0.23-panda-sound.patch
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(HEADERS)" "1"
|
||||||
|
# Install the header files
|
||||||
|
cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
|
||||||
|
-mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include
|
||||||
|
cd $(DIR_APP) && find dest/include \( -name .install -o -name ..install.cmd \) -delete
|
||||||
|
cd $(DIR_APP) && cp -rv dest/include/* $(BUILDROOT)/$(HEADERS_PREFIX)/include
|
||||||
|
else
|
||||||
|
|
||||||
|
# Install ipfire logo
|
||||||
|
cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \
|
||||||
|
drivers/video/logo/logo_linux_clut224.ppm
|
||||||
|
|
||||||
|
# Cleanup kernel source
|
||||||
|
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
|
||||||
|
cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
|
||||||
|
cd $(DIR_APP) && make CC="$(KGCC)" clean
|
||||||
|
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
|
||||||
|
|
||||||
|
ifeq "$(KCFG)" "-xen"
|
||||||
|
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
|
||||||
|
cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
|
||||||
|
else
|
||||||
|
ifeq "$(KCFG)" "-kirkwood"
|
||||||
|
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
|
||||||
|
cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
|
||||||
|
cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
|
||||||
|
else
|
||||||
|
ifeq "$(KCFG)" "-omap"
|
||||||
|
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
|
||||||
|
cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
|
||||||
|
cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
|
||||||
|
else
|
||||||
|
ifeq "$(KCFG)" "-versatile"
|
||||||
|
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
|
||||||
|
cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
|
||||||
|
else
|
||||||
|
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
|
||||||
|
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
|
||||||
|
cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
|
||||||
|
ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
|
||||||
|
ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
|
||||||
|
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
|
||||||
|
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
|
||||||
|
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
|
||||||
|
|
||||||
|
ifeq "$(LASTKERNEL)" "1"
|
||||||
|
# Only do this once
|
||||||
|
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
|
||||||
|
|
||||||
|
# Blacklist matroxfb_base
|
||||||
|
echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
|
||||||
|
# Blacklist old framebuffer modules
|
||||||
|
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
|
||||||
|
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
|
||||||
|
done
|
||||||
|
# Blacklist new drm framebuffer modules
|
||||||
|
for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
|
||||||
|
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
|
||||||
|
done
|
||||||
|
sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
|
||||||
|
|
||||||
|
# Blacklist isdn modules
|
||||||
|
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
|
||||||
|
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
|
||||||
|
done
|
||||||
|
sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
|
||||||
|
|
||||||
|
# Disable ipv6 at runtime
|
||||||
|
echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Remove mISDN modules
|
||||||
|
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
|
||||||
|
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
|
||||||
|
|
||||||
|
ifneq "$(MACHINE_TYPE)" "arm"
|
||||||
|
# Disable geode_aes modul
|
||||||
|
mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
|
||||||
|
/lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
|
||||||
|
@$(POSTBUILD)
|
||||||
3
make.sh
3
make.sh
@@ -436,6 +436,9 @@ buildipfire() {
|
|||||||
ipfiremake e1000e KCFG=""
|
ipfiremake e1000e KCFG=""
|
||||||
ipfiremake igb KCFG=""
|
ipfiremake igb KCFG=""
|
||||||
else
|
else
|
||||||
|
# arm-omap kernel build
|
||||||
|
ipfiremake linux3 KCFG="-omap"
|
||||||
|
|
||||||
# arm-versatile kernel build
|
# arm-versatile kernel build
|
||||||
ipfiremake linux KCFG="-versatile"
|
ipfiremake linux KCFG="-versatile"
|
||||||
ipfiremake v4l-dvb KCFG="-versatile"
|
ipfiremake v4l-dvb KCFG="-versatile"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# #
|
# #
|
||||||
# IPFire.org - A linux based firewall #
|
# IPFire.org - A linux based firewall #
|
||||||
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
|
# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# This program is free software: you can redistribute it and/or modify #
|
||||||
# it under the terms of the GNU General Public License as published by #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -40,10 +40,10 @@ for card in `ls /sys/class/net`; do
|
|||||||
if [ ! "$hwaddr" == "00:00:00:00:00:00" ];then
|
if [ ! "$hwaddr" == "00:00:00:00:00:00" ];then
|
||||||
if [ ! "$hwaddr" == "ff:ff:ff:ff:ff:ff" ];then
|
if [ ! "$hwaddr" == "ff:ff:ff:ff:ff:ff" ];then
|
||||||
|
|
||||||
driver=`grep PHYSDEVDRIVER= /sys/class/net/$card/uevent | cut -d"=" -f2`
|
driver=`grep DRIVER= /sys/class/net/$card/device/uevent | cut -d"=" -f2`
|
||||||
type=`grep PHYSDEVBUS= /sys/class/net/$card/uevent | cut -d"=" -f2`
|
type=`grep MODALIAS= /sys/class/net/$card/device/uevent | cut -d"=" -f2 | cut -d":" -f1`
|
||||||
|
|
||||||
#Default if not avaiable in /sys/class/net
|
#Default if not available in /sys/class/net
|
||||||
if [ "a$type" == "a" ]; then
|
if [ "a$type" == "a" ]; then
|
||||||
type="???"
|
type="???"
|
||||||
fi
|
fi
|
||||||
|
|||||||
347
src/patches/linux-2.6-arm-asm-constraint.patch
Normal file
347
src/patches/linux-2.6-arm-asm-constraint.patch
Normal file
@@ -0,0 +1,347 @@
|
|||||||
|
From 398aa66827155ef52bab58bebd24597d90968929 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Will Deacon <will.deacon@arm.com>
|
||||||
|
Date: Thu, 8 Jul 2010 10:59:16 +0100
|
||||||
|
Subject: [PATCH] ARM: 6212/1: atomic ops: add memory constraints to inline
|
||||||
|
asm
|
||||||
|
|
||||||
|
Currently, the 32-bit and 64-bit atomic operations on ARM do not
|
||||||
|
include memory constraints in the inline assembly blocks. In the
|
||||||
|
case of barrier-less operations [for example, atomic_add], this
|
||||||
|
means that the compiler may constant fold values which have actually
|
||||||
|
been modified by a call to an atomic operation.
|
||||||
|
|
||||||
|
This issue can be observed in the atomic64_test routine in
|
||||||
|
<kernel root>/lib/atomic64_test.c:
|
||||||
|
|
||||||
|
00000000 <test_atomic64>:
|
||||||
|
0: e1a0c00d mov ip, sp
|
||||||
|
4: e92dd830 push {r4, r5, fp, ip, lr, pc}
|
||||||
|
8: e24cb004 sub fp, ip, #4
|
||||||
|
c: e24dd008 sub sp, sp, #8
|
||||||
|
10: e24b3014 sub r3, fp, #20
|
||||||
|
14: e30d000d movw r0, #53261 ; 0xd00d
|
||||||
|
18: e3011337 movw r1, #4919 ; 0x1337
|
||||||
|
1c: e34c0001 movt r0, #49153 ; 0xc001
|
||||||
|
20: e34a1aa3 movt r1, #43683 ; 0xaaa3
|
||||||
|
24: e16300f8 strd r0, [r3, #-8]!
|
||||||
|
28: e30c0afe movw r0, #51966 ; 0xcafe
|
||||||
|
2c: e30b1eef movw r1, #48879 ; 0xbeef
|
||||||
|
30: e34d0eaf movt r0, #57007 ; 0xdeaf
|
||||||
|
34: e34d1ead movt r1, #57005 ; 0xdead
|
||||||
|
38: e1b34f9f ldrexd r4, [r3]
|
||||||
|
3c: e1a34f90 strexd r4, r0, [r3]
|
||||||
|
40: e3340000 teq r4, #0
|
||||||
|
44: 1afffffb bne 38 <test_atomic64+0x38>
|
||||||
|
48: e59f0004 ldr r0, [pc, #4] ; 54 <test_atomic64+0x54>
|
||||||
|
4c: e3a0101e mov r1, #30
|
||||||
|
50: ebfffffe bl 0 <__bug>
|
||||||
|
54: 00000000 .word 0x00000000
|
||||||
|
|
||||||
|
The atomic64_set (0x38-0x44) writes to the atomic64_t, but the
|
||||||
|
compiler doesn't see this, assumes the test condition is always
|
||||||
|
false and generates an unconditional branch to __bug. The rest of the
|
||||||
|
test is optimised away.
|
||||||
|
|
||||||
|
This patch adds suitable memory constraints to the atomic operations on ARM
|
||||||
|
to ensure that the compiler is informed of the correct data hazards. We have
|
||||||
|
to use the "Qo" constraints to avoid hitting the GCC anomaly described at
|
||||||
|
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44492 , where the compiler
|
||||||
|
makes assumptions about the writeback in the addressing mode used by the
|
||||||
|
inline assembly. These constraints forbid the use of auto{inc,dec} addressing
|
||||||
|
modes, so it doesn't matter if we don't use the operand exactly once.
|
||||||
|
|
||||||
|
Cc: stable@kernel.org
|
||||||
|
Reviewed-by: Nicolas Pitre <nicolas.pitre@linaro.org>
|
||||||
|
Signed-off-by: Will Deacon <will.deacon@arm.com>
|
||||||
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
||||||
|
---
|
||||||
|
arch/arm/include/asm/atomic.h | 132 ++++++++++++++++++++--------------------
|
||||||
|
1 files changed, 66 insertions(+), 66 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
|
||||||
|
index e9e56c0..7e79503 100644
|
||||||
|
--- a/arch/arm/include/asm/atomic.h
|
||||||
|
+++ b/arch/arm/include/asm/atomic.h
|
||||||
|
@@ -40,12 +40,12 @@ static inline void atomic_add(int i, atomic_t *v)
|
||||||
|
int result;
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic_add\n"
|
||||||
|
-"1: ldrex %0, [%2]\n"
|
||||||
|
-" add %0, %0, %3\n"
|
||||||
|
-" strex %1, %0, [%2]\n"
|
||||||
|
+"1: ldrex %0, [%3]\n"
|
||||||
|
+" add %0, %0, %4\n"
|
||||||
|
+" strex %1, %0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "Ir" (i)
|
||||||
|
: "cc");
|
||||||
|
}
|
||||||
|
@@ -58,12 +58,12 @@ static inline int atomic_add_return(int i, atomic_t *v)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic_add_return\n"
|
||||||
|
-"1: ldrex %0, [%2]\n"
|
||||||
|
-" add %0, %0, %3\n"
|
||||||
|
-" strex %1, %0, [%2]\n"
|
||||||
|
+"1: ldrex %0, [%3]\n"
|
||||||
|
+" add %0, %0, %4\n"
|
||||||
|
+" strex %1, %0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "Ir" (i)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
@@ -78,12 +78,12 @@ static inline void atomic_sub(int i, atomic_t *v)
|
||||||
|
int result;
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic_sub\n"
|
||||||
|
-"1: ldrex %0, [%2]\n"
|
||||||
|
-" sub %0, %0, %3\n"
|
||||||
|
-" strex %1, %0, [%2]\n"
|
||||||
|
+"1: ldrex %0, [%3]\n"
|
||||||
|
+" sub %0, %0, %4\n"
|
||||||
|
+" strex %1, %0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "Ir" (i)
|
||||||
|
: "cc");
|
||||||
|
}
|
||||||
|
@@ -96,12 +96,12 @@ static inline int atomic_sub_return(int i, atomic_t *v)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic_sub_return\n"
|
||||||
|
-"1: ldrex %0, [%2]\n"
|
||||||
|
-" sub %0, %0, %3\n"
|
||||||
|
-" strex %1, %0, [%2]\n"
|
||||||
|
+"1: ldrex %0, [%3]\n"
|
||||||
|
+" sub %0, %0, %4\n"
|
||||||
|
+" strex %1, %0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "Ir" (i)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
@@ -118,11 +118,11 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
|
||||||
|
|
||||||
|
do {
|
||||||
|
__asm__ __volatile__("@ atomic_cmpxchg\n"
|
||||||
|
- "ldrex %1, [%2]\n"
|
||||||
|
+ "ldrex %1, [%3]\n"
|
||||||
|
"mov %0, #0\n"
|
||||||
|
- "teq %1, %3\n"
|
||||||
|
- "strexeq %0, %4, [%2]\n"
|
||||||
|
- : "=&r" (res), "=&r" (oldval)
|
||||||
|
+ "teq %1, %4\n"
|
||||||
|
+ "strexeq %0, %5, [%3]\n"
|
||||||
|
+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
|
||||||
|
: "r" (&ptr->counter), "Ir" (old), "r" (new)
|
||||||
|
: "cc");
|
||||||
|
} while (res);
|
||||||
|
@@ -137,12 +137,12 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
|
||||||
|
unsigned long tmp, tmp2;
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic_clear_mask\n"
|
||||||
|
-"1: ldrex %0, [%2]\n"
|
||||||
|
-" bic %0, %0, %3\n"
|
||||||
|
-" strex %1, %0, [%2]\n"
|
||||||
|
+"1: ldrex %0, [%3]\n"
|
||||||
|
+" bic %0, %0, %4\n"
|
||||||
|
+" strex %1, %0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (tmp), "=&r" (tmp2)
|
||||||
|
+ : "=&r" (tmp), "=&r" (tmp2), "+Qo" (*addr)
|
||||||
|
: "r" (addr), "Ir" (mask)
|
||||||
|
: "cc");
|
||||||
|
}
|
||||||
|
@@ -249,7 +249,7 @@ static inline u64 atomic64_read(atomic64_t *v)
|
||||||
|
__asm__ __volatile__("@ atomic64_read\n"
|
||||||
|
" ldrexd %0, %H0, [%1]"
|
||||||
|
: "=&r" (result)
|
||||||
|
- : "r" (&v->counter)
|
||||||
|
+ : "r" (&v->counter), "Qo" (v->counter)
|
||||||
|
);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
@@ -260,11 +260,11 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
|
||||||
|
u64 tmp;
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_set\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%1]\n"
|
||||||
|
-" strexd %0, %2, %H2, [%1]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
+" strexd %0, %3, %H3, [%2]\n"
|
||||||
|
" teq %0, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (tmp)
|
||||||
|
+ : "=&r" (tmp), "=Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "r" (i)
|
||||||
|
: "cc");
|
||||||
|
}
|
||||||
|
@@ -275,13 +275,13 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
|
||||||
|
unsigned long tmp;
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_add\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
-" adds %0, %0, %3\n"
|
||||||
|
-" adc %H0, %H0, %H3\n"
|
||||||
|
-" strexd %1, %0, %H0, [%2]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
+" adds %0, %0, %4\n"
|
||||||
|
+" adc %H0, %H0, %H4\n"
|
||||||
|
+" strexd %1, %0, %H0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "r" (i)
|
||||||
|
: "cc");
|
||||||
|
}
|
||||||
|
@@ -294,13 +294,13 @@ static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_add_return\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
-" adds %0, %0, %3\n"
|
||||||
|
-" adc %H0, %H0, %H3\n"
|
||||||
|
-" strexd %1, %0, %H0, [%2]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
+" adds %0, %0, %4\n"
|
||||||
|
+" adc %H0, %H0, %H4\n"
|
||||||
|
+" strexd %1, %0, %H0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "r" (i)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
@@ -315,13 +315,13 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
|
||||||
|
unsigned long tmp;
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_sub\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
-" subs %0, %0, %3\n"
|
||||||
|
-" sbc %H0, %H0, %H3\n"
|
||||||
|
-" strexd %1, %0, %H0, [%2]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
+" subs %0, %0, %4\n"
|
||||||
|
+" sbc %H0, %H0, %H4\n"
|
||||||
|
+" strexd %1, %0, %H0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "r" (i)
|
||||||
|
: "cc");
|
||||||
|
}
|
||||||
|
@@ -334,13 +334,13 @@ static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_sub_return\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
-" subs %0, %0, %3\n"
|
||||||
|
-" sbc %H0, %H0, %H3\n"
|
||||||
|
-" strexd %1, %0, %H0, [%2]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
+" subs %0, %0, %4\n"
|
||||||
|
+" sbc %H0, %H0, %H4\n"
|
||||||
|
+" strexd %1, %0, %H0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "r" (i)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
@@ -358,12 +358,12 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
|
||||||
|
|
||||||
|
do {
|
||||||
|
__asm__ __volatile__("@ atomic64_cmpxchg\n"
|
||||||
|
- "ldrexd %1, %H1, [%2]\n"
|
||||||
|
+ "ldrexd %1, %H1, [%3]\n"
|
||||||
|
"mov %0, #0\n"
|
||||||
|
- "teq %1, %3\n"
|
||||||
|
- "teqeq %H1, %H3\n"
|
||||||
|
- "strexdeq %0, %4, %H4, [%2]"
|
||||||
|
- : "=&r" (res), "=&r" (oldval)
|
||||||
|
+ "teq %1, %4\n"
|
||||||
|
+ "teqeq %H1, %H4\n"
|
||||||
|
+ "strexdeq %0, %5, %H5, [%3]"
|
||||||
|
+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
|
||||||
|
: "r" (&ptr->counter), "r" (old), "r" (new)
|
||||||
|
: "cc");
|
||||||
|
} while (res);
|
||||||
|
@@ -381,11 +381,11 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_xchg\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
-" strexd %1, %3, %H3, [%2]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
+" strexd %1, %4, %H4, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (ptr->counter)
|
||||||
|
: "r" (&ptr->counter), "r" (new)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
@@ -402,16 +402,16 @@ static inline u64 atomic64_dec_if_positive(atomic64_t *v)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_dec_if_positive\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%2]\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
" subs %0, %0, #1\n"
|
||||||
|
" sbc %H0, %H0, #0\n"
|
||||||
|
" teq %H0, #0\n"
|
||||||
|
" bmi 2f\n"
|
||||||
|
-" strexd %1, %0, %H0, [%2]\n"
|
||||||
|
+" strexd %1, %0, %H0, [%3]\n"
|
||||||
|
" teq %1, #0\n"
|
||||||
|
" bne 1b\n"
|
||||||
|
"2:"
|
||||||
|
- : "=&r" (result), "=&r" (tmp)
|
||||||
|
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
@@ -429,18 +429,18 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
|
||||||
|
smp_mb();
|
||||||
|
|
||||||
|
__asm__ __volatile__("@ atomic64_add_unless\n"
|
||||||
|
-"1: ldrexd %0, %H0, [%3]\n"
|
||||||
|
-" teq %0, %4\n"
|
||||||
|
-" teqeq %H0, %H4\n"
|
||||||
|
+"1: ldrexd %0, %H0, [%4]\n"
|
||||||
|
+" teq %0, %5\n"
|
||||||
|
+" teqeq %H0, %H5\n"
|
||||||
|
" moveq %1, #0\n"
|
||||||
|
" beq 2f\n"
|
||||||
|
-" adds %0, %0, %5\n"
|
||||||
|
-" adc %H0, %H0, %H5\n"
|
||||||
|
-" strexd %2, %0, %H0, [%3]\n"
|
||||||
|
+" adds %0, %0, %6\n"
|
||||||
|
+" adc %H0, %H0, %H6\n"
|
||||||
|
+" strexd %2, %0, %H0, [%4]\n"
|
||||||
|
" teq %2, #0\n"
|
||||||
|
" bne 1b\n"
|
||||||
|
"2:"
|
||||||
|
- : "=&r" (val), "+r" (ret), "=&r" (tmp)
|
||||||
|
+ : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
|
||||||
|
: "r" (&v->counter), "r" (u), "r" (a)
|
||||||
|
: "cc");
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.6.2
|
||||||
|
|
||||||
22
src/patches/panda-i2c.patch
Executable file
22
src/patches/panda-i2c.patch
Executable file
@@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
|
||||||
|
index 58a58c7..bba0441 100644
|
||||||
|
--- a/drivers/i2c/busses/i2c-omap.c
|
||||||
|
+++ b/drivers/i2c/busses/i2c-omap.c
|
||||||
|
@@ -276,7 +276,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
|
||||||
|
|
||||||
|
pm_runtime_get_sync(&pdev->dev);
|
||||||
|
|
||||||
|
- if (cpu_is_omap34xx()) {
|
||||||
|
+ if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
|
||||||
|
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
|
||||||
|
omap_i2c_write_reg(dev, OMAP_I2C_PSC_REG, dev->pscstate);
|
||||||
|
omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev->scllstate);
|
||||||
|
@@ -493,7 +493,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
||||||
|
OMAP_I2C_IE_AL) | ((dev->fifo_size) ?
|
||||||
|
(OMAP_I2C_IE_RDR | OMAP_I2C_IE_XDR) : 0);
|
||||||
|
omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
|
||||||
|
- if (cpu_is_omap34xx()) {
|
||||||
|
+ if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
|
||||||
|
dev->pscstate = psc;
|
||||||
|
dev->scllstate = scll;
|
||||||
|
dev->sclhstate = sclh;
|
||||||
68
src/patches/panda-usb-power.patch
Executable file
68
src/patches/panda-usb-power.patch
Executable file
@@ -0,0 +1,68 @@
|
|||||||
|
VUSB is a fixed level line and hence have no set_voltage
|
||||||
|
callback in regulator ops, but has apply_uV set to true.
|
||||||
|
As a result it fails to register with the regulator core.
|
||||||
|
Remove setting apply_uV.
|
||||||
|
|
||||||
|
Also, assign name to VUSB supply, without which regulator core
|
||||||
|
fails to find it and assigns the default 'dummy' regulator to
|
||||||
|
the ehci-omap device.
|
||||||
|
|
||||||
|
Signed-off-by: Jassi Brar <jaswinder.singh@xxxxxxxxxx>
|
||||||
|
---
|
||||||
|
arch/arm/mach-omap2/board-4430sdp.c | 6 +++++-
|
||||||
|
arch/arm/mach-omap2/board-omap4panda.c | 6 +++++-
|
||||||
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
|
||||||
|
index 63de2d3..1ec60be 100644
|
||||||
|
--- a/arch/arm/mach-omap2/board-4430sdp.c
|
||||||
|
+++ b/arch/arm/mach-omap2/board-4430sdp.c
|
||||||
|
@@ -504,16 +504,20 @@ static struct regulator_init_data sdp4430_vdac = {
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
+static struct regulator_consumer_supply sdp4430_vusb_supply =
|
||||||
|
+ REGULATOR_SUPPLY("hsusb0", "ehci-omap.0");
|
||||||
|
+
|
||||||
|
static struct regulator_init_data sdp4430_vusb = {
|
||||||
|
.constraints = {
|
||||||
|
.min_uV = 3300000,
|
||||||
|
.max_uV = 3300000,
|
||||||
|
- .apply_uV = true,
|
||||||
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
||||||
|
| REGULATOR_MODE_STANDBY,
|
||||||
|
.valid_ops_mask = REGULATOR_CHANGE_MODE
|
||||||
|
| REGULATOR_CHANGE_STATUS,
|
||||||
|
},
|
||||||
|
+ .num_consumer_supplies = 1,
|
||||||
|
+ .consumer_supplies = &sdp4430_vusb_supply,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct regulator_init_data sdp4430_clk32kg = {
|
||||||
|
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
|
||||||
|
index d4f9879..7429f7e 100644
|
||||||
|
--- a/arch/arm/mach-omap2/board-omap4panda.c
|
||||||
|
+++ b/arch/arm/mach-omap2/board-omap4panda.c
|
||||||
|
@@ -362,16 +362,20 @@ static struct regulator_init_data omap4_panda_vdac = {
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
+static struct regulator_consumer_supply omap4_panda_vusb_supply =
|
||||||
|
+ REGULATOR_SUPPLY("hsusb0", "ehci-omap.0");
|
||||||
|
+
|
||||||
|
static struct regulator_init_data omap4_panda_vusb = {
|
||||||
|
.constraints = {
|
||||||
|
.min_uV = 3300000,
|
||||||
|
.max_uV = 3300000,
|
||||||
|
- .apply_uV = true,
|
||||||
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
||||||
|
| REGULATOR_MODE_STANDBY,
|
||||||
|
.valid_ops_mask = REGULATOR_CHANGE_MODE
|
||||||
|
| REGULATOR_CHANGE_STATUS,
|
||||||
|
},
|
||||||
|
+ .num_consumer_supplies = 1,
|
||||||
|
+ .consumer_supplies = &omap4_panda_vusb_supply,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct regulator_init_data omap4_panda_clk32kg = {
|
||||||
|
--
|
||||||
Reference in New Issue
Block a user