diff options
| -rw-r--r-- | packages/apex/apex_1.5.6.bb (renamed from packages/apex/apex_1.5.4.bb) | 3 | ||||
| -rw-r--r-- | packages/apex/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/apex/files/fix-compiler-inlining.patch | 28 | ||||
| -rw-r--r-- | packages/apex/nslu2/defconfig | 5 | ||||
| -rw-r--r-- | packages/sysconf/files/sysconfsetup | 6 |
5 files changed, 4 insertions, 38 deletions
diff --git a/packages/apex/apex_1.5.4.bb b/packages/apex/apex_1.5.6.bb index de6ecdf0ea..ccf08ca9a0 100644 --- a/packages/apex/apex_1.5.4.bb +++ b/packages/apex/apex_1.5.6.bb @@ -3,13 +3,12 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r1" +# 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"}" diff --git a/packages/apex/files/.mtn2git_empty b/packages/apex/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/apex/files/.mtn2git_empty +++ /dev/null diff --git a/packages/apex/files/fix-compiler-inlining.patch b/packages/apex/files/fix-compiler-inlining.patch deleted file mode 100644 index 427068dab2..0000000000 --- a/packages/apex/files/fix-compiler-inlining.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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) - { - } - diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig index 560d2e2e51..cc92ce16dd 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: -# Wed May 30 22:29:37 2007 +# Fri Jun 1 17:35:34 2007 # CONFIG_ARM=y CONFIG_CPU_ARMV5=y @@ -113,9 +113,10 @@ CONFIG_USES_IXP4XX_NPE_ETH=y # Environment # CONFIG_ENV=y -CONFIG_ENV_MUTABLE=y CONFIG_ENV_LINK=y +CONFIG_ENV_MUTABLE=y CONFIG_ENV_REGION="nor:0x7f8000+16k" +# CONFIG_ENV_SAVEATONCE is not set CONFIG_ENV_CHECK_LEN=1024 # CONFIG_VARIATIONS is not set # CONFIG_NO_BOOTSTRAP is not set diff --git a/packages/sysconf/files/sysconfsetup b/packages/sysconf/files/sysconfsetup index 7b91a0e331..602442f4ff 100644 --- a/packages/sysconf/files/sysconfsetup +++ b/packages/sysconf/files/sysconfsetup @@ -16,12 +16,6 @@ # reinit: always do a complete auto restore # reload: just reload sysconf (no config files!) # -# /etc/default/functions contains useful utility functions - it's -# in a separate file so that it can be loaded by any script -# load_functions "source" -# load the functions in '/sbin/source' - relies on /sbin/source being -# a shell script and having support for this function. - # load_functions "source" # load the functions in '/sbin/source' - relies on /sbin/source being # a shell script and having support for this function. |