This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, kernel-update has been updated via 9831c245f0955f9b5bdbd46777c5fed427a7f540 (commit) via 397e40a33eb99604cbbbac9e397d1f60589a119e (commit) via 8160aeb7f9bea0da57adeabc3b86cf89844ee186 (commit) via ac6945dbbae12ede65bfa23d5890394513af9847 (commit) via 34d94c7c0e81a6753ec1db80bc679711831413da (commit) via 13dcb4ee03b682dcc2be95f87274eaf9ec0fd35c (commit) via d5e982c11bcdecc74b7c17547188a42766651244 (commit) via 6a6f993b292be6e26907f6609b476a2b2e179033 (commit) via 080ce045fb9fbd79affe844312c32f87c5a2074f (commit) via 78e88cfee71a57b7d544b582c3fb9789e8971747 (commit) via 6826896546f7df243ceaea527ecd4df465d6bb0c (commit) via 936877563941402f5656ee8c329260d45afa4c6d (commit) via 06b197d8179d36d431232b4b9d090c366487c73e (commit) from deddfbd445426c80f0b2e765786cc1bdc3849e12 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 9831c245f0955f9b5bdbd46777c5fed427a7f540 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 14 16:52:07 2012 +0100
flash-images: add MLO, uboot and omap kernel for pandaboard.
commit 397e40a33eb99604cbbbac9e397d1f60589a119e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 14 16:51:11 2012 +0100
securetty: add ttyO2 (serial console of pandaboard).
commit 8160aeb7f9bea0da57adeabc3b86cf89844ee186 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 14 16:49:46 2012 +0100
kernel: update omap kernel to 2.6.40.24 aka 3.0.24.
commit ac6945dbbae12ede65bfa23d5890394513af9847 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 14 16:46:51 2012 +0100
partresize: fix for mmcblk devices.
commit 34d94c7c0e81a6753ec1db80bc679711831413da Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 14 16:45:07 2012 +0100
u-boot: update to 2011.12 and build MLO + bin for pandaboard.
commit 13dcb4ee03b682dcc2be95f87274eaf9ec0fd35c Merge: 080ce04 d5e982c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 14 10:37:16 2012 +0100
Merge commit 'origin/next' into kernel-update
commit 080ce045fb9fbd79affe844312c32f87c5a2074f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 13 18:41:58 2012 +0100
kernel: exchange pandaboard patches.
commit 78e88cfee71a57b7d544b582c3fb9789e8971747 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 13 18:39:00 2012 +0100
kernel: disable highmem on omap kernel.
Not a real solution but the board crash if highmem is used.
-----------------------------------------------------------------------
Summary of changes: config/etc/securetty | 1 + config/kernel/kernel.config.armv5tel-ipfire-omap | 12 +- config/rootfiles/common/armv5tel/linux-omap | 5 + config/rootfiles/common/armv5tel/u-boot | 6 + config/rootfiles/common/armv5tel/uboot | 1 - config/rootfiles/core/58/filelists/files | 4 + .../rootfiles/core/{54 => 58}/filelists/fireinfo | 0 config/rootfiles/core/{55 => 58}/filelists/openssh | 0 config/rootfiles/core/{55 => 58}/filelists/openssl | 0 config/rootfiles/packages/git | 79 ++++++++++- config/u-boot/boot.scr | Bin 0 -> 300 bytes config/u-boot/boot.script | 4 + config/u-boot/convert_bootscript | 1 + lfs/fireinfo | 4 +- lfs/flash-images | 28 +++- lfs/git | 10 +- lfs/linux3 | 17 ++- lfs/openssl | 4 +- lfs/samba | 6 +- lfs/u-boot | 17 ++- src/initscripts/init.d/partresize | 6 +- src/patches/linux-2.6.40-pandaboard-dvi720p.patch | 51 +++++++ ...patch => linux-2.6.40-pandaboard-i2c-fix.patch} | 0 src/patches/linux-2.6.40-pandaboard-wlan-fix.patch | 12 ++ .../linux-2.x-smsc95xx-add_mac_addr_param.patch | 149 ++++++++++++++++++++ src/patches/panda-usb-power.patch | 68 --------- 26 files changed, 375 insertions(+), 110 deletions(-) create mode 100644 config/rootfiles/common/armv5tel/linux-omap create mode 100644 config/rootfiles/common/armv5tel/u-boot delete mode 100644 config/rootfiles/common/armv5tel/uboot copy config/rootfiles/core/{54 => 58}/filelists/fireinfo (100%) copy config/rootfiles/core/{55 => 58}/filelists/openssh (100%) copy config/rootfiles/core/{55 => 58}/filelists/openssl (100%) create mode 100755 config/u-boot/boot.scr create mode 100755 config/u-boot/boot.script create mode 100755 config/u-boot/convert_bootscript create mode 100755 src/patches/linux-2.6.40-pandaboard-dvi720p.patch rename src/patches/{panda-i2c.patch => linux-2.6.40-pandaboard-i2c-fix.patch} (100%) create mode 100755 src/patches/linux-2.6.40-pandaboard-wlan-fix.patch create mode 100755 src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch delete mode 100755 src/patches/panda-usb-power.patch
Difference in files: diff --git a/config/etc/securetty b/config/etc/securetty index 9a6a9fd..3a69d0b 100644 --- a/config/etc/securetty +++ b/config/etc/securetty @@ -5,6 +5,7 @@ tty4 tty5 tty6 ttyAMA0 +ttyO2 ttyS0 ttyS1 ttyS2 diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel/kernel.config.armv5tel-ipfire-omap index bfcb9bd..10b72dd 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-omap +++ b/config/kernel/kernel.config.armv5tel-ipfire-omap @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 2.6.40.23-ipfire-omap Kernel Configuration +# Linux/arm 2.6.40.24 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -438,8 +438,7 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HIGHMEM=y -# CONFIG_HIGHPTE is not set +# CONFIG_HIGHMEM is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y @@ -450,7 +449,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 -CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -1485,7 +1483,10 @@ CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m CONFIG_WL1251_SDIO=m CONFIG_WL12XX_MENU=m -# CONFIG_WL12XX is not set +CONFIG_WL12XX=m +# CONFIG_WL12XX_HT is not set +CONFIG_WL12XX_SDIO=m +# CONFIG_WL12XX_SDIO_TEST is not set CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set @@ -3540,7 +3541,6 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/common/armv5tel/linux-omap new file mode 100644 index 0000000..15bcb6c --- /dev/null +++ b/config/rootfiles/common/armv5tel/linux-omap @@ -0,0 +1,5 @@ +boot/uInit-ipfire-omap +boot/uImage-ipfire-omap +boot/System.map-2.6.40.24-ipfire-omap +boot/config-2.6.40.24-ipfire-omap +lib/modules/2.6.40.24-ipfire-omap diff --git a/config/rootfiles/common/armv5tel/u-boot b/config/rootfiles/common/armv5tel/u-boot new file mode 100644 index 0000000..759d41d --- /dev/null +++ b/config/rootfiles/common/armv5tel/u-boot @@ -0,0 +1,6 @@ +#boot/MLO +#boot/u-boot.bin +usr/bin/mkimage +boot/boot.scr +boot/boot.script +boot/convert_bootscript diff --git a/config/rootfiles/common/armv5tel/uboot b/config/rootfiles/common/armv5tel/uboot deleted file mode 100644 index 80864b7..0000000 --- a/config/rootfiles/common/armv5tel/uboot +++ /dev/null @@ -1 +0,0 @@ -usr/bin/mkimage diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files index afb3d99..047127e 100644 --- a/config/rootfiles/core/58/filelists/files +++ b/config/rootfiles/core/58/filelists/files @@ -1,3 +1,7 @@ etc/system-release etc/issue etc/vimrc +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/general-functions.pl +var/ipfire/langs diff --git a/config/rootfiles/core/58/filelists/fireinfo b/config/rootfiles/core/58/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/58/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/58/filelists/openssh b/config/rootfiles/core/58/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/58/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/58/filelists/openssl b/config/rootfiles/core/58/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/58/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index f17851d..b92070e 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -6,10 +6,32 @@ usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk usr/lib/perl5/site_perl/5.12.3/Error.pm +usr/lib/perl5/site_perl/5.12.3/Git usr/lib/perl5/site_perl/5.12.3/Git.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist +usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist +usr/lib/python2.7/site-packages/git_remote_helpers +#usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info +usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py +usr/lib/python2.7/site-packages/git_remote_helpers/__init__.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git +usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/git.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/git.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/util.py +usr/lib/python2.7/site-packages/git_remote_helpers/util.pyc usr/libexec/git-core +usr/libexec/git-core/git usr/libexec/git-core/git-add usr/libexec/git-core/git-add--interactive usr/libexec/git-core/git-am @@ -36,6 +58,9 @@ usr/libexec/git-core/git-commit usr/libexec/git-core/git-commit-tree usr/libexec/git-core/git-config usr/libexec/git-core/git-count-objects +usr/libexec/git-core/git-credential-cache +usr/libexec/git-core/git-credential-cache--daemon +usr/libexec/git-core/git-credential-store usr/libexec/git-core/git-cvsexportcommit usr/libexec/git-core/git-cvsimport usr/libexec/git-core/git-cvsserver @@ -50,7 +75,6 @@ usr/libexec/git-core/git-difftool--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch -usr/libexec/git-core/git-fetch--tool usr/libexec/git-core/git-fetch-pack usr/libexec/git-core/git-filter-branch usr/libexec/git-core/git-fmt-merge-msg @@ -65,6 +89,7 @@ usr/libexec/git-core/git-gui usr/libexec/git-core/git-gui--askpass usr/libexec/git-core/git-hash-object usr/libexec/git-core/git-help +usr/libexec/git-core/git-http-backend usr/libexec/git-core/git-http-fetch usr/libexec/git-core/git-http-push usr/libexec/git-core/git-imap-send @@ -96,6 +121,7 @@ usr/libexec/git-core/git-mktag usr/libexec/git-core/git-mktree usr/libexec/git-core/git-mv usr/libexec/git-core/git-name-rev +usr/libexec/git-core/git-notes usr/libexec/git-core/git-pack-objects usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs @@ -109,12 +135,22 @@ usr/libexec/git-core/git-push usr/libexec/git-core/git-quiltimport usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase +usr/libexec/git-core/git-rebase--am usr/libexec/git-core/git-rebase--interactive +usr/libexec/git-core/git-rebase--merge usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-relink usr/libexec/git-core/git-remote +usr/libexec/git-core/git-remote-ext +usr/libexec/git-core/git-remote-fd +usr/libexec/git-core/git-remote-ftp +usr/libexec/git-core/git-remote-ftps +usr/libexec/git-core/git-remote-http +usr/libexec/git-core/git-remote-https +usr/libexec/git-core/git-remote-testgit usr/libexec/git-core/git-repack +usr/libexec/git-core/git-replace usr/libexec/git-core/git-repo-config usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere @@ -125,6 +161,8 @@ usr/libexec/git-core/git-revert usr/libexec/git-core/git-rm usr/libexec/git-core/git-send-email usr/libexec/git-core/git-send-pack +usr/libexec/git-core/git-sh-i18n +usr/libexec/git-core/git-sh-i18n--envsubst usr/libexec/git-core/git-sh-setup usr/libexec/git-core/git-shell usr/libexec/git-core/git-shortlog @@ -154,6 +192,22 @@ usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse usr/libexec/git-core/git-whatchanged usr/libexec/git-core/git-write-tree +usr/libexec/git-core/mergetools +usr/libexec/git-core/mergetools/araxis +usr/libexec/git-core/mergetools/bc3 +usr/libexec/git-core/mergetools/defaults +usr/libexec/git-core/mergetools/diffuse +usr/libexec/git-core/mergetools/ecmerge +usr/libexec/git-core/mergetools/emerge +usr/libexec/git-core/mergetools/kdiff3 +usr/libexec/git-core/mergetools/kompare +usr/libexec/git-core/mergetools/meld +usr/libexec/git-core/mergetools/opendiff +usr/libexec/git-core/mergetools/p4merge +usr/libexec/git-core/mergetools/tkdiff +usr/libexec/git-core/mergetools/tortoisemerge +usr/libexec/git-core/mergetools/vim +usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates usr/share/git-core/templates/branches @@ -161,8 +215,6 @@ usr/share/git-core/templates/description usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample -usr/share/git-core/templates/hooks/post-commit.sample -usr/share/git-core/templates/hooks/post-receive.sample usr/share/git-core/templates/hooks/post-update.sample usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample @@ -195,16 +247,19 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/error.tcl #usr/share/git-gui/lib/git-gui.ico #usr/share/git-gui/lib/index.tcl +#usr/share/git-gui/lib/line.tcl #usr/share/git-gui/lib/logo.tcl #usr/share/git-gui/lib/merge.tcl #usr/share/git-gui/lib/mergetool.tcl #usr/share/git-gui/lib/msgs #usr/share/git-gui/lib/msgs/de.msg +#usr/share/git-gui/lib/msgs/el.msg #usr/share/git-gui/lib/msgs/fr.msg #usr/share/git-gui/lib/msgs/hu.msg #usr/share/git-gui/lib/msgs/it.msg #usr/share/git-gui/lib/msgs/ja.msg #usr/share/git-gui/lib/msgs/nb.msg +#usr/share/git-gui/lib/msgs/pt_br.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg #usr/share/git-gui/lib/msgs/zh_cn.msg @@ -218,6 +273,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/sshkey.tcl #usr/share/git-gui/lib/status_bar.tcl #usr/share/git-gui/lib/tclIndex +#usr/share/git-gui/lib/themed.tcl #usr/share/git-gui/lib/tools.tcl #usr/share/git-gui/lib/tools_dlg.tcl #usr/share/git-gui/lib/transport.tcl @@ -228,8 +284,21 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg +#usr/share/gitk/lib/msgs/fr.msg +#usr/share/gitk/lib/msgs/hu.msg #usr/share/gitk/lib/msgs/it.msg +#usr/share/gitk/lib/msgs/ja.msg +#usr/share/gitk/lib/msgs/pt_br.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg +#usr/share/gitweb +#usr/share/gitweb/gitweb.cgi +#usr/share/gitweb/static +#usr/share/gitweb/static/git-favicon.png +#usr/share/gitweb/static/git-logo.png +#usr/share/gitweb/static/gitweb.css +#usr/share/gitweb/static/gitweb.js +#usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/man/man3/Git.3 +#usr/share/man/man3/Git::I18N.3 #usr/share/man/man3/private-Error.3 diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr new file mode 100755 index 0000000..bdc4267 Binary files /dev/null and b/config/u-boot/boot.scr differ diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script new file mode 100755 index 0000000..e30615f --- /dev/null +++ b/config/u-boot/boot.script @@ -0,0 +1,4 @@ +fatload mmc 0:1 0x80000000 uImage-ipfire-omap +fatload mmc 0:1 0x81600000 uInit-ipfire-omap +setenv bootargs vram=32M console=ttyO2,115200n8 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 rw +bootm 0x80000000 0x81600000 diff --git a/config/u-boot/convert_bootscript b/config/u-boot/convert_bootscript new file mode 100755 index 0000000..962191f --- /dev/null +++ b/config/u-boot/convert_bootscript @@ -0,0 +1 @@ +mkimage -A arm -T script -C none -d boot.script boot.scr diff --git a/lfs/fireinfo b/lfs/fireinfo index 26c195d..e0d83bf 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@
include Config
-VER = 2.1.3 +VER = 2.1.4
THISAPP = fireinfo-v$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8c977d1b8b0743ea0d244d1d8f86598a +$(DL_FILE)_MD5 = 4a5a027fadb7f81bda1224608a76c944
install : $(TARGET)
diff --git a/lfs/flash-images b/lfs/flash-images index daf3ec1..8fab6e3 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -50,11 +50,11 @@ MNThdd := /install/harddisk IMGpart := /install/images/part_area IMGboot := /install/images/bootfs # don't change SIZEboot this without checking Image size -SIZEboot := 20 +SIZEboot := 50 IMGroot := /install/images/rootfs SIZEroot := 1400 IMGvar := /install/images/varfs -SIZEvar := 430 +SIZEvar := 400
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) && mkdir -p $(MNThdd) @@ -63,7 +63,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) dd bs=1k if=/dev/zero of=$(IMGpart) count=16
# Create images for filesystems - dd bs=1K if=/dev/zero of=$(IMGboot) count=20464 # 20MB-16K + dd bs=1K if=/dev/zero of=$(IMGboot) count=51184 # 50MB-16K dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot) dd bs=1M if=/dev/zero of=$(IMGvar) count=$(SIZEvar)
@@ -84,6 +84,15 @@ endif mount -o loop $(IMGboot) $(MNThdd)/boot mount -o loop $(IMGvar) $(MNThdd)/var
+ # Install MLO and uboot first +ifeq "$(MACHINE_TYPE)" "arm" + cp -v /boot/MLO $(MNThdd)/boot/ + cp -v /boot/u-boot.bin $(MNThdd)/boot/ + sync + umount $(MNThdd)/boot + mount -o loop $(IMGboot) $(MNThdd)/boot +endif + # Install IPFire tar -C $(MNThdd)/ -xvaf /install/cdrom/$(SNAME)-$(VERSION).tlz echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings @@ -143,9 +152,15 @@ endif
# Cat to an image cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinst) + # Write Partition table +ifneq "$(MACHINE_TYPE)" "arm" echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ | sfdisk -D -uM -H 64 -S 32 $(IMGinst) +else + echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ + | sfdisk -D -uM -H 64 -S 32 $(IMGinst) +endif
ifneq "$(MACHINE_TYPE)" "arm" # Install grub @@ -199,9 +214,15 @@ endif # Cat to an image cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinsts) rm -vf $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) + # Write Partition table +ifneq "$(MACHINE_TYPE)" "arm" echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ | sfdisk -D -uM -H 64 -S 32 $(IMGinsts) +else + echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ + | sfdisk -D -uM -H 64 -S 32 $(IMGinsts) +endif
ifneq "$(MACHINE_TYPE)" "arm" # Install grub @@ -217,4 +238,3 @@ endif gzip -f9 $(IMGinsts)
rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) - diff --git a/lfs/git b/lfs/git index 253b819..82b90fd 100644 --- a/lfs/git +++ b/lfs/git @@ -24,15 +24,15 @@
include Config
-VER = 1.6.3.1 +VER = 1.7.9.3
THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 7 +PAK_VER = 8
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c1f4aab741359c29f0fbf28563ac7387 +$(DL_FILE)_MD5 = f93b976649216d731fd9f9befb90a58c
install : $(TARGET)
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/linux3 b/lfs/linux3 index d8042a2..b72b78c 100644 --- a/lfs/linux3 +++ b/lfs/linux3 @@ -24,14 +24,14 @@
include Config
-PATCHLEVEL = .23 -VER = 2.6.40.23 +PATCHLEVEL = .24 +VER = 2.6.40.24
-XVERS = 3.0.23 +XVERS = 3.0.24 XVERSION = 2 XPATCHLEVEL = 6 XSUBLEVEL = 40 -XEXTRAVERSION = .23 +XEXTRAVERSION = .24
THISAPP = linux-$(VER) DL_FILE = linux-$(XVERS).tar.bz2 @@ -88,7 +88,7 @@ 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 +$(DL_FILE)_MD5 = 3bebfdf614f3139202c5497b40953920 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 @@ -189,9 +189,10 @@ ifeq "$(MACHINE_TYPE)" "arm" 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 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-dvi720p.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch endif
ifeq "$(HEADERS)" "1" diff --git a/lfs/openssl b/lfs/openssl index 21b6c0e..3336cfb 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@
include Config
-VER = 0.9.8t +VER = 0.9.8u
THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f5dabb7ffb068eecf245f1b2151df100 +$(DL_FILE)_MD5 = cb41e94f762ed63e41d1cca2b8430ede
install : $(TARGET)
diff --git a/lfs/samba b/lfs/samba index f31aac2..781a342 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@
include Config
-VER = 3.5.12 +VER = 3.5.13
THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 37 +PAK_VER = 38
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b1b8c6238a5524d001b8518d2b999993 +$(DL_FILE)_MD5 = ceb91e31218e337ae8d47b35f03518ca
install : $(TARGET)
diff --git a/lfs/u-boot b/lfs/u-boot index 6fbd888..551fea5 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -24,10 +24,12 @@
include Config
-VER = 2011.06 +VER = 2011.12 +# Linare version: git clone git://git.linaro.org/boot/u-boot-linaro-stable.git +# Branch: origin/Linaro-u-boot-2011.12
-THISAPP = u-boot-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = uboot-panda-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0cc5026aad02f218a9b9ac56b301c97a +$(DL_FILE)_MD5 = 19975e9bb4b10d8e67db84e51fcaa43b
install : $(TARGET)
@@ -73,8 +75,13 @@ dist:
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make tools $(MAKETUNING) cd $(DIR_APP) && install tools/mkimage /usr/bin/ + cd $(DIR_APP) && make omap4_panda_config + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && install MLO /boot/ + cd $(DIR_APP) && install u-boot.bin /boot/ + cp -vf $(DIR_SRC)/config/u-boot/* /boot/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize index 8eddc46..ae70ff9 100644 --- a/src/initscripts/init.d/partresize +++ b/src/initscripts/init.d/partresize @@ -24,7 +24,11 @@ case "${1}" in
# Detect device ROOT=`mount | grep -m1 " / " | cut -d" " -f1`; - DRV=${ROOT::`expr length $ROOT`-1} + if [ "${ROOT:`expr length $ROOT`-2:1}" == "p" ]; then + DRV=${ROOT::`expr length $ROOT`-2} + else + DRV=${ROOT::`expr length $ROOT`-1} + fi
boot_mesg "Change Partition 4 to all free space ..." echo -e 'd\n4\nn\np\n4\n\n\nw\nq\n' | fdisk ${DRV} diff --git a/src/patches/linux-2.6.40-pandaboard-dvi720p.patch b/src/patches/linux-2.6.40-pandaboard-dvi720p.patch new file mode 100755 index 0000000..8ec3586 --- /dev/null +++ b/src/patches/linux-2.6.40-pandaboard-dvi720p.patch @@ -0,0 +1,51 @@ +diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c +index 90485fc..7a92185 100644 +--- a/arch/arm/mach-omap2/board-omap4panda.c ++++ b/arch/arm/mach-omap2/board-omap4panda.c +@@ -583,7 +583,7 @@ static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev) + + /* Using generic display panel */ + static struct panel_generic_dpi_data omap4_dvi_panel = { +- .name = "generic", ++ .name = "dvi_720p", + .platform_enable = omap4_panda_enable_dvi, + .platform_disable = omap4_panda_disable_dvi, + }; +diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c +index 9c90f75..af8352f 100644 +--- a/drivers/video/omap2/displays/panel-generic-dpi.c ++++ b/drivers/video/omap2/displays/panel-generic-dpi.c +@@ -232,7 +232,32 @@ static struct panel_config generic_dpi_panels[] = { + .power_off_delay = 0, + .name = "powertip_ph480272t", + }, +-}; ++ ++ /* Vesa 720p 1280x768 */ ++ { ++ { ++ .x_res = 1280, ++ .y_res = 768, ++ ++ .pixel_clock = 71000, ++ ++ .hfp = 128, ++ .hsw = 64, ++ .hbp = 192, ++ ++ .vfp = 3, ++ .vsw = 7, ++ .vbp = 20, ++ }, ++ .acbi = 0x0, ++ .acb = 0x0, ++ .config = OMAP_DSS_LCD_TFT, ++ .power_on_delay = 0, ++ .power_off_delay = 0, ++ .name = "dvi_720p", ++ }, ++ }; ++ + + struct panel_drv_data { + diff --git a/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch b/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch new file mode 100755 index 0000000..ea847be --- /dev/null +++ b/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch @@ -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; diff --git a/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch b/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch new file mode 100755 index 0000000..1b6b5c4 --- /dev/null +++ b/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch @@ -0,0 +1,12 @@ +diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c +index 1269658..8ec6330 100644 +--- a/arch/arm/mach-omap2/board-omap4panda.c ++++ b/arch/arm/mach-omap2/board-omap4panda.c +@@ -377,6 +377,7 @@ static struct regulator_init_data omap4_panda_vusb = { + static struct regulator_init_data omap4_panda_clk32kg = { + .constraints = { + .valid_ops_mask = REGULATOR_CHANGE_STATUS, ++ .always_on = true, + }, + }; + diff --git a/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch b/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch new file mode 100755 index 0000000..2aea1d1 --- /dev/null +++ b/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch @@ -0,0 +1,149 @@ +Added smsc95xx.macaddr module parameter to allow the user to +change the MAC address on boot if there was no MAC on the EEPROM. + +The parameter take the MAC address in 01:23:45:67:89:ab format and +needs to be locally assigned. The MAC get assigned to the first +smsc95xx device with no MAC on EEPROM (which resulted in a random +MAC before). If there is more than one device without MAC on +EEPROM and the user needs set the MAC to a specific device, it +can be done by attaching the netdev name (e.g. eth0) to the +smsc95xx.macaddr parameter seperated by a ';' as e.g. in +'01:23:45:67:89:ab;eth0' + +This allows e.g. u-boot to pass on PandaBoard or BeagleBoard +the by u-boot generated static MAC address to the kernel device +to ensure the MAC stays the same during the whole boot process. + +Signed-off-by: Danny Kukawka <danny.kukawka@...> +--- + drivers/net/usb/smsc95xx.c | 85 ++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 82 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index d45520e..3198c7d 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -52,6 +52,8 @@ struct smsc95xx_priv { + u32 hash_hi; + u32 hash_lo; + spinlock_t mac_cr_lock; ++ bool mac_set_from_param; ++ bool mac_is_random; + }; + + struct usb_context { +@@ -63,6 +65,11 @@ static bool turbo_mode = true; + module_param(turbo_mode, bool, 0644); + MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); + ++static char *macaddr = ":"; ++static bool set_macaddr = false; ++module_param(macaddr, charp, 0); ++MODULE_PARM_DESC(macaddr, " macaddr=macaddr;[tgt-netdevname] (Set MAC only if there is a device without MAC on EEPROM)"); ++ + static int smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data) + { + u32 *buf = kmalloc(4, GFP_KERNEL); +@@ -601,8 +608,71 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) + return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); + } + ++/* set mac address from the macaddr module parameter */ ++static int smsc95xx_init_mac_address_from_param(struct usbnet *dev) ++{ ++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]); ++ int i, parsed, ret; ++ u8 mtbl[ETH_ALEN]; ++ char *input = NULL; ++ char *config_param = NULL; ++ char *netdev_name = NULL; ++ ++ parsed = 0; ++ ret = 0; ++ ++ input = kstrdup(macaddr, GFP_KERNEL); ++ ++ if (!input) ++ return -ENOMEM; ++ ++ if (strlen(input) >= 17) { ++ while ((config_param = strsep(&input, ";"))) { ++ if (parsed == 0) { ++ if (!mac_pton(config_param, mtbl)) { ++ ret = 1; ++ goto parse_err; ++ } ++ } else { ++ netdev_name = config_param; ++ } ++ parsed ++; ++ } ++ ++ if (parsed && is_valid_ether_addr(mtbl)) { ++ if (netdev_name && strlen(netdev_name)) { ++ if (strcmp(netdev_name, dev->net->name) != 0) { ++ netif_dbg(dev, ifup, dev->net, "requested devname (%s) didn't match (%s)\n", netdev_name, dev->net->name); ++ ret = 1; ++ goto out; ++ } ++ } ++ ++ for (i = 0; i < ETH_ALEN; i++) { ++ dev->net->dev_addr[i] = mtbl[i]; ++ } ++ ++ netif_dbg(dev, ifup, dev->net, "set valid MAC address from smsc95xx.macaddr\n"); ++ set_macaddr = true; ++ pdata->mac_set_from_param = true; ++ pdata->mac_is_random = false; ++ goto out; ++ } ++ } ++ ++parse_err: ++ netif_dbg(dev, ifup, dev->net, "failed to parse (valid) MAC from smsc95xx.macaddr\n"); ++ set_macaddr = true; ++out: ++ if (input) ++ kfree(input); ++ return ret; ++} ++ + static void smsc95xx_init_mac_address(struct usbnet *dev) + { ++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]); ++ + /* try reading mac address from EEPROM */ + if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, + dev->net->dev_addr) == 0) { +@@ -615,16 +685,25 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) + + /* no eeprom, or eeprom values are invalid. generate random MAC */ + random_ether_addr(dev->net->dev_addr); ++ pdata->mac_is_random = true; + netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n"); + } + + static int smsc95xx_set_mac_address(struct usbnet *dev) + { +- u32 addr_lo = dev->net->dev_addr[0] | dev->net->dev_addr[1] << 8 | +- dev->net->dev_addr[2] << 16 | dev->net->dev_addr[3] << 24; +- u32 addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8; ++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]); ++ u32 addr_lo, addr_hi; + int ret; + ++ if (pdata->mac_is_random && !pdata->mac_set_from_param && !set_macaddr) { ++ netif_dbg(dev, ifup, dev->net, "random MAC address, not yet set from smsc95xx.macaddr, try to set it ...\n"); ++ smsc95xx_init_mac_address_from_param(dev); ++ } ++ ++ addr_lo = dev->net->dev_addr[0] | dev->net->dev_addr[1] << 8 | ++ dev->net->dev_addr[2] << 16 | dev->net->dev_addr[3] << 24; ++ addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8; ++ + ret = smsc95xx_write_reg(dev, ADDRL, addr_lo); + if (ret < 0) { + netdev_warn(dev->net, "Failed to write ADDRL: %d\n", ret); +-- + diff --git a/src/patches/panda-i2c.patch b/src/patches/panda-i2c.patch deleted file mode 100755 index ea847be..0000000 --- a/src/patches/panda-i2c.patch +++ /dev/null @@ -1,22 +0,0 @@ -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; diff --git a/src/patches/panda-usb-power.patch b/src/patches/panda-usb-power.patch deleted file mode 100755 index 9f130ef..0000000 --- a/src/patches/panda-usb-power.patch +++ /dev/null @@ -1,68 +0,0 @@ -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 = { --- \ No newline at end of file
hooks/post-receive -- IPFire 2.x development tree