[oe-commits] org.oe.dev apex-nslu2: No need to byteswap the little-endian kernel on loading. Remove unused alternatives for cmdline - these recipes are for nslu2 only.

[rwhitby commit]

apex-nslu2: No need to byteswap the little-endian kernel on loading.  Remove unused alternatives for cmdline - these recipes are for nslu2 only.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 1e54b4f2db4e8ef4f33743de51d73d55e8b83a96
ViewMTN: http://monotone.openembedded.org/revision/info/1e54b4f2db4e8ef4f33743de51d73d55e8b83a96
Files:
1
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
Diffs:

#
# mt diff -r672c37d615b11c3f51499fc0346f88203cf46d2b -r1e54b4f2db4e8ef4f33743de51d73d55e8b83a96
#
# 
# 
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
#  from [fac18deeba57a44702190636a5aeb017a33d2e86]
#    to [c02440190f04b67f86510889b698f2accce6e9e3]
# 
# patch "packages/apex/apex-nslu2_1.5.8.bb"
#  from [15acb3b25031d818b76e970bb441e2b3b6844d3d]
#    to [0c9d366060fec0ba33716897bcfd5ab44db92721]
# 
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.8.bb	fac18deeba57a44702190636a5aeb017a33d2e86
+++ packages/apex/apex-nslu2-16mb_1.5.8.bb	c02440190f04b67f86510889b698f2accce6e9e3
@@ -1,25 +1,18 @@ 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"
 
-# Note that this recipe only works for the NSLU2 at the moment.
-# Patches to make it more generic are welcome.
-
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig-16mb"
 S = ${WORKDIR}/apex-${PV}
 
 CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
 
-CMDLINE_ROOT         = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
+CMDLINE_ROOT  ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
 
-CMDLINE_ROOT_nslu2   = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
-
 CMDLINE_DEBUG ?= ""
 
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
@@ -44,7 +37,6 @@ do_configure() {
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
 		${WORKDIR}/defconfig-16mb > ${S}/.config
@@ -60,10 +52,8 @@ do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
 	. ${CONFIG_SITE}
 	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4'
 	else
 		oefatal do_populate_staging cannot determine endianess
============================================================
--- packages/apex/apex-nslu2_1.5.8.bb	15acb3b25031d818b76e970bb441e2b3b6844d3d
+++ packages/apex/apex-nslu2_1.5.8.bb	0c9d366060fec0ba33716897bcfd5ab44db92721
@@ -1,25 +1,18 @@ 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"
 
-# Note that this recipe only works for the NSLU2 at the moment.
-# Patches to make it more generic are welcome.
-
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
 S = ${WORKDIR}/apex-${PV}
 
 CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
 
-CMDLINE_ROOT         = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
+CMDLINE_ROOT  ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
 
-CMDLINE_ROOT_nslu2   = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
-
 CMDLINE_DEBUG ?= ""
 
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
@@ -44,7 +37,6 @@ do_configure() {
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
@@ -60,10 +52,8 @@ do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
 	. ${CONFIG_SITE}
 	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
-		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4'
 	else
 		oefatal do_populate_staging cannot determine endianess