[oe-commits] org.oe.dev merge of '094e9bfdecc01f2d12a93a7a0063b2cf030b7670'

[rwhitby commit]

merge of '094e9bfdecc01f2d12a93a7a0063b2cf030b7670'
     and 'd2c5e48f5e8d93985cad4428d9ea88e583e8667d'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: b5e43fe5c6d401e028b978c17ce615d2a97900ef
ViewMTN: http://monotone.openembedded.org/revision/info/b5e43fe5c6d401e028b978c17ce615d2a97900ef
Files:
1
packages/apex/apex-nslu2-1.5.13/defconfig
packages/apex/apex-nslu2-16mb-1.5.13/defconfig
packages/apex/apex-nslu2-16mb_1.5.13.bb
packages/apex/apex-nslu2_1.5.13.bb
packages/opie-taskbar/opie-taskbar-images.inc
Diffs:

#
# mt diff -r094e9bfdecc01f2d12a93a7a0063b2cf030b7670 -rb5e43fe5c6d401e028b978c17ce615d2a97900ef
#
# 
# 
# patch "packages/apex/apex-nslu2-1.5.13/defconfig"
#  from [6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6]
#    to [9db0bfb9ebc6705433c99c696ba36dac581e02fa]
# 
# patch "packages/apex/apex-nslu2-16mb-1.5.13/defconfig"
#  from [23f6924d48366d8ea59a0b5e04f3faf94d40ae81]
#    to [4e83df9ba95b4df187098c4eb879fa4643b4daec]
# 
# patch "packages/apex/apex-nslu2-16mb_1.5.13.bb"
#  from [7a4d7e6091f47208b9adf22030c27c139f7c7497]
#    to [24cb820a7987fd9416e9221b948be3beb00293fb]
# 
# patch "packages/apex/apex-nslu2_1.5.13.bb"
#  from [75c8fa6cede30d5a2029f4988edf53a08d73ae6a]
#    to [a70de30bd9f963bdc393a4f81f915fd497874512]
# 
============================================================
--- packages/apex/apex-nslu2-1.5.13/defconfig	6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6
+++ packages/apex/apex-nslu2-1.5.13/defconfig	9db0bfb9ebc6705433c99c696ba36dac581e02fa
@@ -136,7 +136,8 @@ CONFIG_ENV_STARTUP_KERNEL_COPY=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
+CONFIG_ENV_STARTUP_PREFIX_P=y
+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
 
 #
 #    Regions
============================================================
--- packages/apex/apex-nslu2-16mb-1.5.13/defconfig	23f6924d48366d8ea59a0b5e04f3faf94d40ae81
+++ packages/apex/apex-nslu2-16mb-1.5.13/defconfig	4e83df9ba95b4df187098c4eb879fa4643b4daec
@@ -136,7 +136,8 @@ CONFIG_ENV_STARTUP_KERNEL_COPY=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
+CONFIG_ENV_STARTUP_PREFIX_P=y
+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
 
 #
 #    Regions
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.13.bb	7a4d7e6091f47208b9adf22030c27c139f7c7497
+++ packages/apex/apex-nslu2-16mb_1.5.13.bb	24cb820a7987fd9416e9221b948be3beb00293fb
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
============================================================
--- packages/apex/apex-nslu2_1.5.13.bb	75c8fa6cede30d5a2029f4988edf53a08d73ae6a
+++ packages/apex/apex-nslu2_1.5.13.bb	a70de30bd9f963bdc393a4f81f915fd497874512
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"


#
# mt diff -rd2c5e48f5e8d93985cad4428d9ea88e583e8667d -rb5e43fe5c6d401e028b978c17ce615d2a97900ef
#
# 
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [5ea7ec11fbf8d872fd9f33f7bd8f81437a7785dc]
#    to [48afd0705ba3cf2efdc1b4a6186d371cee28cfd9]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc	5ea7ec11fbf8d872fd9f33f7bd8f81437a7785dc
+++ packages/opie-taskbar/opie-taskbar-images.inc	48afd0705ba3cf2efdc1b4a6186d371cee28cfd9
@@ -54,4 +54,4 @@ PACKAGE_ARCH = "all"
 }
 
 PACKAGE_ARCH = "all"
+PACKAGES =+ "${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
-PACKAGES =+ "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"