[oe-commits] org.oe.dev apex: Updated to 1.5.4 and removed old versions
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Jun 2 10:54:13 UTC 2007
apex: Updated to 1.5.4 and removed old versions
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 47c01740d6df38376dfcb0407a0b42bb05e60a2b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=47c01740d6df38376dfcb0407a0b42bb05e60a2b
Files:
1
packages/apex/apex_1.2.19.bb
packages/apex/apex_1.4.11.bb
packages/apex/apex_1.4.7.bb
packages/apex/apex_1.5.4.bb
packages/apex/files
packages/apex/files/fix-compiler-inlining.patch
packages/apex/nslu2/defconfig
Diffs:
#
# mt diff -reb047a6635d08630dddbc92ab294e878aaa9be5f -r47c01740d6df38376dfcb0407a0b42bb05e60a2b
#
#
#
# delete "packages/apex/apex_1.2.19.bb"
#
# delete "packages/apex/apex_1.4.11.bb"
#
# rename "packages/apex/apex_1.4.7.bb"
# to "packages/apex/apex_1.5.4.bb"
#
# add_dir "packages/apex/files"
#
# add_file "packages/apex/files/fix-compiler-inlining.patch"
# content [1331de393bb5598d89eb90143e240942d3109dc7]
#
# patch "packages/apex/apex_1.5.4.bb"
# from [a4205b193f39e297baca436c22e8a63056b4dc46]
# to [0261af26f73039fd1d171190afcfb11866a4a6a0]
#
# patch "packages/apex/nslu2/defconfig"
# from [f5555c35bb8933c7cc891e71ae3aec8051dc23b1]
# to [e5fae3d25ffd976f8ec4082eaed48a4bf3f65b21]
#
============================================================
--- packages/apex/files/fix-compiler-inlining.patch 1331de393bb5598d89eb90143e240942d3109dc7
+++ packages/apex/files/fix-compiler-inlining.patch 1331de393bb5598d89eb90143e240942d3109dc7
@@ -0,0 +1,28 @@
+--- apex-1.5.4/src/arch-arm/entry/apex.lds.S~ 2007-05-31 14:54:41.000000000 +0930
++++ apex-1.5.4/src/arch-arm/entry/apex.lds.S 2007-06-02 14:26:51.000000000 +0930
+@@ -48,8 +48,8 @@
+ }
+ .reset.post : { /* Post-SDRAM init code.*/
+ *(.reset.post)
+- *(.reset.postfn)
+- *(.reset.postex)
++ *(.reset.post.func)
++ *(.reset.post.exit)
+ }
+ .rlocate : { /* Final/only relocation of APEX to SDRAM */
+ *(.rlocate)
+--- apex-1.5.4/src/arch-arm/entry/reset.c~ 2007-05-31 14:54:41.000000000 +0930
++++ apex-1.5.4/src/arch-arm/entry/reset.c 2007-06-02 14:27:20.000000000 +0930
+@@ -292,10 +292,10 @@
+ // __asm volatile ("mov sp, %0" :: "r" (&APEX_VMA_STACK_START));
+
+ __asm volatile ("mov r0, %0" :: "r" (offset));
+- __asm volatile ("b reset_post_2");
++ __asm volatile ("b reset_post_exit");
+ }
+
+-void __naked __section (.reset.post) reset_post_2 (void)
++void __naked __section (.reset.post.exit) reset_post_exit (void)
+ {
+ }
+
============================================================
--- packages/apex/apex_1.4.7.bb a4205b193f39e297baca436c22e8a63056b4dc46
+++ packages/apex/apex_1.5.4.bb 0261af26f73039fd1d171190afcfb11866a4a6a0
@@ -5,9 +5,21 @@ PR = "r1"
LICENSE = "GPL"
PR = "r1"
+# 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://fix-compiler-inlining.patch;patch=1 \
file://defconfig"
+CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
+
+CMDLINE_ROOT = "root=/dev/mtdblock2 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"
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
@@ -15,9 +27,6 @@ oe_runmake() {
make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
}
-# FIXME - make this the same as the distro kernel compilation
-CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug"
-
# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
# of the .config file and remove any settings in defconfig then append
# defconfig to .config
@@ -27,13 +36,15 @@ do_configure() {
if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
-e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
- -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
+ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2 (big endian)\"/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
${WORKDIR}/defconfig > ${S}/.config
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_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
+ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2 (little endian)\"/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
${WORKDIR}/defconfig > ${S}/.config
else
oefatal do_configure cannot determine endianess
============================================================
--- packages/apex/nslu2/defconfig f5555c35bb8933c7cc891e71ae3aec8051dc23b1
+++ packages/apex/nslu2/defconfig e5fae3d25ffd976f8ec4082eaed48a4bf3f65b21
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version:
-# Tue Jan 9 22:31:18 2007
+# Wed May 30 22:29:37 2007
#
CONFIG_ARM=y
CONFIG_CPU_ARMV5=y
@@ -17,6 +17,7 @@ CONFIG_EXPERIMENTAL=y
#
# General Setup
#
+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)"
CONFIG_CROSS_COMPILE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -70,6 +71,7 @@ CONFIG_COMMAND_EDITING=y
CONFIG_ANSI_KEYS=y
CONFIG_COMMAND_HISTORY=y
CONFIG_COMMAND_EDITING=y
+# CONFIG_TIME_COMMANDS is not set
CONFIG_CMD_ALIAS=y
CONFIG_CMD_CHECKSUM=y
CONFIG_CMD_COPY=y
@@ -85,7 +87,8 @@ CONFIG_CMD_XRECEIVE=y
# CONFIG_CMD_PAUSE is not set
CONFIG_CMD_WAIT=y
CONFIG_CMD_XRECEIVE=y
-# CONFIG_CMD_MEMLIMIT is not set
+CONFIG_CMD_MEMLIMIT=y
+CONFIG_CMD_MEMSCAN=y
#
# Generic Drivers
@@ -97,6 +100,10 @@ CONFIG_DRIVER_NOR_CFI=y
CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k"
CONFIG_DRIVER_NOR_CFI=y
# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
+# CONFIG_DRIVER_ONENAND is not set
# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
CONFIG_USES_NOR_CFI=y
CONFIG_USES_PATHNAME_PARSER=y
@@ -108,13 +115,13 @@ CONFIG_ENV_LINK=y
CONFIG_ENV=y
CONFIG_ENV_MUTABLE=y
CONFIG_ENV_LINK=y
-CONFIG_ENV_REGION="nor:0x7fc000+15k"
+CONFIG_ENV_REGION="nor:0x7f8000+16k"
CONFIG_ENV_CHECK_LEN=1024
-CONFIG_VARIATIONS=y
-CONFIG_VARIATION_SUFFIX="-alt"
+# CONFIG_VARIATIONS is not set
# CONFIG_NO_BOOTSTRAP is not set
CONFIG_NOR_BOOT=y
# CONFIG_NAND_BOOT is not set
+# CONFIG_ONENAND_BOOT is not set
# CONFIG_COMPANION_EVT1_BOOT is not set
# CONFIG_COMPANION_EVT2_BOOT is not set
@@ -130,16 +137,16 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel"
# Regions
#
CONFIG_ENV_REGION_KERNEL="fis://kernel"
-# CONFIG_ENV_REGION_KERNEL_ALT_P is not set
#
# Overrides
#
CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
-CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug"
-# CONFIG_ENV_DEFAULT_CMDLINE_ALT_P is not set
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
-# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
CONFIG_USES_NOR_BOOTFLASH=y
+CONFIG_RELOCATE_SIMPLE=y
+# CONFIG_BIGENDIAN is not set
+# CONFIG_LITTLEENDIAN is not set
CONFIG_CLEAR_STACKS=y
CONFIG_ALIASES=y
More information about the Openembedded-commits
mailing list